Changes of com.discord v1332

com.discord/apktool.yml

@@ -1,5 +1,5 @@
 !!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-1330.apk
+apkFileName: com.discord-1332.apk
 compressionType: false
 doNotCompress:
 - resources.arsc
@@ -82,5 +82,5 @@ usesFramework:
   tag: null
 version: 2.4.2-83a459-SNAPSHOT
 versionInfo:
-  versionCode: '1330'
-  versionName: '49.8'
+  versionCode: '1332'
+  versionName: '49.9'

com.discord/res/values/strings.xml

@@ -1207,7 +1207,7 @@ We’re here to make a good impression."</string>
     <string name="color_picker_presets">Presets</string>
     <string name="color_picker_title">Select a color</string>
     <string name="color_picker_transparency">Transparency</string>
-    <string name="com.crashlytics.android.build_id">85ce0f6ad0ad423a91b43d15b7481871</string>
+    <string name="com.crashlytics.android.build_id">e8c0e64b0008445ab09097fe3f2a4286</string>
     <string name="coming_soon">Coming Soon</string>
     <string name="command_giphy_description">Search Animated GIFs on the Web</string>
     <string name="command_giphy_query_description">Text to search for</string>

com.discord/smali/android/support/v4/media/MediaBrowserCompat$a.smali

@@ -198,12 +198,12 @@
 
     move-object v4, v9
 
-    invoke-interface/range {v3 .. v8}, Landroid/support/v4/media/MediaBrowserCompat$g;->d(Landroid/os/Messenger;Ljava/lang/String;Ljava/util/List;Landroid/os/Bundle;Landroid/os/Bundle;)V
+    invoke-interface/range {v3 .. v8}, Landroid/support/v4/media/MediaBrowserCompat$g;->b(Landroid/os/Messenger;Ljava/lang/String;Ljava/util/List;Landroid/os/Bundle;Landroid/os/Bundle;)V
 
     goto :goto_0
 
     :cond_2
-    invoke-interface {v2, v9}, Landroid/support/v4/media/MediaBrowserCompat$g;->f(Landroid/os/Messenger;)V
+    invoke-interface {v2, v9}, Landroid/support/v4/media/MediaBrowserCompat$g;->c(Landroid/os/Messenger;)V
 
     goto :goto_0
 
@@ -228,7 +228,7 @@
 
     check-cast v1, Landroid/support/v4/media/session/MediaSessionCompat$Token;
 
-    invoke-interface {v2, v9, v4, v1, v3}, Landroid/support/v4/media/MediaBrowserCompat$g;->c(Landroid/os/Messenger;Ljava/lang/String;Landroid/support/v4/media/session/MediaSessionCompat$Token;Landroid/os/Bundle;)V
+    invoke-interface {v2, v9, v4, v1, v3}, Landroid/support/v4/media/MediaBrowserCompat$g;->a(Landroid/os/Messenger;Ljava/lang/String;Landroid/support/v4/media/session/MediaSessionCompat$Token;Landroid/os/Bundle;)V
     :try_end_1
     .catch Landroid/os/BadParcelableException; {:try_start_1 .. :try_end_1} :catch_0
 
@@ -245,7 +245,7 @@
 
     if-ne p1, v10, :cond_4
 
-    invoke-interface {v2, v9}, Landroid/support/v4/media/MediaBrowserCompat$g;->f(Landroid/os/Messenger;)V
+    invoke-interface {v2, v9}, Landroid/support/v4/media/MediaBrowserCompat$g;->c(Landroid/os/Messenger;)V
 
     :cond_4
     :goto_0

com.discord/smali/android/support/v4/media/MediaBrowserCompat$b$a.smali

@@ -42,120 +42,115 @@
 
     iget-object v0, v0, Landroid/support/v4/media/MediaBrowserCompat$b;->mConnectionCallbackInternal:Landroid/support/v4/media/MediaBrowserCompat$b$b;
 
-    if-eqz v0, :cond_4
+    if-eqz v0, :cond_2
 
     check-cast v0, Landroid/support/v4/media/MediaBrowserCompat$d;
 
-    const/4 v1, 0x0
+    invoke-static {v0}, Ljava/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    if-eqz v0, :cond_3
-
-    const-string v2, "MediaBrowserCompat"
+    const-string v1, "MediaBrowserCompat"
 
     :try_start_0
-    iget-object v3, v0, Landroid/support/v4/media/MediaBrowserCompat$d;->b:Landroid/media/browse/MediaBrowser;
+    iget-object v2, v0, Landroid/support/v4/media/MediaBrowserCompat$d;->b:Landroid/media/browse/MediaBrowser;
 
-    invoke-virtual {v3}, Landroid/media/browse/MediaBrowser;->getExtras()Landroid/os/Bundle;
+    invoke-virtual {v2}, Landroid/media/browse/MediaBrowser;->getExtras()Landroid/os/Bundle;
 
-    move-result-object v3
+    move-result-object v2
     :try_end_0
     .catch Ljava/lang/IllegalStateException; {:try_start_0 .. :try_end_0} :catch_1
 
-    if-nez v3, :cond_0
+    if-nez v2, :cond_0
 
     goto :goto_1
 
     :cond_0
-    const/4 v4, 0x0
+    const/4 v3, 0x0
 
-    const-string v5, "extra_service_version"
+    const-string v4, "extra_service_version"
 
-    invoke-virtual {v3, v5, v4}, Landroid/os/Bundle;->getInt(Ljava/lang/String;I)I
+    invoke-virtual {v2, v4, v3}, Landroid/os/Bundle;->getInt(Ljava/lang/String;I)I
 
-    const-string v4, "extra_messenger"
+    const-string v3, "extra_messenger"
 
-    invoke-static {v3, v4}, Landroidx/core/app/BundleCompat;->getBinder(Landroid/os/Bundle;Ljava/lang/String;)Landroid/os/IBinder;
+    invoke-static {v2, v3}, Landroidx/core/app/BundleCompat;->getBinder(Landroid/os/Bundle;Ljava/lang/String;)Landroid/os/IBinder;
+
+    move-result-object v3
+
+    if-eqz v3, :cond_1
+
+    new-instance v4, Landroid/support/v4/media/MediaBrowserCompat$h;
+
+    iget-object v5, v0, Landroid/support/v4/media/MediaBrowserCompat$d;->c:Landroid/os/Bundle;
+
+    invoke-direct {v4, v3, v5}, Landroid/support/v4/media/MediaBrowserCompat$h;-><init>(Landroid/os/IBinder;Landroid/os/Bundle;)V
+
+    iput-object v4, v0, Landroid/support/v4/media/MediaBrowserCompat$d;->f:Landroid/support/v4/media/MediaBrowserCompat$h;
+
+    new-instance v3, Landroid/os/Messenger;
+
+    iget-object v4, v0, Landroid/support/v4/media/MediaBrowserCompat$d;->d:Landroid/support/v4/media/MediaBrowserCompat$a;
+
+    invoke-direct {v3, v4}, Landroid/os/Messenger;-><init>(Landroid/os/Handler;)V
+
+    iput-object v3, v0, Landroid/support/v4/media/MediaBrowserCompat$d;->g:Landroid/os/Messenger;
+
+    iget-object v4, v0, Landroid/support/v4/media/MediaBrowserCompat$d;->d:Landroid/support/v4/media/MediaBrowserCompat$a;
+
+    invoke-virtual {v4, v3}, Landroid/support/v4/media/MediaBrowserCompat$a;->a(Landroid/os/Messenger;)V
+
+    :try_start_1
+    iget-object v3, v0, Landroid/support/v4/media/MediaBrowserCompat$d;->f:Landroid/support/v4/media/MediaBrowserCompat$h;
+
+    iget-object v4, v0, Landroid/support/v4/media/MediaBrowserCompat$d;->a:Landroid/content/Context;
+
+    iget-object v5, v0, Landroid/support/v4/media/MediaBrowserCompat$d;->g:Landroid/os/Messenger;
+
+    invoke-static {v3}, Ljava/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
+
+    new-instance v6, Landroid/os/Bundle;
+
+    invoke-direct {v6}, Landroid/os/Bundle;-><init>()V
+
+    invoke-virtual {v4}, Landroid/content/Context;->getPackageName()Ljava/lang/String;
 
     move-result-object v4
 
-    if-eqz v4, :cond_2
-
-    new-instance v5, Landroid/support/v4/media/MediaBrowserCompat$h;
-
-    iget-object v6, v0, Landroid/support/v4/media/MediaBrowserCompat$d;->c:Landroid/os/Bundle;
-
-    invoke-direct {v5, v4, v6}, Landroid/support/v4/media/MediaBrowserCompat$h;-><init>(Landroid/os/IBinder;Landroid/os/Bundle;)V
-
-    iput-object v5, v0, Landroid/support/v4/media/MediaBrowserCompat$d;->f:Landroid/support/v4/media/MediaBrowserCompat$h;
-
-    new-instance v4, Landroid/os/Messenger;
-
-    iget-object v5, v0, Landroid/support/v4/media/MediaBrowserCompat$d;->d:Landroid/support/v4/media/MediaBrowserCompat$a;
-
-    invoke-direct {v4, v5}, Landroid/os/Messenger;-><init>(Landroid/os/Handler;)V
-
-    iput-object v4, v0, Landroid/support/v4/media/MediaBrowserCompat$d;->g:Landroid/os/Messenger;
-
-    iget-object v5, v0, Landroid/support/v4/media/MediaBrowserCompat$d;->d:Landroid/support/v4/media/MediaBrowserCompat$a;
-
-    invoke-virtual {v5, v4}, Landroid/support/v4/media/MediaBrowserCompat$a;->a(Landroid/os/Messenger;)V
-
-    :try_start_1
-    iget-object v4, v0, Landroid/support/v4/media/MediaBrowserCompat$d;->f:Landroid/support/v4/media/MediaBrowserCompat$h;
-
-    iget-object v5, v0, Landroid/support/v4/media/MediaBrowserCompat$d;->a:Landroid/content/Context;
-
-    iget-object v6, v0, Landroid/support/v4/media/MediaBrowserCompat$d;->g:Landroid/os/Messenger;
-
-    if-eqz v4, :cond_1
-
-    new-instance v1, Landroid/os/Bundle;
-
-    invoke-direct {v1}, Landroid/os/Bundle;-><init>()V
-
-    invoke-virtual {v5}, Landroid/content/Context;->getPackageName()Ljava/lang/String;
-
-    move-result-object v5
-
     const-string v7, "data_package_name"
 
-    invoke-virtual {v1, v7, v5}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
+    invoke-virtual {v6, v7, v4}, Landroid/os/Bundle;->putString(Ljava/lang/String;Ljava/lang/String;)V
 
-    iget-object v5, v4, Landroid/support/v4/media/MediaBrowserCompat$h;->b:Landroid/os/Bundle;
+    iget-object v4, v3, Landroid/support/v4/media/MediaBrowserCompat$h;->b:Landroid/os/Bundle;
 
     const-string v7, "data_root_hints"
 
-    invoke-virtual {v1, v7, v5}, Landroid/os/Bundle;->putBundle(Ljava/lang/String;Landroid/os/Bundle;)V
+    invoke-virtual {v6, v7, v4}, Landroid/os/Bundle;->putBundle(Ljava/lang/String;Landroid/os/Bundle;)V
 
-    const/4 v5, 0x6
+    const/4 v4, 0x6
 
-    invoke-virtual {v4, v5, v1, v6}, Landroid/support/v4/media/MediaBrowserCompat$h;->a(ILandroid/os/Bundle;Landroid/os/Messenger;)V
-
-    goto :goto_0
-
-    :cond_1
-    throw v1
+    invoke-virtual {v3, v4, v6, v5}, Landroid/support/v4/media/MediaBrowserCompat$h;->a(ILandroid/os/Bundle;Landroid/os/Messenger;)V
     :try_end_1
     .catch Landroid/os/RemoteException; {:try_start_1 .. :try_end_1} :catch_0
 
+    goto :goto_0
+
     :catch_0
-    const-string v1, "Remote error registering client messenger."
+    const-string v3, "Remote error registering client messenger."
 
-    invoke-static {v2, v1}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
+    invoke-static {v1, v3}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
 
-    :cond_2
+    :cond_1
     :goto_0
     const-string v1, "extra_session_binder"
 
-    invoke-static {v3, v1}, Landroidx/core/app/BundleCompat;->getBinder(Landroid/os/Bundle;Ljava/lang/String;)Landroid/os/IBinder;
+    invoke-static {v2, v1}, Landroidx/core/app/BundleCompat;->getBinder(Landroid/os/Bundle;Ljava/lang/String;)Landroid/os/IBinder;
 
     move-result-object v1
 
-    invoke-static {v1}, Ls/a/b/b/b/b$a;->g(Landroid/os/IBinder;)Ls/a/b/b/b/b;
+    invoke-static {v1}, Ls/a/b/b/b/b$a;->e(Landroid/os/IBinder;)Ls/a/b/b/b/b;
 
     move-result-object v1
 
-    if-eqz v1, :cond_4
+    if-eqz v1, :cond_2
 
     iget-object v2, v0, Landroid/support/v4/media/MediaBrowserCompat$d;->b:Landroid/media/browse/MediaBrowser;
 
@@ -174,16 +169,11 @@
     :catch_1
     move-exception v0
 
-    const-string v1, "Unexpected IllegalStateException"
+    const-string v2, "Unexpected IllegalStateException"
 
-    invoke-static {v2, v1, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
+    invoke-static {v1, v2, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
 
-    goto :goto_1
-
-    :cond_3
-    throw v1
-
-    :cond_4
+    :cond_2
     :goto_1
     iget-object v0, p0, Landroid/support/v4/media/MediaBrowserCompat$b$a;->a:Landroid/support/v4/media/MediaBrowserCompat$b;
 
@@ -199,21 +189,13 @@
 
     iget-object v0, v0, Landroid/support/v4/media/MediaBrowserCompat$b;->mConnectionCallbackInternal:Landroid/support/v4/media/MediaBrowserCompat$b$b;
 
-    if-eqz v0, :cond_1
+    if-eqz v0, :cond_0
 
     check-cast v0, Landroid/support/v4/media/MediaBrowserCompat$d;
 
-    if-eqz v0, :cond_0
-
-    goto :goto_0
+    invoke-static {v0}, Ljava/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
 
     :cond_0
-    const/4 v0, 0x0
-
-    throw v0
-
-    :cond_1
-    :goto_0
     iget-object v0, p0, Landroid/support/v4/media/MediaBrowserCompat$b$a;->a:Landroid/support/v4/media/MediaBrowserCompat$b;
 
     invoke-virtual {v0}, Landroid/support/v4/media/MediaBrowserCompat$b;->onConnectionFailed()V

com.discord/smali/android/support/v4/media/MediaBrowserCompat$b.smali

@@ -44,13 +44,28 @@
 
 
 # virtual methods
-.method public abstract onConnected()V
+.method public onConnected()V
+    .locals 0
+
+    const p0, 0x0
+
+    throw p0
 .end method
 
-.method public abstract onConnectionFailed()V
+.method public onConnectionFailed()V
+    .locals 0
+
+    const p0, 0x0
+
+    throw p0
 .end method
 
-.method public abstract onConnectionSuspended()V
+.method public onConnectionSuspended()V
+    .locals 0
+
+    const p0, 0x0
+
+    throw p0
 .end method
 
 .method public setInternalConnectionCallback(Landroid/support/v4/media/MediaBrowserCompat$b$b;)V

com.discord/smali/android/support/v4/media/MediaBrowserCompat$c.smali

@@ -12,16 +12,3 @@
     accessFlags = 0x609
     name = "c"
 .end annotation
-
-
-# virtual methods
-.method public abstract a()V
-.end method
-
-.method public abstract b()Landroid/support/v4/media/session/MediaSessionCompat$Token;
-    .annotation build Landroidx/annotation/NonNull;
-    .end annotation
-.end method
-
-.method public abstract e()V
-.end method

com.discord/smali/android/support/v4/media/MediaBrowserCompat$d.smali

@@ -49,8 +49,6 @@
 
 .field public h:Landroid/support/v4/media/session/MediaSessionCompat$Token;
 
-.field public i:Landroid/os/Bundle;
-
 
 # direct methods
 .method public constructor <init>(Landroid/content/Context;Landroid/content/ComponentName;Landroid/support/v4/media/MediaBrowserCompat$b;Landroid/os/Bundle;)V
@@ -98,8 +96,6 @@
 
     iget-object p3, p3, Landroid/support/v4/media/MediaBrowserCompat$b;->mConnectionCallbackFwk:Landroid/media/browse/MediaBrowser$ConnectionCallback;
 
-    iget-object v0, p0, Landroid/support/v4/media/MediaBrowserCompat$d;->c:Landroid/os/Bundle;
-
     invoke-direct {p4, p1, p2, p3, v0}, Landroid/media/browse/MediaBrowser;-><init>(Landroid/content/Context;Landroid/content/ComponentName;Landroid/media/browse/MediaBrowser$ConnectionCallback;Landroid/os/Bundle;)V
 
     iput-object p4, p0, Landroid/support/v4/media/MediaBrowserCompat$d;->b:Landroid/media/browse/MediaBrowser;
@@ -109,85 +105,18 @@
 
 
 # virtual methods
-.method public a()V
-    .locals 4
-
-    iget-object v0, p0, Landroid/support/v4/media/MediaBrowserCompat$d;->f:Landroid/support/v4/media/MediaBrowserCompat$h;
-
-    if-eqz v0, :cond_0
-
-    iget-object v1, p0, Landroid/support/v4/media/MediaBrowserCompat$d;->g: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$h;->a(ILandroid/os/Bundle;Landroid/os/Messenger;)V
-    :try_end_0
-    .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
-
-    goto :goto_0
-
-    :catch_0
-    const-string v0, "MediaBrowserCompat"
-
-    const-string v1, "Remote error unregistering client messenger."
-
-    invoke-static {v0, v1}, Landroid/util/Log;->i(Ljava/lang/String;Ljava/lang/String;)I
-
-    :cond_0
-    :goto_0
-    iget-object v0, p0, Landroid/support/v4/media/MediaBrowserCompat$d;->b:Landroid/media/browse/MediaBrowser;
-
-    invoke-virtual {v0}, Landroid/media/browse/MediaBrowser;->disconnect()V
-
-    return-void
-.end method
-
-.method public b()Landroid/support/v4/media/session/MediaSessionCompat$Token;
-    .locals 2
-    .annotation build Landroidx/annotation/NonNull;
-    .end annotation
-
-    iget-object v0, p0, Landroid/support/v4/media/MediaBrowserCompat$d;->h:Landroid/support/v4/media/session/MediaSessionCompat$Token;
-
-    if-nez v0, :cond_0
-
-    iget-object v0, p0, Landroid/support/v4/media/MediaBrowserCompat$d;->b:Landroid/media/browse/MediaBrowser;
-
-    invoke-virtual {v0}, Landroid/media/browse/MediaBrowser;->getSessionToken()Landroid/media/session/MediaSession$Token;
-
-    move-result-object v0
-
-    const/4 v1, 0x0
-
-    invoke-static {v0, v1}, Landroid/support/v4/media/session/MediaSessionCompat$Token;->a(Ljava/lang/Object;Ls/a/b/b/b/b;)Landroid/support/v4/media/session/MediaSessionCompat$Token;
-
-    move-result-object v0
-
-    iput-object v0, p0, Landroid/support/v4/media/MediaBrowserCompat$d;->h:Landroid/support/v4/media/session/MediaSessionCompat$Token;
-
-    :cond_0
-    iget-object v0, p0, Landroid/support/v4/media/MediaBrowserCompat$d;->h:Landroid/support/v4/media/session/MediaSessionCompat$Token;
-
-    return-object v0
-.end method
-
-.method public c(Landroid/os/Messenger;Ljava/lang/String;Landroid/support/v4/media/session/MediaSessionCompat$Token;Landroid/os/Bundle;)V
+.method public a(Landroid/os/Messenger;Ljava/lang/String;Landroid/support/v4/media/session/MediaSessionCompat$Token;Landroid/os/Bundle;)V
     .locals 0
 
     return-void
 .end method
 
-.method public d(Landroid/os/Messenger;Ljava/lang/String;Ljava/util/List;Landroid/os/Bundle;Landroid/os/Bundle;)V
-    .locals 1
+.method public b(Landroid/os/Messenger;Ljava/lang/String;Ljava/util/List;Landroid/os/Bundle;Landroid/os/Bundle;)V
+    .locals 0
 
-    iget-object v0, p0, Landroid/support/v4/media/MediaBrowserCompat$d;->g:Landroid/os/Messenger;
+    iget-object p3, p0, Landroid/support/v4/media/MediaBrowserCompat$d;->g:Landroid/os/Messenger;
 
-    if-eq v0, p1, :cond_0
+    if-eq p3, p1, :cond_0
 
     return-void
 
@@ -230,45 +159,10 @@
     :cond_2
     invoke-virtual {p1, p4}, Landroid/support/v4/media/MediaBrowserCompat$i;->a(Landroid/os/Bundle;)Landroid/support/v4/media/MediaBrowserCompat$j;
 
-    move-result-object p1
-
-    if-eqz p1, :cond_6
-
-    if-nez p4, :cond_4
-
-    if-nez p3, :cond_3
-
-    goto :goto_0
-
-    :cond_3
-    iput-object p5, p0, Landroid/support/v4/media/MediaBrowserCompat$d;->i:Landroid/os/Bundle;
-
-    goto :goto_0
-
-    :cond_4
-    if-nez p3, :cond_5
-
-    goto :goto_0
-
-    :cond_5
-    iput-object p5, p0, Landroid/support/v4/media/MediaBrowserCompat$d;->i:Landroid/os/Bundle;
-
-    :cond_6
-    :goto_0
     return-void
 .end method
 
-.method public e()V
-    .locals 1
-
-    iget-object v0, p0, Landroid/support/v4/media/MediaBrowserCompat$d;->b:Landroid/media/browse/MediaBrowser;
-
-    invoke-virtual {v0}, Landroid/media/browse/MediaBrowser;->connect()V
-
-    return-void
-.end method
-
-.method public f(Landroid/os/Messenger;)V
+.method public c(Landroid/os/Messenger;)V
     .locals 0
 
     return-void

com.discord/smali/android/support/v4/media/MediaBrowserCompat$g.smali

@@ -15,11 +15,11 @@
 
 
 # virtual methods
-.method public abstract c(Landroid/os/Messenger;Ljava/lang/String;Landroid/support/v4/media/session/MediaSessionCompat$Token;Landroid/os/Bundle;)V
+.method public abstract a(Landroid/os/Messenger;Ljava/lang/String;Landroid/support/v4/media/session/MediaSessionCompat$Token;Landroid/os/Bundle;)V
 .end method
 
-.method public abstract d(Landroid/os/Messenger;Ljava/lang/String;Ljava/util/List;Landroid/os/Bundle;Landroid/os/Bundle;)V
+.method public abstract b(Landroid/os/Messenger;Ljava/lang/String;Ljava/util/List;Landroid/os/Bundle;Landroid/os/Bundle;)V
 .end method
 
-.method public abstract f(Landroid/os/Messenger;)V
+.method public abstract c(Landroid/os/Messenger;)V
 .end method

com.discord/smali/android/support/v4/media/MediaBrowserCompat$j$a.smali

@@ -36,7 +36,7 @@
 
 # virtual methods
 .method public onChildrenLoaded(Ljava/lang/String;Ljava/util/List;)V
-    .locals 8
+    .locals 0
     .param p1    # Ljava/lang/String;
         .annotation build Landroidx/annotation/NonNull;
         .end annotation
@@ -53,152 +53,14 @@
 
     iget-object p1, p0, Landroid/support/v4/media/MediaBrowserCompat$j$a;->a:Landroid/support/v4/media/MediaBrowserCompat$j;
 
-    iget-object p1, p1, Landroid/support/v4/media/MediaBrowserCompat$j;->b:Ljava/lang/ref/WeakReference;
-
-    const/4 v0, 0x0
-
-    if-nez p1, :cond_0
-
-    move-object p1, v0
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p1}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
-
-    move-result-object p1
-
-    check-cast p1, Landroid/support/v4/media/MediaBrowserCompat$i;
-
-    :goto_0
-    if-nez p1, :cond_2
+    invoke-static {p1}, Ljava/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
 
     iget-object p1, p0, Landroid/support/v4/media/MediaBrowserCompat$j$a;->a:Landroid/support/v4/media/MediaBrowserCompat$j;
 
     invoke-static {p2}, Landroid/support/v4/media/MediaBrowserCompat$MediaItem;->a(Ljava/util/List;)Ljava/util/List;
 
-    if-eqz p1, :cond_1
+    invoke-static {p1}, Ljava/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    goto :goto_5
-
-    :cond_1
-    throw v0
-
-    :cond_2
-    invoke-static {p2}, Landroid/support/v4/media/MediaBrowserCompat$MediaItem;->a(Ljava/util/List;)Ljava/util/List;
-
-    move-result-object p2
-
-    iget-object v1, p1, Landroid/support/v4/media/MediaBrowserCompat$i;->a:Ljava/util/List;
-
-    iget-object p1, p1, Landroid/support/v4/media/MediaBrowserCompat$i;->b:Ljava/util/List;
-
-    const/4 v2, 0x0
-
-    :goto_1
-    invoke-interface {v1}, Ljava/util/List;->size()I
-
-    move-result v3
-
-    if-ge v2, v3, :cond_b
-
-    invoke-interface {p1, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
-    move-result-object v3
-
-    check-cast v3, Landroid/os/Bundle;
-
-    if-nez v3, :cond_4
-
-    iget-object v3, p0, Landroid/support/v4/media/MediaBrowserCompat$j$a;->a:Landroid/support/v4/media/MediaBrowserCompat$j;
-
-    if-eqz v3, :cond_3
-
-    goto :goto_4
-
-    :cond_3
-    throw v0
-
-    :cond_4
-    iget-object v4, p0, Landroid/support/v4/media/MediaBrowserCompat$j$a;->a:Landroid/support/v4/media/MediaBrowserCompat$j;
-
-    if-nez p2, :cond_5
-
-    goto :goto_3
-
-    :cond_5
-    const/4 v5, -0x1
-
-    const-string v6, "android.media.browse.extra.PAGE"
-
-    invoke-virtual {v3, v6, v5}, Landroid/os/Bundle;->getInt(Ljava/lang/String;I)I
-
-    move-result v6
-
-    const-string v7, "android.media.browse.extra.PAGE_SIZE"
-
-    invoke-virtual {v3, v7, v5}, Landroid/os/Bundle;->getInt(Ljava/lang/String;I)I
-
-    move-result v3
-
-    if-ne v6, v5, :cond_6
-
-    if-ne v3, v5, :cond_6
-
-    goto :goto_3
-
-    :cond_6
-    mul-int v5, v3, v6
-
-    add-int v7, v5, v3
-
-    if-ltz v6, :cond_9
-
-    const/4 v6, 0x1
-
-    if-lt v3, v6, :cond_9
-
-    invoke-interface {p2}, Ljava/util/List;->size()I
-
-    move-result v3
-
-    if-lt v5, v3, :cond_7
-
-    goto :goto_2
-
-    :cond_7
-    invoke-interface {p2}, Ljava/util/List;->size()I
-
-    move-result v3
-
-    if-le v7, v3, :cond_8
-
-    invoke-interface {p2}, Ljava/util/List;->size()I
-
-    move-result v7
-
-    :cond_8
-    invoke-interface {p2, v5, v7}, Ljava/util/List;->subList(II)Ljava/util/List;
-
-    goto :goto_3
-
-    :cond_9
-    :goto_2
-    invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
-
-    :goto_3
-    if-eqz v4, :cond_a
-
-    :goto_4
-    add-int/lit8 v2, v2, 0x1
-
-    goto :goto_1
-
-    :cond_a
-    throw v0
-
-    :cond_b
-    :goto_5
     return-void
 .end method
 
@@ -211,12 +73,7 @@
 
     iget-object p1, p0, Landroid/support/v4/media/MediaBrowserCompat$j$a;->a:Landroid/support/v4/media/MediaBrowserCompat$j;
 
-    if-eqz p1, :cond_0
+    invoke-static {p1}, Ljava/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const/4 p1, 0x0
-
-    throw p1
 .end method

com.discord/smali/android/support/v4/media/MediaBrowserCompat$j$b.smali

@@ -63,14 +63,9 @@
 
     invoke-static {p2}, Landroid/support/v4/media/MediaBrowserCompat$MediaItem;->a(Ljava/util/List;)Ljava/util/List;
 
-    if-eqz p1, :cond_0
+    invoke-static {p1}, Ljava/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const/4 p1, 0x0
-
-    throw p1
 .end method
 
 .method public onError(Ljava/lang/String;Landroid/os/Bundle;)V
@@ -88,12 +83,7 @@
 
     iget-object p1, p0, Landroid/support/v4/media/MediaBrowserCompat$j$b;->b:Landroid/support/v4/media/MediaBrowserCompat$j;
 
-    if-eqz p1, :cond_0
+    invoke-static {p1}, Ljava/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
 
     return-void
-
-    :cond_0
-    const/4 p1, 0x0
-
-    throw p1
 .end method

com.discord/smali/android/support/v4/media/MediaBrowserCompat$j.smali

@@ -24,16 +24,6 @@
 # instance fields
 .field public final a:Landroid/os/IBinder;
 
-.field public b:Ljava/lang/ref/WeakReference;
-    .annotation system Ldalvik/annotation/Signature;
-        value = {
-            "Ljava/lang/ref/WeakReference<",
-            "Landroid/support/v4/media/MediaBrowserCompat$i;",
-            ">;"
-        }
-    .end annotation
-.end field
-
 
 # direct methods
 .method public constructor <init>()V

com.discord/smali/android/support/v4/media/MediaDescriptionCompat.smali

@@ -76,117 +76,117 @@
 .end method
 
 .method public static a(Ljava/lang/Object;)Landroid/support/v4/media/MediaDescriptionCompat;
-    .locals 14
+    .locals 15
 
     const/4 v0, 0x0
 
     if-eqz p0, :cond_5
 
-    move-object v1, p0
+    sget v1, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    check-cast v1, Landroid/media/MediaDescription;
+    move-object v2, p0
 
-    invoke-virtual {v1}, Landroid/media/MediaDescription;->getMediaId()Ljava/lang/String;
+    check-cast v2, Landroid/media/MediaDescription;
 
-    move-result-object v3
-
-    invoke-virtual {v1}, Landroid/media/MediaDescription;->getTitle()Ljava/lang/CharSequence;
+    invoke-virtual {v2}, Landroid/media/MediaDescription;->getMediaId()Ljava/lang/String;
 
     move-result-object v4
 
-    invoke-virtual {v1}, Landroid/media/MediaDescription;->getSubtitle()Ljava/lang/CharSequence;
+    invoke-virtual {v2}, Landroid/media/MediaDescription;->getTitle()Ljava/lang/CharSequence;
 
     move-result-object v5
 
-    invoke-virtual {v1}, Landroid/media/MediaDescription;->getDescription()Ljava/lang/CharSequence;
+    invoke-virtual {v2}, Landroid/media/MediaDescription;->getSubtitle()Ljava/lang/CharSequence;
 
     move-result-object v6
 
-    invoke-virtual {v1}, Landroid/media/MediaDescription;->getIconBitmap()Landroid/graphics/Bitmap;
+    invoke-virtual {v2}, Landroid/media/MediaDescription;->getDescription()Ljava/lang/CharSequence;
 
     move-result-object v7
 
-    invoke-virtual {v1}, Landroid/media/MediaDescription;->getIconUri()Landroid/net/Uri;
+    invoke-virtual {v2}, Landroid/media/MediaDescription;->getIconBitmap()Landroid/graphics/Bitmap;
 
     move-result-object v8
 
-    invoke-virtual {v1}, Landroid/media/MediaDescription;->getExtras()Landroid/os/Bundle;
+    invoke-virtual {v2}, Landroid/media/MediaDescription;->getIconUri()Landroid/net/Uri;
 
-    move-result-object v2
+    move-result-object v9
 
-    const-string v9, "android.support.v4.media.description.MEDIA_URI"
+    invoke-virtual {v2}, Landroid/media/MediaDescription;->getExtras()Landroid/os/Bundle;
 
-    if-eqz v2, :cond_0
+    move-result-object v3
 
-    invoke-static {v2}, Landroid/support/v4/media/session/MediaSessionCompat;->a(Landroid/os/Bundle;)V
+    const-string v10, "android.support.v4.media.description.MEDIA_URI"
 
-    invoke-virtual {v2, v9}, Landroid/os/Bundle;->getParcelable(Ljava/lang/String;)Landroid/os/Parcelable;
+    if-eqz v3, :cond_0
 
-    move-result-object v10
+    invoke-static {v3}, Landroid/support/v4/media/session/MediaSessionCompat;->a(Landroid/os/Bundle;)V
 
-    check-cast v10, Landroid/net/Uri;
+    invoke-virtual {v3, v10}, Landroid/os/Bundle;->getParcelable(Ljava/lang/String;)Landroid/os/Parcelable;
+
+    move-result-object v11
+
+    check-cast v11, Landroid/net/Uri;
 
     goto :goto_0
 
     :cond_0
-    move-object v10, v0
+    move-object v11, v0
 
     :goto_0
-    if-eqz v10, :cond_2
+    if-eqz v11, :cond_2
 
-    const-string v11, "android.support.v4.media.description.NULL_BUNDLE_FLAG"
+    const-string v12, "android.support.v4.media.description.NULL_BUNDLE_FLAG"
 
-    invoke-virtual {v2, v11}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
+    invoke-virtual {v3, v12}, Landroid/os/Bundle;->containsKey(Ljava/lang/String;)Z
 
-    move-result v12
+    move-result v13
 
-    if-eqz v12, :cond_1
+    if-eqz v13, :cond_1
 
-    invoke-virtual {v2}, Landroid/os/Bundle;->size()I
+    invoke-virtual {v3}, Landroid/os/Bundle;->size()I
 
-    move-result v12
+    move-result v13
 
-    const/4 v13, 0x2
+    const/4 v14, 0x2
 
-    if-ne v12, v13, :cond_1
+    if-ne v13, v14, :cond_1
 
-    move-object v9, v0
+    move-object v10, v0
 
     goto :goto_1
 
     :cond_1
-    invoke-virtual {v2, v9}, Landroid/os/Bundle;->remove(Ljava/lang/String;)V
+    invoke-virtual {v3, v10}, Landroid/os/Bundle;->remove(Ljava/lang/String;)V
 
-    invoke-virtual {v2, v11}, Landroid/os/Bundle;->remove(Ljava/lang/String;)V
+    invoke-virtual {v3, v12}, Landroid/os/Bundle;->remove(Ljava/lang/String;)V
 
     :cond_2
-    move-object v9, v2
+    move-object v10, v3
 
     :goto_1
-    if-eqz v10, :cond_3
+    if-eqz v11, :cond_3
 
     goto :goto_2
 
     :cond_3
-    sget v2, Landroid/os/Build$VERSION;->SDK_INT:I
+    const/16 v3, 0x17
 
-    const/16 v10, 0x17
+    if-lt v1, v3, :cond_4
 
-    if-lt v2, v10, :cond_4
-
-    invoke-virtual {v1}, Landroid/media/MediaDescription;->getMediaUri()Landroid/net/Uri;
+    invoke-virtual {v2}, Landroid/media/MediaDescription;->getMediaUri()Landroid/net/Uri;
 
     move-result-object v0
 
     :cond_4
-    move-object v10, v0
+    move-object v11, v0
 
     :goto_2
     new-instance v0, Landroid/support/v4/media/MediaDescriptionCompat;
 
-    move-object v2, v0
+    move-object v3, v0
 
-    invoke-direct/range {v2 .. v10}, Landroid/support/v4/media/MediaDescriptionCompat;-><init>(Ljava/lang/String;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Landroid/graphics/Bitmap;Landroid/net/Uri;Landroid/os/Bundle;Landroid/net/Uri;)V
+    invoke-direct/range {v3 .. v11}, Landroid/support/v4/media/MediaDescriptionCompat;-><init>(Ljava/lang/String;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Landroid/graphics/Bitmap;Landroid/net/Uri;Landroid/os/Bundle;Landroid/net/Uri;)V
 
     iput-object p0, v0, Landroid/support/v4/media/MediaDescriptionCompat;->l:Ljava/lang/Object;
 
@@ -237,93 +237,91 @@
 .end method
 
 .method public writeToParcel(Landroid/os/Parcel;I)V
-    .locals 5
+    .locals 6
 
-    iget-object v0, p0, Landroid/support/v4/media/MediaDescriptionCompat;->l:Ljava/lang/Object;
+    sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
-    if-nez v0, :cond_3
+    iget-object v1, p0, Landroid/support/v4/media/MediaDescriptionCompat;->l:Ljava/lang/Object;
 
-    new-instance v0, Landroid/media/MediaDescription$Builder;
+    if-nez v1, :cond_3
 
-    invoke-direct {v0}, Landroid/media/MediaDescription$Builder;-><init>()V
+    new-instance v1, Landroid/media/MediaDescription$Builder;
 
-    iget-object v1, p0, Landroid/support/v4/media/MediaDescriptionCompat;->d:Ljava/lang/String;
+    invoke-direct {v1}, Landroid/media/MediaDescription$Builder;-><init>()V
 
-    invoke-virtual {v0, v1}, Landroid/media/MediaDescription$Builder;->setMediaId(Ljava/lang/String;)Landroid/media/MediaDescription$Builder;
+    iget-object v2, p0, Landroid/support/v4/media/MediaDescriptionCompat;->d:Ljava/lang/String;
 
-    iget-object v1, p0, Landroid/support/v4/media/MediaDescriptionCompat;->e:Ljava/lang/CharSequence;
+    invoke-virtual {v1, v2}, Landroid/media/MediaDescription$Builder;->setMediaId(Ljava/lang/String;)Landroid/media/MediaDescription$Builder;
 
-    invoke-virtual {v0, v1}, Landroid/media/MediaDescription$Builder;->setTitle(Ljava/lang/CharSequence;)Landroid/media/MediaDescription$Builder;
+    iget-object v2, p0, Landroid/support/v4/media/MediaDescriptionCompat;->e:Ljava/lang/CharSequence;
 
-    iget-object v1, p0, Landroid/support/v4/media/MediaDescriptionCompat;->f:Ljava/lang/CharSequence;
+    invoke-virtual {v1, v2}, Landroid/media/MediaDescription$Builder;->setTitle(Ljava/lang/CharSequence;)Landroid/media/MediaDescription$Builder;
 
-    invoke-virtual {v0, v1}, Landroid/media/MediaDescription$Builder;->setSubtitle(Ljava/lang/CharSequence;)Landroid/media/MediaDescription$Builder;
+    iget-object v2, p0, Landroid/support/v4/media/MediaDescriptionCompat;->f:Ljava/lang/CharSequence;
 
-    iget-object v1, p0, Landroid/support/v4/media/MediaDescriptionCompat;->g:Ljava/lang/CharSequence;
+    invoke-virtual {v1, v2}, Landroid/media/MediaDescription$Builder;->setSubtitle(Ljava/lang/CharSequence;)Landroid/media/MediaDescription$Builder;
 
-    invoke-virtual {v0, v1}, Landroid/media/MediaDescription$Builder;->setDescription(Ljava/lang/CharSequence;)Landroid/media/MediaDescription$Builder;
+    iget-object v2, p0, Landroid/support/v4/media/MediaDescriptionCompat;->g:Ljava/lang/CharSequence;
 
-    iget-object v1, p0, Landroid/support/v4/media/MediaDescriptionCompat;->h:Landroid/graphics/Bitmap;
+    invoke-virtual {v1, v2}, Landroid/media/MediaDescription$Builder;->setDescription(Ljava/lang/CharSequence;)Landroid/media/MediaDescription$Builder;
 
-    invoke-virtual {v0, v1}, Landroid/media/MediaDescription$Builder;->setIconBitmap(Landroid/graphics/Bitmap;)Landroid/media/MediaDescription$Builder;
+    iget-object v2, p0, Landroid/support/v4/media/MediaDescriptionCompat;->h:Landroid/graphics/Bitmap;
 
-    iget-object v1, p0, Landroid/support/v4/media/MediaDescriptionCompat;->i:Landroid/net/Uri;
+    invoke-virtual {v1, v2}, Landroid/media/MediaDescription$Builder;->setIconBitmap(Landroid/graphics/Bitmap;)Landroid/media/MediaDescription$Builder;
 
-    invoke-virtual {v0, v1}, Landroid/media/MediaDescription$Builder;->setIconUri(Landroid/net/Uri;)Landroid/media/MediaDescription$Builder;
+    iget-object v2, p0, Landroid/support/v4/media/MediaDescriptionCompat;->i:Landroid/net/Uri;
 
-    iget-object v1, p0, Landroid/support/v4/media/MediaDescriptionCompat;->j:Landroid/os/Bundle;
+    invoke-virtual {v1, v2}, Landroid/media/MediaDescription$Builder;->setIconUri(Landroid/net/Uri;)Landroid/media/MediaDescription$Builder;
 
-    sget v2, Landroid/os/Build$VERSION;->SDK_INT:I
+    iget-object v2, p0, Landroid/support/v4/media/MediaDescriptionCompat;->j:Landroid/os/Bundle;
 
     const/16 v3, 0x17
 
-    if-ge v2, v3, :cond_1
+    if-ge v0, v3, :cond_1
 
-    iget-object v2, p0, Landroid/support/v4/media/MediaDescriptionCompat;->k:Landroid/net/Uri;
+    iget-object v4, p0, Landroid/support/v4/media/MediaDescriptionCompat;->k:Landroid/net/Uri;
 
-    if-eqz v2, :cond_1
+    if-eqz v4, :cond_1
 
-    if-nez v1, :cond_0
+    if-nez v2, :cond_0
 
-    new-instance v1, Landroid/os/Bundle;
+    new-instance v2, Landroid/os/Bundle;
 
-    invoke-direct {v1}, Landroid/os/Bundle;-><init>()V
+    invoke-direct {v2}, Landroid/os/Bundle;-><init>()V
 
-    const/4 v2, 0x1
+    const/4 v4, 0x1
 
-    const-string v4, "android.support.v4.media.description.NULL_BUNDLE_FLAG"
+    const-string v5, "android.support.v4.media.description.NULL_BUNDLE_FLAG"
 
-    invoke-virtual {v1, v4, v2}, Landroid/os/Bundle;->putBoolean(Ljava/lang/String;Z)V
+    invoke-virtual {v2, v5, v4}, Landroid/os/Bundle;->putBoolean(Ljava/lang/String;Z)V
 
     :cond_0
-    iget-object v2, p0, Landroid/support/v4/media/MediaDescriptionCompat;->k:Landroid/net/Uri;
+    iget-object v4, p0, Landroid/support/v4/media/MediaDescriptionCompat;->k:Landroid/net/Uri;
 
-    const-string v4, "android.support.v4.media.description.MEDIA_URI"
+    const-string v5, "android.support.v4.media.description.MEDIA_URI"
 
-    invoke-virtual {v1, v4, v2}, Landroid/os/Bundle;->putParcelable(Ljava/lang/String;Landroid/os/Parcelable;)V
+    invoke-virtual {v2, v5, v4}, Landroid/os/Bundle;->putParcelable(Ljava/lang/String;Landroid/os/Parcelable;)V
 
     :cond_1
-    invoke-virtual {v0, v1}, Landroid/media/MediaDescription$Builder;->setExtras(Landroid/os/Bundle;)Landroid/media/MediaDescription$Builder;
+    invoke-virtual {v1, v2}, Landroid/media/MediaDescription$Builder;->setExtras(Landroid/os/Bundle;)Landroid/media/MediaDescription$Builder;
 
-    sget v1, Landroid/os/Build$VERSION;->SDK_INT:I
+    if-lt v0, v3, :cond_2
 
-    if-lt v1, v3, :cond_2
+    iget-object v0, p0, Landroid/support/v4/media/MediaDescriptionCompat;->k:Landroid/net/Uri;
 
-    iget-object v1, p0, Landroid/support/v4/media/MediaDescriptionCompat;->k:Landroid/net/Uri;
-
-    invoke-virtual {v0, v1}, Landroid/media/MediaDescription$Builder;->setMediaUri(Landroid/net/Uri;)Landroid/media/MediaDescription$Builder;
+    invoke-virtual {v1, v0}, Landroid/media/MediaDescription$Builder;->setMediaUri(Landroid/net/Uri;)Landroid/media/MediaDescription$Builder;
 
     :cond_2
-    invoke-virtual {v0}, Landroid/media/MediaDescription$Builder;->build()Landroid/media/MediaDescription;
+    invoke-virtual {v1}, Landroid/media/MediaDescription$Builder;->build()Landroid/media/MediaDescription;
 
-    move-result-object v0
+    move-result-object v1
 
-    iput-object v0, p0, Landroid/support/v4/media/MediaDescriptionCompat;->l:Ljava/lang/Object;
+    iput-object v1, p0, Landroid/support/v4/media/MediaDescriptionCompat;->l:Ljava/lang/Object;
 
     :cond_3
-    check-cast v0, Landroid/media/MediaDescription;
+    check-cast v1, Landroid/media/MediaDescription;
 
-    invoke-virtual {v0, p1, p2}, Landroid/media/MediaDescription;->writeToParcel(Landroid/os/Parcel;I)V
+    invoke-virtual {v1, p1, p2}, Landroid/media/MediaDescription;->writeToParcel(Landroid/os/Parcel;I)V
 
     return-void
 .end method

com.discord/smali/android/support/v4/media/MediaMetadataCompat.smali

@@ -17,7 +17,7 @@
     .end annotation
 .end field
 
-.field public static final f:Landroidx/collection/ArrayMap;
+.field public static final e:Landroidx/collection/ArrayMap;
     .annotation system Ldalvik/annotation/Signature;
         value = {
             "Landroidx/collection/ArrayMap<",
@@ -32,8 +32,6 @@
 # instance fields
 .field public final d:Landroid/os/Bundle;
 
-.field public e:Ljava/lang/Object;
-
 
 # direct methods
 .method public static constructor <clinit>()V
@@ -43,7 +41,7 @@
 
     invoke-direct {v0}, Landroidx/collection/ArrayMap;-><init>()V
 
-    sput-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
+    sput-object v0, Landroid/support/v4/media/MediaMetadataCompat;->e:Landroidx/collection/ArrayMap;
 
     const/4 v1, 0x1
 
@@ -55,14 +53,10 @@
 
     invoke-virtual {v0, v2, v1}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const-string v2, "android.media.metadata.ARTIST"
 
     invoke-virtual {v0, v2, v1}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const/4 v2, 0x0
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -73,80 +67,54 @@
 
     invoke-virtual {v0, v3, v2}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const-string v3, "android.media.metadata.ALBUM"
 
     invoke-virtual {v0, v3, v1}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const-string v3, "android.media.metadata.AUTHOR"
 
     invoke-virtual {v0, v3, v1}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const-string v3, "android.media.metadata.WRITER"
 
     invoke-virtual {v0, v3, v1}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const-string v3, "android.media.metadata.COMPOSER"
 
     invoke-virtual {v0, v3, v1}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const-string v3, "android.media.metadata.COMPILATION"
 
     invoke-virtual {v0, v3, v1}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const-string v3, "android.media.metadata.DATE"
 
     invoke-virtual {v0, v3, v1}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const-string v3, "android.media.metadata.YEAR"
 
     invoke-virtual {v0, v3, v2}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const-string v3, "android.media.metadata.GENRE"
 
     invoke-virtual {v0, v3, v1}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const-string v3, "android.media.metadata.TRACK_NUMBER"
 
     invoke-virtual {v0, v3, v2}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const-string v3, "android.media.metadata.NUM_TRACKS"
 
     invoke-virtual {v0, v3, v2}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const-string v3, "android.media.metadata.DISC_NUMBER"
 
     invoke-virtual {v0, v3, v2}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const-string v3, "android.media.metadata.ALBUM_ARTIST"
 
     invoke-virtual {v0, v3, v1}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const/4 v3, 0x2
 
     invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -157,26 +125,18 @@
 
     invoke-virtual {v0, v4, v3}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const-string v4, "android.media.metadata.ART_URI"
 
     invoke-virtual {v0, v4, v1}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const-string v4, "android.media.metadata.ALBUM_ART"
 
     invoke-virtual {v0, v4, v3}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const-string v4, "android.media.metadata.ALBUM_ART_URI"
 
     invoke-virtual {v0, v4, v1}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const/4 v4, 0x3
 
     invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -187,68 +147,46 @@
 
     invoke-virtual {v0, v5, v4}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const-string v5, "android.media.metadata.RATING"
 
     invoke-virtual {v0, v5, v4}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const-string v4, "android.media.metadata.DISPLAY_TITLE"
 
     invoke-virtual {v0, v4, v1}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const-string v4, "android.media.metadata.DISPLAY_SUBTITLE"
 
     invoke-virtual {v0, v4, v1}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const-string v4, "android.media.metadata.DISPLAY_DESCRIPTION"
 
     invoke-virtual {v0, v4, v1}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const-string v4, "android.media.metadata.DISPLAY_ICON"
 
     invoke-virtual {v0, v4, v3}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const-string v3, "android.media.metadata.DISPLAY_ICON_URI"
 
     invoke-virtual {v0, v3, v1}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const-string v3, "android.media.metadata.MEDIA_ID"
 
     invoke-virtual {v0, v3, v1}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const-string v3, "android.media.metadata.BT_FOLDER_TYPE"
 
     invoke-virtual {v0, v3, v2}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const-string v3, "android.media.metadata.MEDIA_URI"
 
     invoke-virtual {v0, v3, v1}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const-string v1, "android.media.metadata.ADVERTISEMENT"
 
     invoke-virtual {v0, v1, v2}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 
-    sget-object v0, Landroid/support/v4/media/MediaMetadataCompat;->f:Landroidx/collection/ArrayMap;
-
     const-string v1, "android.media.metadata.DOWNLOAD_STATUS"
 
     invoke-virtual {v0, v1, v2}, Landroidx/collection/SimpleArrayMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -282,45 +220,6 @@
     return-void
 .end method
 
-.method public static a(Ljava/lang/Object;)Landroid/support/v4/media/MediaMetadataCompat;
-    .locals 3
-
-    if-eqz p0, :cond_0
-
-    invoke-static {}, Landroid/os/Parcel;->obtain()Landroid/os/Parcel;
-
-    move-result-object v0
-
-    move-object v1, p0
-
-    check-cast v1, Landroid/media/MediaMetadata;
-
-    const/4 v2, 0x0
-
-    invoke-virtual {v1, v0, v2}, Landroid/media/MediaMetadata;->writeToParcel(Landroid/os/Parcel;I)V
-
-    invoke-virtual {v0, v2}, Landroid/os/Parcel;->setDataPosition(I)V
-
-    sget-object v1, Landroid/support/v4/media/MediaMetadataCompat;->CREATOR:Landroid/os/Parcelable$Creator;
-
-    invoke-interface {v1, v0}, Landroid/os/Parcelable$Creator;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;
-
-    move-result-object v1
-
-    check-cast v1, Landroid/support/v4/media/MediaMetadataCompat;
-
-    invoke-virtual {v0}, Landroid/os/Parcel;->recycle()V
-
-    iput-object p0, v1, Landroid/support/v4/media/MediaMetadataCompat;->e:Ljava/lang/Object;
-
-    return-object v1
-
-    :cond_0
-    const/4 p0, 0x0
-
-    return-object p0
-.end method
-
 
 # virtual methods
 .method public describeContents()I

com.discord/smali/android/support/v4/media/RatingCompat.smali

@@ -64,7 +64,7 @@
 
     const-string v0, "Rating:style="
 
-    invoke-static {v0}, Lf/e/c/a/a;->E(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v0}, Lf/e/c/a/a;->F(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object v0
 

com.discord/smali/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$ExtraBinderRequestResultReceiver.smali

@@ -76,7 +76,7 @@
 
     move-result-object v2
 
-    invoke-static {v2}, Ls/a/b/b/b/b$a;->g(Landroid/os/IBinder;)Ls/a/b/b/b/b;
+    invoke-static {v2}, Ls/a/b/b/b/b$a;->e(Landroid/os/IBinder;)Ls/a/b/b/b/b;
 
     move-result-object v2
 
@@ -88,9 +88,7 @@
 
     invoke-virtual {p2, v2}, Landroid/os/Bundle;->getBundle(Ljava/lang/String;)Landroid/os/Bundle;
 
-    move-result-object p2
-
-    iput-object p2, v1, Landroid/support/v4/media/session/MediaSessionCompat$Token;->f:Landroid/os/Bundle;
+    invoke-static {v1}, Ljava/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
 
     invoke-virtual {p1}, Landroid/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21;->a()V
 

com.discord/smali/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$a.smali

@@ -25,7 +25,82 @@
 
 
 # virtual methods
-.method public B(Ljava/util/List;)V
+.method public L(Ljava/lang/CharSequence;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/AssertionError;
+
+    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
+
+    throw p1
+.end method
+
+.method public M()V
+    .locals 1
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    new-instance v0, Ljava/lang/AssertionError;
+
+    invoke-direct {v0}, Ljava/lang/AssertionError;-><init>()V
+
+    throw v0
+.end method
+
+.method public N(Landroid/support/v4/media/MediaMetadataCompat;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/AssertionError;
+
+    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
+
+    throw p1
+.end method
+
+.method public k0(Landroid/support/v4/media/session/ParcelableVolumeInfo;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/AssertionError;
+
+    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
+
+    throw p1
+.end method
+
+.method public t(Landroid/os/Bundle;)V
+    .locals 0
+    .annotation system Ldalvik/annotation/Throws;
+        value = {
+            Landroid/os/RemoteException;
+        }
+    .end annotation
+
+    new-instance p1, Ljava/lang/AssertionError;
+
+    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
+
+    throw p1
+.end method
+
+.method public v(Ljava/util/List;)V
     .locals 0
     .annotation system Ldalvik/annotation/Signature;
         value = {
@@ -48,78 +123,3 @@
 
     throw p1
 .end method
-
-.method public B0(Landroid/support/v4/media/session/ParcelableVolumeInfo;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/AssertionError;
-
-    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
-
-    throw p1
-.end method
-
-.method public W(Ljava/lang/CharSequence;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/AssertionError;
-
-    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
-
-    throw p1
-.end method
-
-.method public Z()V
-    .locals 1
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    new-instance v0, Ljava/lang/AssertionError;
-
-    invoke-direct {v0}, Ljava/lang/AssertionError;-><init>()V
-
-    throw v0
-.end method
-
-.method public a0(Landroid/support/v4/media/MediaMetadataCompat;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/AssertionError;
-
-    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
-
-    throw p1
-.end method
-
-.method public y(Landroid/os/Bundle;)V
-    .locals 0
-    .annotation system Ldalvik/annotation/Throws;
-        value = {
-            Landroid/os/RemoteException;
-        }
-    .end annotation
-
-    new-instance p1, Ljava/lang/AssertionError;
-
-    invoke-direct {p1}, Ljava/lang/AssertionError;-><init>()V
-
-    throw p1
-.end method

com.discord/smali/android/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21.smali

@@ -80,21 +80,19 @@
 
     iput-object p2, p0, Landroid/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21;->e:Landroid/support/v4/media/session/MediaSessionCompat$Token;
 
-    iget-object p2, p2, Landroid/support/v4/media/session/MediaSessionCompat$Token;->d:Ljava/lang/Object;
+    iget-object v0, p2, Landroid/support/v4/media/session/MediaSessionCompat$Token;->d:Ljava/lang/Object;
 
-    new-instance v0, Landroid/media/session/MediaController;
+    new-instance v1, Landroid/media/session/MediaController;
 
-    check-cast p2, Landroid/media/session/MediaSession$Token;
+    check-cast v0, Landroid/media/session/MediaSession$Token;
 
-    invoke-direct {v0, p1, p2}, Landroid/media/session/MediaController;-><init>(Landroid/content/Context;Landroid/media/session/MediaSession$Token;)V
+    invoke-direct {v1, p1, v0}, Landroid/media/session/MediaController;-><init>(Landroid/content/Context;Landroid/media/session/MediaSession$Token;)V
 
-    iput-object v0, p0, Landroid/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21;->a:Ljava/lang/Object;
+    iput-object v1, p0, Landroid/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21;->a:Ljava/lang/Object;
 
-    if-eqz v0, :cond_1
+    if-eqz v1, :cond_1
 
-    iget-object p1, p0, Landroid/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21;->e:Landroid/support/v4/media/session/MediaSessionCompat$Token;
-
-    iget-object p1, p1, Landroid/support/v4/media/session/MediaSessionCompat$Token;->e:Ls/a/b/b/b/b;
+    iget-object p1, p2, Landroid/support/v4/media/session/MediaSessionCompat$Token;->e:Ls/a/b/b/b/b;
 
     if-nez p1, :cond_0
 
@@ -102,15 +100,13 @@
 
     invoke-direct {p1, p0}, Landroid/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21$ExtraBinderRequestResultReceiver;-><init>(Landroid/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21;)V
 
-    iget-object p2, p0, Landroid/support/v4/media/session/MediaControllerCompat$MediaControllerImplApi21;->a:Ljava/lang/Object;
+    check-cast v1, Landroid/media/session/MediaController;
 
-    check-cast p2, Landroid/media/session/MediaController;
+    const/4 p2, 0x0
 
-    const/4 v0, 0x0
+    const-string v0, "android.support.v4.media.session.command.GET_EXTRA_BINDER"
 
-    const-string v1, "android.support.v4.media.session.command.GET_EXTRA_BINDER"
-
-    invoke-virtual {p2, v1, v0, p1}, Landroid/media/session/MediaController;->sendCommand(Ljava/lang/String;Landroid/os/Bundle;Landroid/os/ResultReceiver;)V
+    invoke-virtual {v1, v0, p2, p1}, Landroid/media/session/MediaController;->sendCommand(Ljava/lang/String;Landroid/os/Bundle;Landroid/os/ResultReceiver;)V
 
     :cond_0
     return-void
@@ -174,7 +170,7 @@
 
     iget-object v1, v1, Landroid/support/v4/media/session/MediaSessionCompat$Token;->e:Ls/a/b/b/b/b;
 
-    invoke-interface {v1, v2}, Ls/a/b/b/b/b;->k(Ls/a/b/b/b/a;)V
+    invoke-interface {v1, v2}, Ls/a/b/b/b/b;->j(Ls/a/b/b/b/a;)V
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
 

com.discord/smali/android/support/v4/media/session/MediaSessionCompat$QueueItem.smali

@@ -129,7 +129,7 @@
 
     const-string v0, "MediaSession.QueueItem {Description="
 
-    invoke-static {v0}, Lf/e/c/a/a;->E(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v0}, Lf/e/c/a/a;->F(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object v0
 
@@ -145,7 +145,7 @@
 
     const-string v3, " }"
 
-    invoke-static {v0, v1, v2, v3}, Lf/e/c/a/a;->u(Ljava/lang/StringBuilder;JLjava/lang/String;)Ljava/lang/String;
+    invoke-static {v0, v1, v2, v3}, Lf/e/c/a/a;->v(Ljava/lang/StringBuilder;JLjava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 

com.discord/smali/android/support/v4/media/session/MediaSessionCompat$Token.smali

@@ -34,8 +34,6 @@
 
 .field public e:Ls/a/b/b/b/b;
 
-.field public f:Landroid/os/Bundle;
-
 
 # direct methods
 .method public static constructor <clinit>()V

com.discord/smali/android/support/v4/media/session/PlaybackStateCompat$CustomAction.smali

@@ -127,7 +127,7 @@
 
     const-string v0, "Action:mName=\'"
 
-    invoke-static {v0}, Lf/e/c/a/a;->E(Ljava/lang/String;)Ljava/lang/StringBuilder;
+    invoke-static {v0}, Lf/e/c/a/a;->F(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
     move-result-object v0
 

com.discord/smali/android/support/v4/media/session/PlaybackStateCompat.smali

@@ -57,8 +57,6 @@
 
 .field public final n:Landroid/os/Bundle;
 
-.field public o:Ljava/lang/Object;
-
 
 # direct methods
 .method public static constructor <clinit>()V
@@ -248,7 +246,7 @@
 
     invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
 
-    const-string v1, "state="
+    const-string/jumbo v1, "state="
 
     invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
@@ -328,7 +326,7 @@
 
     const-string/jumbo v3, "}"
 
-    invoke-static {v0, v1, v2, v3}, Lf/e/c/a/a;->u(Ljava/lang/StringBuilder;JLjava/lang/String;)Ljava/lang/String;
+    invoke-static {v0, v1, v2, v3}, Lf/e/c/a/a;->v(Ljava/lang/StringBuilder;JLjava/lang/String;)Ljava/lang/String;
 
     move-result-object v0
 

com.discord/smali/android/support/v4/os/ResultReceiver$b.smali

@@ -15,14 +15,14 @@
 
 
 # instance fields
-.field public final synthetic a:Landroid/support/v4/os/ResultReceiver;
+.field public final synthetic b:Landroid/support/v4/os/ResultReceiver;
 
 
 # direct methods
 .method public constructor <init>(Landroid/support/v4/os/ResultReceiver;)V
     .locals 0
 
-    iput-object p1, p0, Landroid/support/v4/os/ResultReceiver$b;->a:Landroid/support/v4/os/ResultReceiver;
+    iput-object p1, p0, Landroid/support/v4/os/ResultReceiver$b;->b:Landroid/support/v4/os/ResultReceiver;
 
     invoke-direct {p0}, Ls/a/b/c/a$a;-><init>()V
 
@@ -31,26 +31,16 @@
 
 
 # virtual methods
-.method public A0(ILandroid/os/Bundle;)V
-    .locals 3
+.method public j0(ILandroid/os/Bundle;)V
+    .locals 1
 
-    iget-object v0, p0, Landroid/support/v4/os/ResultReceiver$b;->a:Landroid/support/v4/os/ResultReceiver;
+    iget-object v0, p0, Landroid/support/v4/os/ResultReceiver$b;->b:Landroid/support/v4/os/ResultReceiver;
 
-    iget-object v1, v0, Landroid/support/v4/os/ResultReceiver;->e:Landroid/os/Handler;
+    invoke-static {v0}, Ljava/util/Objects;->requireNonNull(Ljava/lang/Object;)Ljava/lang/Object;
 
-    if-eqz v1, :cond_0
+    iget-object v0, p0, Landroid/support/v4/os/ResultReceiver$b;->b:Landroid/support/v4/os/ResultReceiver;
 
-    new-instance v2, Landroid/support/v4/os/ResultReceiver$c;
-
-    invoke-direct {v2, v0, p1, p2}, Landroid/support/v4/os/ResultReceiver$c;-><init>(Landroid/support/v4/os/ResultReceiver;ILandroid/os/Bundle;)V
-
-    invoke-virtual {v1, v2}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
-
-    goto :goto_0
-
-    :cond_0
     invoke-virtual {v0, p1, p2}, Landroid/support/v4/os/ResultReceiver;->a(ILandroid/os/Bundle;)V
 
-    :goto_0
     return-void
 .end method

com.discord/smali/android/support/v4/os/ResultReceiver$c.smali

@@ -1,57 +0,0 @@
-.class public Landroid/support/v4/os/ResultReceiver$c;
-.super Ljava/lang/Object;
-.source "ResultReceiver.java"
-
-# interfaces
-.implements Ljava/lang/Runnable;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
-    value = Landroid/support/v4/os/ResultReceiver;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
-    accessFlags = 0x1
-    name = "c"
-.end annotation
-
-
-# instance fields
-.field public final d:I
-
-.field public final e:Landroid/os/Bundle;
-
-.field public final synthetic f:Landroid/support/v4/os/ResultReceiver;
-
-
-# direct methods
-.method public constructor <init>(Landroid/support/v4/os/ResultReceiver;ILandroid/os/Bundle;)V
-    .locals 0
-
-    iput-object p1, p0, Landroid/support/v4/os/ResultReceiver$c;->f:Landroid/support/v4/os/ResultReceiver;
-
-    invoke-direct {p0}, Ljava/lang/Object;-><init>()V
-
-    iput p2, p0, Landroid/support/v4/os/ResultReceiver$c;->d:I
-
-    iput-object p3, p0, Landroid/support/v4/os/ResultReceiver$c;->e:Landroid/os/Bundle;
-
-    return-void
-.end method
-
-
-# virtual methods
-.method public run()V
-    .locals 3
-
-    iget-object v0, p0, Landroid/support/v4/os/ResultReceiver$c;->f:Landroid/support/v4/os/ResultReceiver;
-
-    iget v1, p0, Landroid/support/v4/os/ResultReceiver$c;->d:I
-
-    iget-object v2, p0, Landroid/support/v4/os/ResultReceiver$c;->e:Landroid/os/Bundle;
-
-    invoke-virtual {v0, v1, v2}, Landroid/support/v4/os/ResultReceiver;->a(ILandroid/os/Bundle;)V
-
-    return-void
-.end method

com.discord/smali/android/support/v4/os/ResultReceiver.smali

@@ -21,8 +21,7 @@
 
 .annotation system Ldalvik/annotation/MemberClasses;
     value = {
-        Landroid/support/v4/os/ResultReceiver$b;,
-        Landroid/support/v4/os/ResultReceiver$c;
+        Landroid/support/v4/os/ResultReceiver$b;
     }
 .end annotation
 
@@ -40,11 +39,7 @@
 
 
 # instance fields
-.field public final d:Z
-
-.field public final e:Landroid/os/Handler;
-
-.field public f:Ls/a/b/c/a;
+.field public d:Ls/a/b/c/a;
 
 
 # direct methods
@@ -61,27 +56,50 @@
 .end method
 
 .method public constructor <init>(Landroid/os/Parcel;)V
-    .locals 1
+    .locals 2
 
     invoke-direct {p0}, Ljava/lang/Object;-><init>()V
 
-    const/4 v0, 0x0
-
-    iput-boolean v0, p0, Landroid/support/v4/os/ResultReceiver;->d:Z
-
-    const/4 v0, 0x0
-
-    iput-object v0, p0, Landroid/support/v4/os/ResultReceiver;->e:Landroid/os/Handler;
-
     invoke-virtual {p1}, Landroid/os/Parcel;->readStrongBinder()Landroid/os/IBinder;
 
     move-result-object p1
 
-    invoke-static {p1}, Ls/a/b/c/a$a;->g(Landroid/os/IBinder;)Ls/a/b/c/a;
+    sget v0, Ls/a/b/c/a$a;->a:I
 
-    move-result-object p1
+    if-nez p1, :cond_0
 
-    iput-object p1, p0, Landroid/support/v4/os/ResultReceiver;->f:Ls/a/b/c/a;
+    const/4 p1, 0x0
+
+    goto :goto_0
+
+    :cond_0
+    const-string v0, "android.support.v4.os.IResultReceiver"
+
+    invoke-interface {p1, v0}, Landroid/os/IBinder;->queryLocalInterface(Ljava/lang/String;)Landroid/os/IInterface;
+
+    move-result-object v0
+
+    if-eqz v0, :cond_1
+
+    instance-of v1, v0, Ls/a/b/c/a;
+
+    if-eqz v1, :cond_1
+
+    move-object p1, v0
+
+    check-cast p1, Ls/a/b/c/a;
+
+    goto :goto_0
+
+    :cond_1
+    new-instance v0, Ls/a/b/c/a$a$a;
+
+    invoke-direct {v0, p1}, Ls/a/b/c/a$a$a;-><init>(Landroid/os/IBinder;)V
+
+    move-object p1, v0
+
+    :goto_0
+    iput-object p1, p0, Landroid/support/v4/os/ResultReceiver;->d:Ls/a/b/c/a;
 
     return-void
 .end method
@@ -95,42 +113,19 @@
 .end method
 
 .method public b(ILandroid/os/Bundle;)V
-    .locals 2
+    .locals 1
 
-    iget-boolean v0, p0, Landroid/support/v4/os/ResultReceiver;->d:Z
-
-    if-eqz v0, :cond_1
-
-    iget-object v0, p0, Landroid/support/v4/os/ResultReceiver;->e:Landroid/os/Handler;
+    iget-object v0, p0, Landroid/support/v4/os/ResultReceiver;->d:Ls/a/b/c/a;
 
     if-eqz v0, :cond_0
 
-    new-instance v1, Landroid/support/v4/os/ResultReceiver$c;
-
-    invoke-direct {v1, p0, p1, p2}, Landroid/support/v4/os/ResultReceiver$c;-><init>(Landroid/support/v4/os/ResultReceiver;ILandroid/os/Bundle;)V
-
-    invoke-virtual {v0, v1}, Landroid/os/Handler;->post(Ljava/lang/Runnable;)Z
-
-    goto :goto_0
-
-    :cond_0
-    invoke-virtual {p0, p1, p2}, Landroid/support/v4/os/ResultReceiver;->a(ILandroid/os/Bundle;)V
-
-    :goto_0
-    return-void
-
-    :cond_1
-    iget-object v0, p0, Landroid/support/v4/os/ResultReceiver;->f:Ls/a/b/c/a;
-
-    if-eqz v0, :cond_2
-
     :try_start_0
-    invoke-interface {v0, p1, p2}, Ls/a/b/c/a;->A0(ILandroid/os/Bundle;)V
+    invoke-interface {v0, p1, p2}, Ls/a/b/c/a;->j0(ILandroid/os/Bundle;)V
     :try_end_0
     .catch Landroid/os/RemoteException; {:try_start_0 .. :try_end_0} :catch_0
 
     :catch_0
-    :cond_2
+    :cond_0
     return-void
 .end method
 
@@ -148,7 +143,7 @@
     monitor-enter p0
 
     :try_start_0
-    iget-object p2, p0, Landroid/support/v4/os/ResultReceiver;->f:Ls/a/b/c/a;
+    iget-object p2, p0, Landroid/support/v4/os/ResultReceiver;->d:Ls/a/b/c/a;
 
     if-nez p2, :cond_0
 
@@ -156,10 +151,10 @@
 
     invoke-direct {p2, p0}, Landroid/support/v4/os/ResultReceiver$b;-><init>(Landroid/support/v4/os/ResultReceiver;)V
 
-    iput-object p2, p0, Landroid/support/v4/os/ResultReceiver;->f:Ls/a/b/c/a;
+    iput-object p2, p0, Landroid/support/v4/os/ResultReceiver;->d:Ls/a/b/c/a;
 
     :cond_0
-    iget-object p2, p0, Landroid/support/v4/os/ResultReceiver;->f:Ls/a/b/c/a;
+    iget-object p2, p0, Landroid/support/v4/os/ResultReceiver;->d:Ls/a/b/c/a;
 
     invoke-interface {p2}, Landroid/os/IInterface;->asBinder()Landroid/os/IBinder;
 

com.discord/smali/androidx/activity/ActivityViewModelLazyKt$viewModels$1.smali

@@ -1,5 +1,5 @@
 .class public final Landroidx/activity/ActivityViewModelLazyKt$viewModels$1;
-.super Ly/n/c/k;
+.super Ly/m/c/k;
 .source "ActivityViewModelLazy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Ly/n/c/k;",
+        "Ly/m/c/k;",
         "Lkotlin/jvm/functions/Function0<",
         "Landroidx/lifecycle/ViewModelStore;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Ly/n/c/k;-><init>(I)V
+    invoke-direct {p0, p1}, Ly/m/c/k;-><init>(I)V
 
     return-void
 .end method
@@ -56,7 +56,7 @@
 
     const-string/jumbo v1, "viewModelStore"
 
-    invoke-static {v0, v1}, Ly/n/c/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Ly/m/c/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method

com.discord/smali/androidx/activity/ActivityViewModelLazyKt$viewModels$factoryPromise$1.smali

@@ -1,5 +1,5 @@
 .class public final Landroidx/activity/ActivityViewModelLazyKt$viewModels$factoryPromise$1;
-.super Ly/n/c/k;
+.super Ly/m/c/k;
 .source "ActivityViewModelLazy.kt"
 
 # interfaces
@@ -18,7 +18,7 @@
 
 .annotation system Ldalvik/annotation/Signature;
     value = {
-        "Ly/n/c/k;",
+        "Ly/m/c/k;",
         "Lkotlin/jvm/functions/Function0<",
         "Landroidx/lifecycle/ViewModelProvider$Factory;",
         ">;"
@@ -38,7 +38,7 @@
 
     const/4 p1, 0x0
 
-    invoke-direct {p0, p1}, Ly/n/c/k;-><init>(I)V
+    invoke-direct {p0, p1}, Ly/m/c/k;-><init>(I)V
 
     return-void
 .end method
@@ -56,7 +56,7 @@
 
     const-string v1, "defaultViewModelProviderFactory"
 
-    invoke-static {v0, v1}, Ly/n/c/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {v0, v1}, Ly/m/c/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     return-object v0
 .end method

com.discord/smali/androidx/activity/ActivityViewModelLazyKt.smali

@@ -26,7 +26,7 @@
 
     const-string v0, "$this$viewModels"
 
-    invoke-static {p0, v0}, Ly/n/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, v0}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p1, :cond_0
 
@@ -38,7 +38,7 @@
     invoke-direct {p1, p0}, Landroidx/activity/ActivityViewModelLazyKt$viewModels$factoryPromise$1;-><init>(Landroidx/activity/ComponentActivity;)V
 
     :goto_0
-    invoke-static {}, Ly/n/c/j;->reifiedOperationMarker()V
+    invoke-static {}, Ly/m/c/j;->reifiedOperationMarker()V
 
     const/4 p0, 0x0
 
@@ -59,7 +59,7 @@
     :cond_0
     const-string p2, "$this$viewModels"
 
-    invoke-static {p0, p2}, Ly/n/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+    invoke-static {p0, p2}, Ly/m/c/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 
     if-eqz p1, :cond_1
 
@@ -71,7 +71,7 @@
     invoke-direct {p1, p0}, Landroidx/activity/ActivityViewModelLazyKt$viewModels$factoryPromise$1;-><init>(Landroidx/activity/ComponentActivity;)V
 
     :goto_0
-    invoke-static {}, Ly/n/c/j;->reifiedOperationMarker()V
+    invoke-static {}, Ly/m/c/j;->reifiedOperationMarker()V
 
     throw p3
 .end method

com.discord/smali/androidx/activity/ComponentActivity.smali

@@ -19,25 +19,25 @@
 
 
 # instance fields
-.field public mContentLayoutId:I
+.field private mContentLayoutId:I
     .annotation build Landroidx/annotation/LayoutRes;
     .end annotation
 .end field
 
-.field public mDefaultFactory:Landroidx/lifecycle/ViewModelProvider$Factory;
+.field private mDefaultFactory:Landroidx/lifecycle/ViewModelProvider$Factory;
 
-.field public final mLifecycleRegistry:Landroidx/lifecycle/LifecycleRegistry;
+.field private final mLifecycleRegistry:Landroidx/lifecycle/LifecycleRegistry;
 
-.field public final mOnBackPressedDispatcher:Landroidx/activity/OnBackPressedDispatcher;
+.field private final mOnBackPressedDispatcher:Landroidx/activity/OnBackPressedDispatcher;
 
-.field public final mSavedStateRegistryController:Landroidx/savedstate/SavedStateRegistryController;
+.field private final mSavedStateRegistryController:Landroidx/savedstate/SavedStateRegistryController;
 
-.field public mViewModelStore:Landroidx/lifecycle/ViewModelStore;
+.field private mViewModelStore:Landroidx/lifecycle/ViewModelStore;
 
 
 # direct methods
 .method public constructor <init>()V
-    .locals 2
+    .locals 3
 
     invoke-direct {p0}, Landroidx/core/app/ComponentActivity;-><init>()V
 
@@ -69,28 +69,28 @@
 
     if-eqz v0, :cond_1
 
-    invoke-virtual {p0}, Landroidx/activity/ComponentActivity;->getLifecycle()Landroidx/lifecycle/Lifecycle;
-
-    move-result-object v0
-
-    new-instance v1, Landroidx/activity/ComponentActivity$2;
-
-    invoke-direct {v1, p0}, Landroidx/activity/ComponentActivity$2;-><init>(Landroidx/activity/ComponentActivity;)V
-
-    invoke-virtual {v0, v1}, Landroidx/lifecycle/Lifecycle;->addObserver(Landroidx/lifecycle/LifecycleObserver;)V
-
-    invoke-virtual {p0}, Landroidx/activity/ComponentActivity;->getLifecycle()Landroidx/lifecycle/Lifecycle;
-
-    move-result-object v0
-
-    new-instance v1, Landroidx/activity/ComponentActivity$3;
-
-    invoke-direct {v1, p0}, Landroidx/activity/ComponentActivity$3;-><init>(Landroidx/activity/ComponentActivity;)V
-
-    invoke-virtual {v0, v1}, Landroidx/lifecycle/Lifecycle;->addObserver(Landroidx/lifecycle/LifecycleObserver;)V
-
     sget v0, Landroid/os/Build$VERSION;->SDK_INT:I
 
+    invoke-virtual {p0}, Landroidx/activity/ComponentActivity;->getLifecycle()Landroidx/lifecycle/Lifecycle;
+
+    move-result-object v1
+
+    new-instance v2, Landroidx/activity/ComponentActivity$2;
+
+    invoke-direct {v2, p0}, Landroidx/activity/ComponentActivity$2;-><init>(Landroidx/activity/ComponentActivity;)V
+
+    invoke-virtual {v1, v2}, Landroidx/lifecycle/Lifecycle;->addObserver(Landroidx/lifecycle/LifecycleObserver;)V
+
+    invoke-virtual {p0}, Landroidx/activity/ComponentActivity;->getLifecycle()Landroidx/lifecycle/Lifecycle;
+
+    move-result-object v1
+
+    new-instance v2, Landroidx/activity/ComponentActivity$3;
+
+    invoke-direct {v2, p0}, Landroidx/activity/ComponentActivity$3;-><init>(Landroidx/activity/ComponentActivity;)V
+
+    invoke-virtual {v1, v2}, Landroidx/lifecycle/Lifecycle;->addObserver(Landroidx/lifecycle/LifecycleObserver;)V
+
     const/16 v1, 0x17
 
     if-gt v0, v1, :cond_0