Changes of com.discord v1328

com.discord/apktool.yml

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

com.discord/res/values/strings.xml

@@ -1206,7 +1206,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">84dfefdcd2c245a7aa75b0faaeb48b11</string>
+    <string name="com.crashlytics.android.build_id">62a42c59f31448ccbbc3c8631d03d213</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/com/discord/BuildConfig.smali

@@ -42,11 +42,11 @@
 
 .field public static final SAMSUNGxDISCORD_CLIENT_ID:Ljava/lang/String; = "97t47j218f"
 
-.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1326"
+.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1328"
 
-.field public static final VERSION_CODE:I = 0x52e
+.field public static final VERSION_CODE:I = 0x530
 
-.field public static final VERSION_NAME:Ljava/lang/String; = "49.6"
+.field public static final VERSION_NAME:Ljava/lang/String; = "49.7"
 
 
 # direct methods

com.discord/smali/com/discord/app/AppLog.smali

@@ -393,7 +393,7 @@
 
     sget-object v0, Lcom/discord/utilities/buildutils/BuildUtils;->INSTANCE:Lcom/discord/utilities/buildutils/BuildUtils;
 
-    const-string v1, "49.6"
+    const-string v1, "49.7"
 
     invoke-virtual {v0, v1}, Lcom/discord/utilities/buildutils/BuildUtils;->isValidBuildVersionName(Ljava/lang/String;)Z
 

com.discord/smali/com/discord/models/domain/ModelUser$Me.smali

@@ -18,6 +18,28 @@
 .field public static final EMPTY:Lcom/discord/models/domain/ModelUser$Me;
 
 
+# instance fields
+.field public email:Ljava/lang/String;
+
+.field public mfaEnabled:Z
+
+.field public nsfwAllowed:Lcom/discord/models/domain/ModelUser$NsfwAllowance;
+
+.field public phone:Lcom/discord/models/domain/NullableField;
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "Lcom/discord/models/domain/NullableField<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+.end field
+
+.field public token:Ljava/lang/String;
+
+.field public verified:Z
+
+
 # direct methods
 .method public static constructor <clinit>()V
     .locals 2
@@ -76,7 +98,7 @@
 .end method
 
 .method public equals(Ljava/lang/Object;)Z
-    .locals 3
+    .locals 4
 
     const/4 v0, 0x1
 
@@ -100,9 +122,9 @@
 
     invoke-virtual {v1, p0}, Lcom/discord/models/domain/ModelUser$Me;->canEqual(Ljava/lang/Object;)Z
 
-    move-result v1
+    move-result v3
 
-    if-nez v1, :cond_2
+    if-nez v3, :cond_2
 
     return v2
 
@@ -116,13 +138,179 @@
     return v2
 
     :cond_3
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelUser$Me;->getEmail()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser$Me;->getEmail()Ljava/lang/String;
+
+    move-result-object v3
+
+    if-nez p1, :cond_4
+
+    if-eqz v3, :cond_5
+
+    goto :goto_0
+
+    :cond_4
+    invoke-virtual {p1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-nez p1, :cond_5
+
+    :goto_0
+    return v2
+
+    :cond_5
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelUser$Me;->isMfaEnabled()Z
+
+    move-result p1
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser$Me;->isMfaEnabled()Z
+
+    move-result v3
+
+    if-eq p1, v3, :cond_6
+
+    return v2
+
+    :cond_6
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelUser$Me;->isVerified()Z
+
+    move-result p1
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser$Me;->isVerified()Z
+
+    move-result v3
+
+    if-eq p1, v3, :cond_7
+
+    return v2
+
+    :cond_7
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelUser$Me;->getToken()Ljava/lang/String;
+
+    move-result-object p1
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser$Me;->getToken()Ljava/lang/String;
+
+    move-result-object v3
+
+    if-nez p1, :cond_8
+
+    if-eqz v3, :cond_9
+
+    goto :goto_1
+
+    :cond_8
+    invoke-virtual {p1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-nez p1, :cond_9
+
+    :goto_1
+    return v2
+
+    :cond_9
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelUser$Me;->getPhone()Lcom/discord/models/domain/NullableField;
+
+    move-result-object p1
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser$Me;->getPhone()Lcom/discord/models/domain/NullableField;
+
+    move-result-object v3
+
+    if-nez p1, :cond_a
+
+    if-eqz v3, :cond_b
+
+    goto :goto_2
+
+    :cond_a
+    invoke-virtual {p1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-nez p1, :cond_b
+
+    :goto_2
+    return v2
+
+    :cond_b
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelUser$Me;->getNsfwAllowed()Lcom/discord/models/domain/ModelUser$NsfwAllowance;
+
+    move-result-object p1
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser$Me;->getNsfwAllowed()Lcom/discord/models/domain/ModelUser$NsfwAllowance;
+
+    move-result-object v1
+
+    if-nez p1, :cond_c
+
+    if-eqz v1, :cond_d
+
+    goto :goto_3
+
+    :cond_c
+    invoke-virtual {p1, v1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+    move-result p1
+
+    if-nez p1, :cond_d
+
+    :goto_3
+    return v2
+
+    :cond_d
     return v0
 .end method
 
+.method public getEmail()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelUser$Me;->email:Ljava/lang/String;
+
+    return-object v0
+.end method
+
+.method public getNsfwAllowed()Lcom/discord/models/domain/ModelUser$NsfwAllowance;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelUser$Me;->nsfwAllowed:Lcom/discord/models/domain/ModelUser$NsfwAllowance;
+
+    return-object v0
+.end method
+
+.method public getPhone()Lcom/discord/models/domain/NullableField;
+    .locals 1
+    .annotation system Ldalvik/annotation/Signature;
+        value = {
+            "()",
+            "Lcom/discord/models/domain/NullableField<",
+            "Ljava/lang/String;",
+            ">;"
+        }
+    .end annotation
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelUser$Me;->phone:Lcom/discord/models/domain/NullableField;
+
+    return-object v0
+.end method
+
+.method public getToken()Ljava/lang/String;
+    .locals 1
+
+    iget-object v0, p0, Lcom/discord/models/domain/ModelUser$Me;->token:Ljava/lang/String;
+
+    return-object v0
+.end method
+
 .method public hasBirthday()Z
     .locals 2
 
-    iget-object v0, p0, Lcom/discord/models/domain/ModelUser;->nsfwAllowed:Lcom/discord/models/domain/ModelUser$NsfwAllowance;
+    iget-object v0, p0, Lcom/discord/models/domain/ModelUser$Me;->nsfwAllowed:Lcom/discord/models/domain/ModelUser$NsfwAllowance;
 
     sget-object v1, Lcom/discord/models/domain/ModelUser$NsfwAllowance;->UNKNOWN:Lcom/discord/models/domain/ModelUser$NsfwAllowance;
 
@@ -140,12 +328,146 @@
 .end method
 
 .method public hashCode()I
-    .locals 1
+    .locals 5
 
     invoke-super {p0}, Lcom/discord/models/domain/ModelUser;->hashCode()I
 
     move-result v0
 
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelUser$Me;->getEmail()Ljava/lang/String;
+
+    move-result-object v1
+
+    mul-int/lit8 v0, v0, 0x3b
+
+    const/16 v2, 0x2b
+
+    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
+
+    mul-int/lit8 v0, v0, 0x3b
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelUser$Me;->isMfaEnabled()Z
+
+    move-result v1
+
+    const/16 v3, 0x4f
+
+    const/16 v4, 0x61
+
+    if-eqz v1, :cond_1
+
+    const/16 v1, 0x4f
+
+    goto :goto_1
+
+    :cond_1
+    const/16 v1, 0x61
+
+    :goto_1
+    add-int/2addr v0, v1
+
+    mul-int/lit8 v0, v0, 0x3b
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelUser$Me;->isVerified()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_2
+
+    goto :goto_2
+
+    :cond_2
+    const/16 v3, 0x61
+
+    :goto_2
+    add-int/2addr v0, v3
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelUser$Me;->getToken()Ljava/lang/String;
+
+    move-result-object v1
+
+    mul-int/lit8 v0, v0, 0x3b
+
+    if-nez v1, :cond_3
+
+    const/16 v1, 0x2b
+
+    goto :goto_3
+
+    :cond_3
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    :goto_3
+    add-int/2addr v0, v1
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelUser$Me;->getPhone()Lcom/discord/models/domain/NullableField;
+
+    move-result-object v1
+
+    mul-int/lit8 v0, v0, 0x3b
+
+    if-nez v1, :cond_4
+
+    const/16 v1, 0x2b
+
+    goto :goto_4
+
+    :cond_4
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v1
+
+    :goto_4
+    add-int/2addr v0, v1
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelUser$Me;->getNsfwAllowed()Lcom/discord/models/domain/ModelUser$NsfwAllowance;
+
+    move-result-object v1
+
+    mul-int/lit8 v0, v0, 0x3b
+
+    if-nez v1, :cond_5
+
+    goto :goto_5
+
+    :cond_5
+    invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+    move-result v2
+
+    :goto_5
+    add-int/2addr v0, v2
+
+    return v0
+.end method
+
+.method public isMfaEnabled()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/models/domain/ModelUser$Me;->mfaEnabled:Z
+
+    return v0
+.end method
+
+.method public isVerified()Z
+    .locals 1
+
+    iget-boolean v0, p0, Lcom/discord/models/domain/ModelUser$Me;->verified:Z
+
     return v0
 .end method
 
@@ -176,7 +498,7 @@
 
     if-nez v1, :cond_2
 
-    iget-boolean v1, p0, Lcom/discord/models/domain/ModelUser;->verified:Z
+    iget-boolean v1, p0, Lcom/discord/models/domain/ModelUser$Me;->verified:Z
 
     if-eqz v1, :cond_1
 
@@ -192,7 +514,7 @@
     const/4 v1, 0x1
 
     :goto_2
-    iput-boolean v1, v0, Lcom/discord/models/domain/ModelUser;->verified:Z
+    iput-boolean v1, v0, Lcom/discord/models/domain/ModelUser$Me;->verified:Z
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelUser;->username:Ljava/lang/String;
 
@@ -213,10 +535,10 @@
     goto :goto_4
 
     :cond_4
-    iget-object v1, p0, Lcom/discord/models/domain/ModelUser;->email:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/models/domain/ModelUser$Me;->email:Ljava/lang/String;
 
     :goto_4
-    iput-object v1, v0, Lcom/discord/models/domain/ModelUser;->email:Ljava/lang/String;
+    iput-object v1, v0, Lcom/discord/models/domain/ModelUser$Me;->email:Ljava/lang/String;
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelUser;->avatar:Ljava/lang/String;
 
@@ -245,14 +567,14 @@
     goto :goto_6
 
     :cond_6
-    iget-object v1, p0, Lcom/discord/models/domain/ModelUser;->token:Ljava/lang/String;
+    iget-object v1, p0, Lcom/discord/models/domain/ModelUser$Me;->token:Ljava/lang/String;
 
     :goto_6
-    iput-object v1, v0, Lcom/discord/models/domain/ModelUser;->token:Ljava/lang/String;
+    iput-object v1, v0, Lcom/discord/models/domain/ModelUser$Me;->token:Ljava/lang/String;
 
     iget-boolean v1, p1, Lcom/discord/models/domain/ModelUser;->mfaEnabled:Z
 
-    iput-boolean v1, v0, Lcom/discord/models/domain/ModelUser;->mfaEnabled:Z
+    iput-boolean v1, v0, Lcom/discord/models/domain/ModelUser$Me;->mfaEnabled:Z
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelUser;->flags:Ljava/lang/Integer;
 
@@ -291,10 +613,10 @@
     goto :goto_9
 
     :cond_9
-    iget-object v1, p0, Lcom/discord/models/domain/ModelUser;->phone:Lcom/discord/models/domain/NullableField;
+    iget-object v1, p0, Lcom/discord/models/domain/ModelUser$Me;->phone:Lcom/discord/models/domain/NullableField;
 
     :goto_9
-    iput-object v1, v0, Lcom/discord/models/domain/ModelUser;->phone:Lcom/discord/models/domain/NullableField;
+    iput-object v1, v0, Lcom/discord/models/domain/ModelUser$Me;->phone:Lcom/discord/models/domain/NullableField;
 
     iget-object v1, p1, Lcom/discord/models/domain/ModelUser;->premiumTier:Lcom/discord/models/domain/ModelSubscriptionPlan$PremiumTier;
 
@@ -315,16 +637,16 @@
     goto :goto_b
 
     :cond_b
-    iget-object p1, p0, Lcom/discord/models/domain/ModelUser;->nsfwAllowed:Lcom/discord/models/domain/ModelUser$NsfwAllowance;
+    iget-object p1, p0, Lcom/discord/models/domain/ModelUser$Me;->nsfwAllowed:Lcom/discord/models/domain/ModelUser$NsfwAllowance;
 
     :goto_b
-    iput-object p1, v0, Lcom/discord/models/domain/ModelUser;->nsfwAllowed:Lcom/discord/models/domain/ModelUser$NsfwAllowance;
+    iput-object p1, v0, Lcom/discord/models/domain/ModelUser$Me;->nsfwAllowed:Lcom/discord/models/domain/ModelUser$NsfwAllowance;
 
     return-object v0
 .end method
 
 .method public toString()Ljava/lang/String;
-    .locals 3
+    .locals 2
 
     const-string v0, "ModelUser.Me(super="
 
@@ -336,9 +658,73 @@
 
     move-result-object v1
 
-    const-string v2, ")"
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    invoke-static {v0, v1, v2}, Lf/e/c/a/a;->w(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+    const-string v1, ", email="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelUser$Me;->getEmail()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", mfaEnabled="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelUser$Me;->isMfaEnabled()Z
+
+    move-result v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    const-string v1, ", verified="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelUser$Me;->isVerified()Z
+
+    move-result v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
+    const-string v1, ", token="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelUser$Me;->getToken()Ljava/lang/String;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", phone="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelUser$Me;->getPhone()Lcom/discord/models/domain/NullableField;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ", nsfwAllowed="
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {p0}, Lcom/discord/models/domain/ModelUser$Me;->getNsfwAllowed()Lcom/discord/models/domain/ModelUser$NsfwAllowance;
+
+    move-result-object v1
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+    const-string v1, ")"
+
+    invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+    invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
 
     move-result-object v0
 

com.discord/smali/com/discord/stores/StoreClientVersion.smali

@@ -28,7 +28,7 @@
 
     invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
 
-    const/16 v0, 0x52e
+    const/16 v0, 0x530
 
     iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I
 

com.discord/smali/com/discord/stores/StoreSearch.smali

@@ -225,7 +225,7 @@
 
     if-eqz v0, :cond_0
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getNsfwAllowed()Lcom/discord/models/domain/ModelUser$NsfwAllowance;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser$Me;->getNsfwAllowed()Lcom/discord/models/domain/ModelUser$NsfwAllowance;
 
     move-result-object v0
 

com.discord/smali/com/discord/stores/StoreUser.smali

@@ -774,7 +774,7 @@
 
     move-result-object p1
 
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getEmail()Ljava/lang/String;
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser$Me;->getEmail()Ljava/lang/String;
 
     move-result-object v1
 

com.discord/smali/com/discord/stores/StoreVoiceChannelSelected.smali

@@ -547,7 +547,7 @@
     :cond_b
     if-eqz v1, :cond_d
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->isVerified()Z
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser$Me;->isVerified()Z
 
     move-result p1
 

com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali

@@ -173,7 +173,7 @@
 
     const-string v3, "browser_user_agent"
 
-    const-string v4, "Discord-Android/1326"
+    const-string v4, "Discord-Android/1328"
 
     invoke-direct {v2, v3, v4}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 
@@ -181,7 +181,7 @@
 
     const/4 v1, 0x2
 
-    const/16 v2, 0x52e
+    const/16 v2, 0x530
 
     invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
 
@@ -201,7 +201,7 @@
 
     const-string v3, "client_version"
 
-    const-string v4, "49.6"
+    const-string v4, "49.7"
 
     invoke-direct {v2, v3, v4}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 

com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils$initAppOpen$1.smali

@@ -152,7 +152,7 @@
 
     move-result-object v0
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getEmail()Ljava/lang/String;
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser$Me;->getEmail()Ljava/lang/String;
 
     move-result-object v1
 

com.discord/smali/com/discord/utilities/channel/GuildChannelsInfo$Companion$get$1.smali

@@ -126,7 +126,7 @@
 
     if-eqz p1, :cond_0
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUser;->isMfaEnabled()Z
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUser$Me;->isMfaEnabled()Z
 
     move-result v2
 
@@ -317,7 +317,7 @@
 
     if-eqz p1, :cond_b
 
-    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUser;->isMfaEnabled()Z
+    invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUser$Me;->isMfaEnabled()Z
 
     move-result v0
 

com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali

@@ -159,7 +159,7 @@
 .method public getUserAgent()Ljava/lang/String;
     .locals 1
 
-    const-string v0, "Discord-Android/1326"
+    const-string v0, "Discord-Android/1328"
 
     return-object v0
 .end method

com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$$inlined$filterIs$1.smali

@@ -1,4 +1,4 @@
-.class public final Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$1;
+.class public final Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$$inlined$filterIs$1;
 .super Ljava/lang/Object;
 .source "ObservableExtensions.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
+    value = Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->onResume()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -33,18 +33,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$1;
+.field public static final INSTANCE:Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$$inlined$filterIs$1;
 
 
 # direct methods
 .method public static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$1;
+    new-instance v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$$inlined$filterIs$1;
 
-    invoke-direct {v0}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$1;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$$inlined$filterIs$1;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$1;->INSTANCE:Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$1;
+    sput-object v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$$inlined$filterIs$1;->INSTANCE:Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$$inlined$filterIs$1;
 
     return-void
 .end method
@@ -74,7 +74,7 @@
 .method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
     .locals 0
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$1;->call(Ljava/lang/Object;)Ljava/lang/Boolean;
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$$inlined$filterIs$1;->call(Ljava/lang/Object;)Ljava/lang/Boolean;
 
     move-result-object p1
 

com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$$inlined$filterIs$2.smali

@@ -1,4 +1,4 @@
-.class public final Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$2;
+.class public final Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$$inlined$filterIs$2;
 .super Ljava/lang/Object;
 .source "ObservableExtensions.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
+    value = Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->onResume()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -32,18 +32,18 @@
 
 
 # static fields
-.field public static final INSTANCE:Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$2;
+.field public static final INSTANCE:Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$$inlined$filterIs$2;
 
 
 # direct methods
 .method public static constructor <clinit>()V
     .locals 1
 
-    new-instance v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$2;
+    new-instance v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$$inlined$filterIs$2;
 
-    invoke-direct {v0}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$2;-><init>()V
+    invoke-direct {v0}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$$inlined$filterIs$2;-><init>()V
 
-    sput-object v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$2;->INSTANCE:Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$2;
+    sput-object v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$$inlined$filterIs$2;->INSTANCE:Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$$inlined$filterIs$2;
 
     return-void
 .end method

com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$1.smali

@@ -1,4 +1,4 @@
-.class public final synthetic Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$1;
+.class public final synthetic Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$1;
 .super Lz/n/c/i;
 .source "WidgetChannelFollowSheet.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
+    value = Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->onResume()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -57,7 +57,7 @@
 
     check-cast p1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$1;->invoke(Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$1;->invoke(Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$ViewState$Loaded;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 

com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$2.smali

@@ -1,4 +1,4 @@
-.class public final Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$2;
+.class public final Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$2;
 .super Lz/n/c/k;
 .source "WidgetChannelFollowSheet.kt"
 
@@ -8,7 +8,7 @@
 
 # annotations
 .annotation system Ldalvik/annotation/EnclosingMethod;
-    value = Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
+    value = Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->onResume()V
 .end annotation
 
 .annotation system Ldalvik/annotation/InnerClass;
@@ -35,7 +35,7 @@
 .method public constructor <init>(Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;)V
     .locals 0
 
-    iput-object p1, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$2;->this$0:Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
+    iput-object p1, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$2;->this$0:Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
 
     const/4 p1, 0x1
 
@@ -51,7 +51,7 @@
 
     check-cast p1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$Event;
 
-    invoke-virtual {p0, p1}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$2;->invoke(Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$Event;)V
+    invoke-virtual {p0, p1}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$2;->invoke(Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$Event;)V
 
     sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
 
@@ -65,13 +65,13 @@
 
     invoke-static {p1, v0}, Lz/n/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    iget-object p1, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$2;->this$0:Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
+    iget-object p1, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$2;->this$0:Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
 
     invoke-virtual {p1}, Lcom/discord/app/AppBottomSheet;->dismiss()V
 
     sget-object p1, Lcom/discord/widgets/announcements/WidgetChannelFollowSuccessDialog;->Companion:Lcom/discord/widgets/announcements/WidgetChannelFollowSuccessDialog$Companion;
 
-    iget-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$2;->this$0:Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
+    iget-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$2;->this$0:Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
 
     invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager;
 

com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet.smali

@@ -904,102 +904,142 @@
     .end packed-switch
 .end method
 
-.method public onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
+.method public onCreateView(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Landroid/os/Bundle;)Landroid/view/View;
-    .locals 11
+    .locals 6
 
-    const-string/jumbo v0, "view"
+    const-string v0, "inflater"
 
     invoke-static {p1, v0}, Lz/n/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
 
-    invoke-super {p0, p1, p2}, Lcom/discord/app/AppBottomSheet;->onViewCreated(Landroid/view/View;Landroid/os/Bundle;)V
-
-    invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getArgumentsOrDefault()Landroid/os/Bundle;
-
-    move-result-object p1
-
-    const-string p2, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
-
-    invoke-virtual {p1, p2}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
-
-    move-result-wide p1
-
     invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getArgumentsOrDefault()Landroid/os/Bundle;
 
     move-result-object v0
 
-    const-string v1, "com.discord.intent.extra.EXTRA_GUILD_ID"
+    const-string v1, "com.discord.intent.extra.EXTRA_CHANNEL_ID"
 
     invoke-virtual {v0, v1}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
 
     move-result-wide v0
 
-    new-instance v2, Landroidx/lifecycle/ViewModelProvider;
+    invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->getArgumentsOrDefault()Landroid/os/Bundle;
-
-    invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireActivity()Landroidx/fragment/app/FragmentActivity;
-
-    move-result-object v3
-
-    new-instance v4, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$Factory;
-
-    invoke-direct {v4, v0, v1, p1, p2}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$Factory;-><init>(JJ)V
-
-    invoke-direct {v2, v3, v4}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
-
-    const-class p1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;
-
-    invoke-virtual {v2, p1}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
-
-    move-result-object p1
-
-    const-string p2, "ViewModelProvider(\n     \u2026eetViewModel::class.java)"
-
-    invoke-static {p1, p2}, Lz/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
-
-    check-cast p1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;
-
-    iput-object p1, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->viewModel:Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;
-
-    const-string/jumbo p2, "viewModel"
-
-    const/4 v0, 0x0
-
-    if-eqz p1, :cond_1
-
-    invoke-virtual {p1}, Lf/a/b/l0;->observeViewState()Lrx/Observable;
-
-    move-result-object p1
-
-    invoke-virtual {p1}, Lrx/Observable;->q()Lrx/Observable;
-
-    move-result-object p1
-
-    const-string/jumbo v1, "viewModel\n        .obser\u2026  .distinctUntilChanged()"
-
-    invoke-static {p1, v1}, Lz/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
-
-    sget-object v1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$1;->INSTANCE:Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$1;
-
-    invoke-virtual {p1, v1}, Lrx/Observable;->v(Li0/k/b;)Lrx/Observable;
-
-    move-result-object p1
-
-    sget-object v1, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$2;->INSTANCE:Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$$inlined$filterIs$2;
-
-    invoke-virtual {p1, v1}, Lrx/Observable;->D(Li0/k/b;)Lrx/Observable;
-
-    move-result-object p1
-
-    const-string v1, "filter { it is T }.map { it as T }"
-
-    invoke-static {p1, v1}, Lz/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
-
-    const/4 v1, 0x2
-
-    invoke-static {p1, p0, v0, v1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
 
     move-result-object v2
 
-    const-class v3, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
+    const-string v3, "com.discord.intent.extra.EXTRA_GUILD_ID"
+
+    invoke-virtual {v2, v3}, Landroid/os/Bundle;->getLong(Ljava/lang/String;)J
+
+    move-result-wide v2
+
+    new-instance v4, Landroidx/lifecycle/ViewModelProvider;
+
+    new-instance v5, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$Factory;
+
+    invoke-direct {v5, v2, v3, v0, v1}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel$Factory;-><init>(JJ)V
+
+    invoke-direct {v4, p0, v5}, Landroidx/lifecycle/ViewModelProvider;-><init>(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
+
+    const-class v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;
+
+    invoke-virtual {v4, v0}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
+
+    move-result-object v0
+
+    const-string v1, "ViewModelProvider(\n     \u2026eetViewModel::class.java)"
+
+    invoke-static {v0, v1}, Lz/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    check-cast v0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;
+
+    iput-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->viewModel:Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;
+
+    invoke-super {p0, p1, p2, p3}, Lcom/discord/app/AppBottomSheet;->onCreateView(Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Landroid/os/Bundle;)Landroid/view/View;
+
+    move-result-object p1
+
+    return-object p1
+.end method
+
+.method public onResume()V
+    .locals 13
+
+    invoke-super {p0}, Lcom/discord/app/AppBottomSheet;->onResume()V
+
+    iget-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->viewModel:Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;
+
+    const/4 v1, 0x0
+
+    const-string/jumbo v2, "viewModel"
+
+    if-eqz v0, :cond_1
+
+    invoke-virtual {v0}, Lf/a/b/l0;->observeViewState()Lrx/Observable;
+
+    move-result-object v0
+
+    invoke-virtual {v0}, Lrx/Observable;->q()Lrx/Observable;
+
+    move-result-object v0
+
+    const-string/jumbo v3, "viewModel\n        .obser\u2026  .distinctUntilChanged()"
+
+    invoke-static {v0, v3}, Lz/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    sget-object v3, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$$inlined$filterIs$1;->INSTANCE:Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$$inlined$filterIs$1;
+
+    invoke-virtual {v0, v3}, Lrx/Observable;->v(Li0/k/b;)Lrx/Observable;
+
+    move-result-object v0
+
+    sget-object v3, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$$inlined$filterIs$2;->INSTANCE:Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$$inlined$filterIs$2;
+
+    invoke-virtual {v0, v3}, Lrx/Observable;->D(Li0/k/b;)Lrx/Observable;
+
+    move-result-object v0
+
+    const-string v3, "filter { it is T }.map { it as T }"
+
+    invoke-static {v0, v3}, Lz/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
+
+    invoke-static {v0, p0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->bindToComponentLifecycle(Lrx/Observable;Lcom/discord/app/AppComponent;)Lrx/Observable;
+
+    move-result-object v4
+
+    const-class v5, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
+
+    const/4 v6, 0x0
+
+    const/4 v7, 0x0
+
+    const/4 v8, 0x0
+
+    const/4 v9, 0x0
+
+    new-instance v10, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$1;
+
+    invoke-direct {v10, p0}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$1;-><init>(Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;)V
+
+    const/16 v11, 0x1e
+
+    const/4 v12, 0x0
+
+    invoke-static/range {v4 .. v12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+
+    iget-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->viewModel:Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;
+
+    if-eqz v0, :cond_0
+
+    invoke-virtual {v0}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;->observeEvents()Lrx/Observable;
+
+    move-result-object v0
+
+    invoke-static {v0, p0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->bindToComponentLifecycle(Lrx/Observable;Lcom/discord/app/AppComponent;)Lrx/Observable;
+
+    move-result-object v1
+
+    const-class v2, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
+
+    const/4 v3, 0x0
 
     const/4 v4, 0x0
 
@@ -1007,59 +1047,25 @@
 
     const/4 v6, 0x0
 
-    const/4 v7, 0x0
+    new-instance v7, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$2;
 
-    new-instance v8, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$1;
+    invoke-direct {v7, p0}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onResume$2;-><init>(Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;)V
 
-    invoke-direct {v8, p0}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$1;-><init>(Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;)V
+    const/16 v8, 0x1e
 
-    const/16 v9, 0x1e
+    const/4 v9, 0x0
 
-    const/4 v10, 0x0
+    invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
-
-    invoke-static/range {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
-
-    iget-object p1, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->viewModel:Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;
-
-    if-eqz p1, :cond_0
-
-    invoke-virtual {p1}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheetViewModel;->observeEvents()Lrx/Observable;
-
-    move-result-object p1
-
-    invoke-static {p1, p0, v0, v1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable;
-
-    move-result-object v2
-
-    const-class v3, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;
-
-    const/4 v4, 0x0
-
-    const/4 v5, 0x0
-
-    const/4 v6, 0x0
-
-    const/4 v7, 0x0
-
-    new-instance v8, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$2;
-
-    invoke-direct {v8, p0}, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet$onViewCreated$2;-><init>(Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;)V
-
-    const/16 v9, 0x1e
-
-    const/4 v10, 0x0
-
-    invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
 
     return-void
 
     :cond_0
-    invoke-static {p2}, Lz/n/c/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lz/n/c/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v1
 
     :cond_1
-    invoke-static {p2}, Lz/n/c/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+    invoke-static {v2}, Lz/n/c/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
 
-    throw v0
+    throw v1
 .end method

com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel$Companion.smali

@@ -185,7 +185,7 @@
 
     if-eqz p1, :cond_8
 
-    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isVerified()Z
+    invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser$Me;->isVerified()Z
 
     move-result p1
 

com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions.smali

@@ -1244,231 +1244,263 @@
 
     if-nez v0, :cond_12
 
-    const/4 v0, 0x1
+    const/4 v2, 0x1
 
     goto :goto_10
 
     :cond_12
-    const/4 v0, 0x0
+    const/4 v2, 0x0
 
     :goto_10
-    if-eqz v0, :cond_13
+    if-eqz v2, :cond_13
 
-    const/4 v0, 0x0
+    const/4 v2, 0x0
 
     goto :goto_11
 
     :cond_13
-    const/16 v0, 0x8
+    const/16 v2, 0x8
 
     :goto_11
-    invoke-virtual {v1, v0}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getChatActionsShare()Landroid/view/View;
 
-    move-result-object v0
+    move-result-object v1
 
-    new-instance v1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$9;
+    new-instance v2, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$9;
 
-    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$9;-><init>(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;)V
+    invoke-direct {v2, p0, p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$9;-><init>(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;)V
 
-    invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v1, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getChatActionsPin()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object v1
 
     invoke-virtual {p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getManageMessageContext()Lcom/discord/utilities/permissions/ManageMessageContext;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-virtual {v1}, Lcom/discord/utilities/permissions/ManageMessageContext;->getCanTogglePinned()Z
+    invoke-virtual {v2}, Lcom/discord/utilities/permissions/ManageMessageContext;->getCanTogglePinned()Z
 
-    move-result v1
+    move-result v2
 
-    if-eqz v1, :cond_14
+    if-eqz v2, :cond_14
 
-    const/4 v1, 0x0
+    const/4 v2, 0x0
 
     goto :goto_12
 
     :cond_14
-    const/16 v1, 0x8
+    const/16 v2, 0x8
 
     :goto_12
-    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getChatActionsPin()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object v1
 
     invoke-virtual {p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getMessage()Lcom/discord/models/domain/ModelMessage;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-virtual {v1}, Lcom/discord/models/domain/ModelMessage;->isPinned()Z
+    invoke-virtual {v2}, Lcom/discord/models/domain/ModelMessage;->isPinned()Z
 
-    move-result v1
+    move-result v2
 
-    if-eqz v1, :cond_15
+    if-eqz v2, :cond_15
 
-    const v1, 0x7f12185b
+    const v2, 0x7f12185b
 
     goto :goto_13
 
     :cond_15
-    const v1, 0x7f121261
+    const v2, 0x7f121261
 
     :goto_13
-    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
+    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getChatActionsPin()Landroid/widget/TextView;
 
-    move-result-object v0
+    move-result-object v1
 
-    new-instance v1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$10;
+    new-instance v2, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$10;
 
-    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$10;-><init>(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;)V
+    invoke-direct {v2, p0, p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$10;-><init>(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;)V
 
-    invoke-virtual {v0, v1}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v1, v2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getChatActionsDelete()Landroid/view/View;
 
-    move-result-object v0
+    move-result-object v1
 
     invoke-virtual {p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getManageMessageContext()Lcom/discord/utilities/permissions/ManageMessageContext;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-virtual {v1}, Lcom/discord/utilities/permissions/ManageMessageContext;->getCanDelete()Z
+    invoke-virtual {v2}, Lcom/discord/utilities/permissions/ManageMessageContext;->getCanDelete()Z
 
-    move-result v1
+    move-result v2
 
-    if-eqz v1, :cond_16
+    if-eqz v2, :cond_16
 
-    const/4 v1, 0x0
+    const/4 v2, 0x0
 
     goto :goto_14
 
     :cond_16
-    const/16 v1, 0x8
+    const/16 v2, 0x8
 
     :goto_14
-    invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getChatActionsDelete()Landroid/view/View;
 
-    move-result-object v0
+    move-result-object v1
 
-    new-instance v1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$11;
+    new-instance v2, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$11;
 
-    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$11;-><init>(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;)V
+    invoke-direct {v2, p0, p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$11;-><init>(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;)V
 
-    invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v1, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getChatActionsProfile()Landroid/view/View;
 
-    move-result-object v0
+    move-result-object v1
 
-    new-instance v1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$12;
+    new-instance v2, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$12;
 
-    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$12;-><init>(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;)V
+    invoke-direct {v2, p0, p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$12;-><init>(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;)V
 
-    invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v1, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
 
     invoke-virtual {p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
-    move-result-object v0
+    move-result-object v1
 
-    if-eqz v0, :cond_17
+    if-eqz v1, :cond_17
 
     invoke-virtual {p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getCanReply()Z
 
-    move-result v0
+    move-result v1
 
-    if-nez v0, :cond_17
+    if-nez v1, :cond_17
 
-    sget-object v0, Lcom/discord/utilities/textprocessing/MessageUtils;->INSTANCE:Lcom/discord/utilities/textprocessing/MessageUtils;
+    sget-object v1, Lcom/discord/utilities/textprocessing/MessageUtils;->INSTANCE:Lcom/discord/utilities/textprocessing/MessageUtils;
 
     invoke-virtual {p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getMessage()Lcom/discord/models/domain/ModelMessage;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-virtual {v0, v1}, Lcom/discord/utilities/textprocessing/MessageUtils;->isContentQuotable(Lcom/discord/models/domain/ModelMessage;)Z
+    invoke-virtual {v1, v2}, Lcom/discord/utilities/textprocessing/MessageUtils;->isContentQuotable(Lcom/discord/models/domain/ModelMessage;)Z
 
-    move-result v0
+    move-result v1
 
-    if-eqz v0, :cond_17
+    if-eqz v1, :cond_17
 
     invoke-virtual {p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getChannel()Lcom/discord/models/domain/ModelChannel;
 
-    move-result-object v0
+    move-result-object v1
 
     invoke-virtual {p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getPermissions()Ljava/lang/Long;
 
-    move-result-object v1
+    move-result-object v2
 
-    invoke-static {v0, v1}, Lcom/discord/utilities/permissions/PermissionUtils;->hasAccessWrite(Lcom/discord/models/domain/ModelChannel;Ljava/lang/Long;)Z
+    invoke-static {v1, v2}, Lcom/discord/utilities/permissions/PermissionUtils;->hasAccessWrite(Lcom/discord/models/domain/ModelChannel;Ljava/lang/Long;)Z
 
-    move-result v0
+    move-result v1
 
-    if-eqz v0, :cond_17
+    if-eqz v1, :cond_17
 
-    const/4 v0, 0x1
+    const/4 v1, 0x1
 
     goto :goto_15
 
     :cond_17
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     :goto_15
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getChatActionsQuote()Landroid/view/View;
 
-    move-result-object v1
+    move-result-object v2
 
-    if-eqz v0, :cond_18
+    if-eqz v1, :cond_18
 
-    const/4 v0, 0x0
+    const/4 v1, 0x0
 
     goto :goto_16
 
     :cond_18
-    const/16 v0, 0x8
+    const/16 v1, 0x8
 
     :goto_16
-    invoke-virtual {v1, v0}, Landroid/view/View;->setVisibility(I)V
+    invoke-virtual {v2, v1}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getChatActionsQuote()Landroid/view/View;
 
-    move-result-object v0
+    move-result-object v1
 
-    new-instance v1, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$13;
+    new-instance v2, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$13;
 
-    invoke-direct {v1, p0, p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$13;-><init>(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;)V
+    invoke-direct {v2, p0, p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$13;-><init>(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;)V
 
-    invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+    invoke-virtual {v1, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getChannel()Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object v1
+
+    if-eqz v1, :cond_19
+
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getChannel()Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->isPrivate()Z
+
+    move-result v1
+
+    if-eqz v1, :cond_19
+
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getChannel()Lcom/discord/models/domain/ModelChannel;
+
+    move-result-object v1
+
+    invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->isSystemDM()Z
+
+    move-result v1
+
+    if-nez v1, :cond_19
+
+    const/4 v1, 0x1
+
+    goto :goto_17
+
+    :cond_19
+    const/4 v1, 0x0
+
+    :goto_17
+    if-nez v0, :cond_1a
 
     invoke-virtual {p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getCanReply()Z
 
     move-result v0
 
-    if-eqz v0, :cond_19
+    if-eqz v0, :cond_1a
 
-    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getChannel()Lcom/discord/models/domain/ModelChannel;
+    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getMessage()Lcom/discord/models/domain/ModelMessage;
 
     move-result-object v0
 
-    if-eqz v0, :cond_19
+    invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessage;->isUserMessage()Z
-
-    invoke-virtual {p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getChannel()Lcom/discord/models/domain/ModelChannel;
-
-    move-result-object v0
-
-    invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->isPrivate()Z
 
     move-result v0
 
-    if-nez v0, :cond_1a
+    if-eqz v0, :cond_1a
+
+    if-nez v1, :cond_1b
 
     const-wide/32 v0, 0x10800
 
@@ -1480,27 +1512,27 @@
 
     move-result v0
 
-    if-eqz v0, :cond_19
+    if-eqz v0, :cond_1a
 
-    goto :goto_17
+    goto :goto_18
-
-    :cond_19
-    const/4 v4, 0x0
 
     :cond_1a
-    :goto_17
+    const/4 v4, 0x0
+
+    :cond_1b
+    :goto_18
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getChatActionsReply()Landroid/view/View;
 
     move-result-object v0
 
-    if-eqz v4, :cond_1b
+    if-eqz v4, :cond_1c
 
-    goto :goto_18
+    goto :goto_19
 
-    :cond_1b
+    :cond_1c
     const/16 v5, 0x8
 
-    :goto_18
+    :goto_19
     invoke-virtual {v0, v5}, Landroid/view/View;->setVisibility(I)V
 
     invoke-direct {p0}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getChatActionsReply()Landroid/view/View;

com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali

@@ -446,7 +446,7 @@
 
     new-array v2, v0, [Ljava/lang/Object;
 
-    const-string v4, "49.6"
+    const-string v4, "49.7"
 
     aput-object v4, v2, v3
 

com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali

@@ -1870,7 +1870,7 @@
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 
-    const-string v0, " - 49.6 (1326)"
+    const-string v0, " - 49.7 (1328)"
 
     invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
 

com.discord/smali_classes2/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$8.smali

@@ -57,7 +57,7 @@
 
     move-result-object p1
 
-    sget-object v1, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;->NO_HISTORY_FROM_USER_SETTINGS:Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;
+    sget-object v1, Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;->UNFORCED:Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;
 
     invoke-virtual {v0, p1, v1}, Lcom/discord/widgets/user/phone/WidgetUserPhoneManage$Companion;->launch(Landroid/content/Context;Lcom/discord/widgets/user/account/WidgetUserAccountVerifyBase$Mode;)V