diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml
index 2ddf65e7b4..2ae3a383a2 100644
--- a/com.discord/apktool.yml
+++ b/com.discord/apktool.yml
@@ -1,5 +1,5 @@
!!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-1235.apk
+apkFileName: com.discord-1236.apk
compressionType: false
doNotCompress:
- resources.arsc
@@ -3106,5 +3106,5 @@ usesFramework:
tag: null
version: 2.4.2-83a459-SNAPSHOT
versionInfo:
- versionCode: '1235'
- versionName: '35.0'
+ versionCode: '1236'
+ versionName: '35.1'
diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml
index b22db1584a..fd403e0b15 100644
Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ
diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml
index 03394e2dcd..67869fc10d 100644
--- a/com.discord/res/values/strings.xml
+++ b/com.discord/res/values/strings.xml
@@ -1128,7 +1128,7 @@ We’re here to make a good impression."
Presets
Select a color
Transparency
- 1d9d3aadf02e437a8e41ab7650798d42
+ d62bbea391914230a1e8261fe3e8d5ec
Coming Soon
Search Animated GIFs on the Web
Displays text with emphasis.
diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali
index 8cad3bf7e9..80809430a8 100644
--- a/com.discord/smali/com/discord/BuildConfig.smali
+++ b/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/1235"
+.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1236"
-.field public static final VERSION_CODE:I = 0x4d3
+.field public static final VERSION_CODE:I = 0x4d4
-.field public static final VERSION_NAME:Ljava/lang/String; = "35.0"
+.field public static final VERSION_NAME:Ljava/lang/String; = "35.1"
# direct methods
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket.smali b/com.discord/smali/com/discord/gateway/GatewaySocket.smali
index 0f2df27d00..aa9bb514a5 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket.smali
@@ -51,7 +51,7 @@
.field public static final GATEWAY_URL_RESET_THRESHOLD:I = 0x4
-.field public static final GATEWAY_VERSION:I = 0x8
+.field public static final GATEWAY_VERSION:I = 0x6
.field public static final HEARTBEAT_MAX_RESUME_THRESHOLD:I = 0x2bf20
@@ -1115,7 +1115,7 @@
const-string v0, "Connect to: "
- const-string v4, ", encoding: json, version 8."
+ const-string v4, ", encoding: json, version 6."
invoke-static {v0, p1, v4}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
@@ -1226,7 +1226,7 @@
invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
- const-string p1, "/?encoding=json&v=8&compress=zlib-stream"
+ const-string p1, "/?encoding=json&v=6&compress=zlib-stream"
invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$OptionType.smali b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$OptionType.smali
new file mode 100644
index 0000000000..979d9ddadf
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$OptionType.smali
@@ -0,0 +1,111 @@
+.class public final enum Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+.super Ljava/lang/Enum;
+.source "ModelAuditLogEntry.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Lcom/discord/models/domain/ModelAuditLogEntry;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x4019
+ name = "OptionType"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Ljava/lang/Enum<",
+ "Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;",
+ ">;"
+ }
+.end annotation
+
+
+# static fields
+.field public static final synthetic $VALUES:[Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+.field public static final enum MEMBER:Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+.field public static final enum ROLE:Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+
+# direct methods
+.method public static constructor ()V
+ .locals 5
+
+ new-instance v0, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ const-string v1, "MEMBER"
+
+ const/4 v2, 0x0
+
+ invoke-direct {v0, v1, v2}, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;->(Ljava/lang/String;I)V
+
+ sput-object v0, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;->MEMBER:Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ new-instance v0, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ const-string v1, "ROLE"
+
+ const/4 v3, 0x1
+
+ invoke-direct {v0, v1, v3}, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;->(Ljava/lang/String;I)V
+
+ sput-object v0, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;->ROLE:Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ const/4 v1, 0x2
+
+ new-array v1, v1, [Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ sget-object v4, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;->MEMBER:Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ aput-object v4, v1, v2
+
+ aput-object v0, v1, v3
+
+ sput-object v1, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;->$VALUES:[Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ return-void
+.end method
+
+.method public constructor (Ljava/lang/String;I)V
+ .locals 0
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "()V"
+ }
+ .end annotation
+
+ invoke-direct {p0, p1, p2}, Ljava/lang/Enum;->(Ljava/lang/String;I)V
+
+ return-void
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+ .locals 1
+
+ const-class v0, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+ move-result-object p0
+
+ check-cast p0, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ return-object p0
+.end method
+
+.method public static values()[Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+ .locals 1
+
+ sget-object v0, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;->$VALUES:[Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ invoke-virtual {v0}, [Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;->clone()Ljava/lang/Object;
+
+ move-result-object v0
+
+ check-cast v0, [Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$Options.smali b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$Options.smali
index 367ca01a98..33907209ea 100644
--- a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$Options.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$Options.smali
@@ -32,7 +32,7 @@
.field public final synthetic this$0:Lcom/discord/models/domain/ModelAuditLogEntry;
-.field public type:I
+.field public type:Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
# direct methods
@@ -182,13 +182,25 @@
goto :goto_2
:pswitch_1
- iget v0, p0, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->type:I
+ const/4 v0, 0x0
- invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I
+ invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextString(Ljava/lang/String;)Ljava/lang/String;
- move-result p1
+ move-result-object p1
- iput p1, p0, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->type:I
+ invoke-static {}, Ljava/util/Locale;->getDefault()Ljava/util/Locale;
+
+ move-result-object v0
+
+ invoke-virtual {p1, v0}, Ljava/lang/String;->toUpperCase(Ljava/util/Locale;)Ljava/lang/String;
+
+ move-result-object p1
+
+ invoke-static {p1}, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;->valueOf(Ljava/lang/String;)Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ move-result-object p1
+
+ iput-object p1, p0, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->type:Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
goto :goto_2
@@ -248,8 +260,6 @@
:goto_2
return-void
- nop
-
:sswitch_data_0
.sparse-switch
-0x7315ce29 -> :sswitch_6
@@ -390,19 +400,31 @@
return v2
:cond_8
- invoke-virtual {p0}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getType()I
+ invoke-virtual {p0}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getType()Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ move-result-object v1
+
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getType()Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ move-result-object v3
+
+ if-nez v1, :cond_9
+
+ if-eqz v3, :cond_a
+
+ goto :goto_1
+
+ :cond_9
+ invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
move-result v1
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getType()I
-
- move-result v3
-
- if-eq v1, v3, :cond_9
+ if-nez v1, :cond_a
+ :goto_1
return v2
- :cond_9
+ :cond_a
invoke-virtual {p0}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getId()J
move-result-wide v3
@@ -413,11 +435,11 @@
cmp-long p1, v3, v5
- if-eqz p1, :cond_a
+ if-eqz p1, :cond_b
return v2
- :cond_a
+ :cond_b
return v0
.end method
@@ -469,12 +491,12 @@
return-object v0
.end method
-.method public getType()I
+.method public getType()Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
.locals 1
- iget v0, p0, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->type:I
+ iget-object v0, p0, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->type:Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
- return v0
+ return-object v0
.end method
.method public hashCode()I
@@ -508,6 +530,8 @@
mul-int/lit8 v0, v0, 0x3b
+ const/16 v2, 0x2b
+
if-nez v1, :cond_0
const/16 v1, 0x2b
@@ -538,29 +562,39 @@
add-int/2addr v0, v1
+ invoke-virtual {p0}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getType()Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ move-result-object v1
+
mul-int/lit8 v0, v0, 0x3b
- invoke-virtual {p0}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getType()I
+ if-nez v1, :cond_1
- move-result v1
+ goto :goto_1
- add-int/2addr v1, v0
+ :cond_1
+ invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+ move-result v2
+
+ :goto_1
+ add-int/2addr v0, v2
invoke-virtual {p0}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getId()J
- move-result-wide v4
+ move-result-wide v1
- mul-int/lit8 v1, v1, 0x3b
+ mul-int/lit8 v0, v0, 0x3b
- ushr-long v2, v4, v3
+ ushr-long v3, v1, v3
- xor-long/2addr v2, v4
+ xor-long/2addr v1, v3
- long-to-int v0, v2
+ long-to-int v2, v1
- add-int/2addr v1, v0
+ add-int/2addr v0, v2
- return v1
+ return v0
.end method
.method public toString()Ljava/lang/String;
@@ -622,11 +656,11 @@
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
- invoke-virtual {p0}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getType()I
+ invoke-virtual {p0}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getType()Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
- move-result v1
+ move-result-object v1
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
const-string v1, ", id="
diff --git a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry.smali b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry.smali
index db78774054..0d5d799538 100644
--- a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry.smali
@@ -9,6 +9,7 @@
# annotations
.annotation system Ldalvik/annotation/MemberClasses;
value = {
+ Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;,
Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;,
Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;,
Lcom/discord/models/domain/ModelAuditLogEntry$ChangeNameId;,
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildRole.smali b/com.discord/smali/com/discord/models/domain/ModelGuildRole.smali
index 5f44a8a6b9..07f284d6dd 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildRole.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildRole.smali
@@ -401,19 +401,6 @@
goto :goto_0
:sswitch_0
- const-string v1, "permissions"
-
- invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
- move-result v0
-
- if-eqz v0, :cond_0
-
- const/4 v0, 0x5
-
- goto :goto_1
-
- :sswitch_1
const-string v1, "managed"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -426,7 +413,7 @@
goto :goto_1
- :sswitch_2
+ :sswitch_1
const-string v1, "position"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -439,7 +426,7 @@
goto :goto_1
- :sswitch_3
+ :sswitch_2
const-string v1, "hoist"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -452,7 +439,7 @@
goto :goto_1
- :sswitch_4
+ :sswitch_3
const-string v1, "color"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -465,7 +452,7 @@
goto :goto_1
- :sswitch_5
+ :sswitch_4
const-string v1, "mentionable"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -478,7 +465,7 @@
goto :goto_1
- :sswitch_6
+ :sswitch_5
const-string v1, "name"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -491,7 +478,7 @@
goto :goto_1
- :sswitch_7
+ :sswitch_6
const-string v1, "id"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -504,6 +491,19 @@
goto :goto_1
+ :sswitch_7
+ const-string v1, "permissions_new"
+
+ invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+ move-result v0
+
+ if-eqz v0, :cond_0
+
+ const/4 v0, 0x5
+
+ goto :goto_1
+
:cond_0
:goto_0
const/4 v0, -0x1
@@ -610,14 +610,14 @@
:sswitch_data_0
.sparse-switch
- 0xd1b -> :sswitch_7
- 0x337a8b -> :sswitch_6
- 0x3ddae44 -> :sswitch_5
- 0x5a72f63 -> :sswitch_4
- 0x5ed9a23 -> :sswitch_3
- 0x2c929929 -> :sswitch_2
- 0x31c90f9f -> :sswitch_1
- 0x4392f484 -> :sswitch_0
+ -0x5f96149b -> :sswitch_7
+ 0xd1b -> :sswitch_6
+ 0x337a8b -> :sswitch_5
+ 0x3ddae44 -> :sswitch_4
+ 0x5a72f63 -> :sswitch_3
+ 0x5ed9a23 -> :sswitch_2
+ 0x2c929929 -> :sswitch_1
+ 0x31c90f9f -> :sswitch_0
.end sparse-switch
:pswitch_data_0
diff --git a/com.discord/smali/com/discord/models/domain/ModelPermissionOverwrite.smali b/com.discord/smali/com/discord/models/domain/ModelPermissionOverwrite.smali
index 25c044a3f5..00cd92700c 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPermissionOverwrite.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPermissionOverwrite.smali
@@ -99,6 +99,79 @@
return p0
.end method
+.method public static getType(Ljava/lang/String;)I
+ .locals 5
+
+ const/4 v0, -0x1
+
+ if-eqz p0, :cond_5
+
+ invoke-virtual {p0}, Ljava/lang/String;->hashCode()I
+
+ move-result v1
+
+ const v2, -0x403d7566
+
+ const/4 v3, 0x0
+
+ const/4 v4, 0x1
+
+ if-eq v1, v2, :cond_1
+
+ const v2, 0x358076
+
+ if-eq v1, v2, :cond_0
+
+ goto :goto_0
+
+ :cond_0
+ const-string v1, "role"
+
+ invoke-virtual {p0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+ move-result p0
+
+ if-eqz p0, :cond_2
+
+ const/4 p0, 0x0
+
+ goto :goto_1
+
+ :cond_1
+ const-string v1, "member"
+
+ invoke-virtual {p0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+ move-result p0
+
+ if-eqz p0, :cond_2
+
+ const/4 p0, 0x1
+
+ goto :goto_1
+
+ :cond_2
+ :goto_0
+ const/4 p0, -0x1
+
+ :goto_1
+ if-eqz p0, :cond_4
+
+ if-eq p0, v4, :cond_3
+
+ goto :goto_2
+
+ :cond_3
+ return v4
+
+ :cond_4
+ return v3
+
+ :cond_5
+ :goto_2
+ return v0
+.end method
+
# virtual methods
.method public assignField(Lcom/discord/models/domain/Model$JsonReader;)V
@@ -127,22 +200,35 @@
if-eq v1, v2, :cond_3
- const v2, 0x2efe0c
+ const v2, 0x368f3a
if-eq v1, v2, :cond_2
- const v2, 0x368f3a
+ const v2, 0x1631afaa
if-eq v1, v2, :cond_1
- const v2, 0x589a349
+ const v2, 0x3555f0ed
if-eq v1, v2, :cond_0
goto :goto_0
:cond_0
- const-string v1, "allow"
+ const-string v1, "deny_new"
+
+ invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+ move-result v0
+
+ if-eqz v0, :cond_4
+
+ const/4 v0, 0x3
+
+ goto :goto_1
+
+ :cond_1
+ const-string v1, "allow_new"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -154,7 +240,7 @@
goto :goto_1
- :cond_1
+ :cond_2
const-string v1, "type"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -167,19 +253,6 @@
goto :goto_1
- :cond_2
- const-string v1, "deny"
-
- invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
- move-result v0
-
- if-eqz v0, :cond_4
-
- const/4 v0, 0x3
-
- goto :goto_1
-
:cond_3
const-string v1, "id"
@@ -250,9 +323,13 @@
goto :goto_2
:cond_8
- iget v0, p0, Lcom/discord/models/domain/ModelPermissionOverwrite;->type:I
+ const/4 v0, 0x0
- invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I
+ invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextString(Ljava/lang/String;)Ljava/lang/String;
+
+ move-result-object p1
+
+ invoke-static {p1}, Lcom/discord/models/domain/ModelPermissionOverwrite;->getType(Ljava/lang/String;)I
move-result p1
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$Parser$parse$1$2.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$Parser$parse$1$2.smali
new file mode 100644
index 0000000000..eb603f34a7
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$Parser$parse$1$2.smali
@@ -0,0 +1,71 @@
+.class public final Lcom/discord/models/domain/ModelPresence$Parser$parse$1$2;
+.super Ljava/lang/Object;
+.source "ModelPresence.kt"
+
+# interfaces
+.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->call(Ljava/lang/String;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "",
+ "Ljava/lang/Object;",
+ "Lcom/discord/models/domain/Model$JsonReader$ItemFactory<",
+ "Ljava/lang/Long;",
+ ">;"
+ }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/models/domain/ModelPresence$Parser$parse$1;
+
+
+# direct methods
+.method public constructor (Lcom/discord/models/domain/ModelPresence$Parser$parse$1;)V
+ .locals 0
+
+ iput-object p1, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1$2;->this$0:Lcom/discord/models/domain/ModelPresence$Parser$parse$1;
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public final get()Ljava/lang/Long;
+ .locals 1
+
+ iget-object v0, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1$2;->this$0:Lcom/discord/models/domain/ModelPresence$Parser$parse$1;
+
+ iget-object v0, v0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+ invoke-virtual {v0}, Lcom/discord/models/domain/Model$JsonReader;->nextLongOrNull()Ljava/lang/Long;
+
+ move-result-object v0
+
+ return-object v0
+.end method
+
+.method public bridge synthetic get()Ljava/lang/Object;
+ .locals 1
+
+ invoke-virtual {p0}, Lcom/discord/models/domain/ModelPresence$Parser$parse$1$2;->get()Ljava/lang/Long;
+
+ move-result-object v0
+
+ return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$Parser$parse$1.smali
index aaecb9259d..6f0f535ab9 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$Parser$parse$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$Parser$parse$1.smali
@@ -36,15 +36,19 @@
.field public final synthetic $guildId:Lkotlin/jvm/internal/Ref$LongRef;
+.field public final synthetic $nick:Lkotlin/jvm/internal/Ref$ObjectRef;
+
.field public final synthetic $reader:Lcom/discord/models/domain/Model$JsonReader;
+.field public final synthetic $roles:Lkotlin/jvm/internal/Ref$ObjectRef;
+
.field public final synthetic $status:Lkotlin/jvm/internal/Ref$ObjectRef;
.field public final synthetic $user:Lkotlin/jvm/internal/Ref$ObjectRef;
# direct methods
-.method public constructor (Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$LongRef;)V
+.method public constructor (Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$LongRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;)V
.locals 0
iput-object p1, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->$status:Lkotlin/jvm/internal/Ref$ObjectRef;
@@ -59,6 +63,10 @@
iput-object p6, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->$guildId:Lkotlin/jvm/internal/Ref$LongRef;
+ iput-object p7, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->$nick:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+ iput-object p8, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->$roles:Lkotlin/jvm/internal/Ref$ObjectRef;
+
invoke-direct {p0}, Ljava/lang/Object;->()V
return-void
@@ -115,7 +123,7 @@
iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- goto :goto_1
+ goto/16 :goto_1
:sswitch_1
const-string v0, "client_status"
@@ -138,9 +146,34 @@
iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- goto :goto_1
+ goto/16 :goto_1
:sswitch_2
+ const-string v0, "roles"
+
+ invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+ move-result p1
+
+ if-eqz p1, :cond_1
+
+ iget-object p1, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->$roles:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+ iget-object v0, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+ new-instance v1, Lcom/discord/models/domain/ModelPresence$Parser$parse$1$2;
+
+ invoke-direct {v1, p0}, Lcom/discord/models/domain/ModelPresence$Parser$parse$1$2;->(Lcom/discord/models/domain/ModelPresence$Parser$parse$1;)V
+
+ invoke-virtual {v0, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
+
+ move-result-object v0
+
+ iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+ goto :goto_1
+
+ :sswitch_3
const-string v0, "user"
invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -167,7 +200,28 @@
goto :goto_1
- :sswitch_3
+ :sswitch_4
+ const-string v0, "nick"
+
+ invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+ move-result p1
+
+ if-eqz p1, :cond_1
+
+ iget-object p1, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->$nick:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+ iget-object v0, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+ invoke-virtual {v0}, Lcom/discord/models/domain/Model$JsonReader;->nextStringOrNull()Ljava/lang/String;
+
+ move-result-object v0
+
+ iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+ goto :goto_1
+
+ :sswitch_5
const-string v0, "status"
invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -194,7 +248,7 @@
goto :goto_1
- :sswitch_4
+ :sswitch_6
const-string v0, "guild_id"
invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -232,13 +286,13 @@
:goto_1
return-void
- nop
-
:sswitch_data_0
.sparse-switch
- -0x4de03319 -> :sswitch_4
- -0x3532300e -> :sswitch_3
- 0x36ebcb -> :sswitch_2
+ -0x4de03319 -> :sswitch_6
+ -0x3532300e -> :sswitch_5
+ 0x339763 -> :sswitch_4
+ 0x36ebcb -> :sswitch_3
+ 0x67a8ebd -> :sswitch_2
0x22120ee6 -> :sswitch_1
0x7a1b3bed -> :sswitch_0
.end sparse-switch
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$Parser.smali
index e553b2ed8c..b830d862c0 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$Parser.smali
@@ -54,121 +54,167 @@
# virtual methods
.method public parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelPresence;
- .locals 14
+ .locals 27
- const/4 v0, 0x0
+ move-object/from16 v9, p1
- if-eqz p1, :cond_2
+ const/4 v10, 0x0
- new-instance v8, Lkotlin/jvm/internal/Ref$ObjectRef;
-
- invoke-direct {v8}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
-
- iput-object v0, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
- new-instance v9, Lkotlin/jvm/internal/Ref$ObjectRef;
-
- invoke-direct {v9}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
-
- iput-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
- new-instance v10, Lkotlin/jvm/internal/Ref$ObjectRef;
-
- invoke-direct {v10}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
-
- iput-object v0, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+ if-eqz v9, :cond_2
new-instance v11, Lkotlin/jvm/internal/Ref$ObjectRef;
invoke-direct {v11}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
- iput-object v0, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+ iput-object v10, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- new-instance v12, Lkotlin/jvm/internal/Ref$LongRef;
+ new-instance v12, Lkotlin/jvm/internal/Ref$ObjectRef;
- invoke-direct {v12}, Lkotlin/jvm/internal/Ref$LongRef;->()V
+ invoke-direct {v12}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
- const-wide/16 v1, 0x0
+ iput-object v10, v12, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- iput-wide v1, v12, Lkotlin/jvm/internal/Ref$LongRef;->element:J
+ new-instance v13, Lkotlin/jvm/internal/Ref$ObjectRef;
- new-instance v13, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;
+ invoke-direct {v13}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
- move-object v1, v13
+ iput-object v10, v13, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- move-object v2, v8
+ new-instance v14, Lkotlin/jvm/internal/Ref$ObjectRef;
- move-object v3, p1
+ invoke-direct {v14}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
- move-object v4, v9
+ iput-object v10, v14, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- move-object v5, v10
+ new-instance v15, Lkotlin/jvm/internal/Ref$LongRef;
- move-object v6, v11
+ invoke-direct {v15}, Lkotlin/jvm/internal/Ref$LongRef;->()V
- move-object v7, v12
+ const-wide/16 v0, 0x0
- invoke-direct/range {v1 .. v7}, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$LongRef;)V
+ iput-wide v0, v15, Lkotlin/jvm/internal/Ref$LongRef;->element:J
- invoke-virtual {p1, v13}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
+ new-instance v8, Lkotlin/jvm/internal/Ref$ObjectRef;
- new-instance p1, Lcom/discord/models/domain/ModelPresence;
+ invoke-direct {v8}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
- iget-object v1, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+ iput-object v10, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- move-object v2, v1
+ new-instance v7, Lkotlin/jvm/internal/Ref$ObjectRef;
- check-cast v2, Lcom/discord/models/domain/ModelPresence$Status;
+ invoke-direct {v7}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
- if-eqz v2, :cond_1
+ iput-object v10, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- iget-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+ new-instance v6, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;
- move-object v3, v0
+ move-object v0, v6
- check-cast v3, Ljava/util/List;
+ move-object v1, v11
- iget-object v0, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+ move-object/from16 v2, p1
- check-cast v0, Lcom/discord/models/domain/ModelPresence$ClientStatuses;
+ move-object v3, v12
- if-eqz v0, :cond_0
+ move-object v4, v13
+
+ move-object v5, v14
+
+ move-object v10, v6
+
+ move-object v6, v15
+
+ move-object/from16 v16, v7
+
+ move-object v7, v8
+
+ move-object/from16 v17, v8
+
+ move-object/from16 v8, v16
+
+ invoke-direct/range {v0 .. v8}, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$LongRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;)V
+
+ invoke-virtual {v9, v10}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
+
+ new-instance v0, Lcom/discord/models/domain/ModelPresence;
+
+ iget-object v1, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+ move-object/from16 v19, v1
+
+ check-cast v19, Lcom/discord/models/domain/ModelPresence$Status;
+
+ if-eqz v19, :cond_1
+
+ iget-object v1, v12, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+ move-object/from16 v20, v1
+
+ check-cast v20, Ljava/util/List;
+
+ iget-object v1, v13, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+ check-cast v1, Lcom/discord/models/domain/ModelPresence$ClientStatuses;
+
+ if-eqz v1, :cond_0
goto :goto_0
:cond_0
- sget-object v0, Lcom/discord/models/domain/ModelPresence$ClientStatuses;->Companion:Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;
+ sget-object v1, Lcom/discord/models/domain/ModelPresence$ClientStatuses;->Companion:Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;->empty()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
+ invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;->empty()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
- move-result-object v0
+ move-result-object v1
:goto_0
- move-object v4, v0
+ move-object/from16 v21, v1
- iget-object v0, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+ iget-object v1, v14, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- move-object v5, v0
+ move-object/from16 v22, v1
- check-cast v5, Lcom/discord/models/domain/ModelUser;
+ check-cast v22, Lcom/discord/models/domain/ModelUser;
- iget-wide v6, v12, Lkotlin/jvm/internal/Ref$LongRef;->element:J
+ iget-wide v1, v15, Lkotlin/jvm/internal/Ref$LongRef;->element:J
- move-object v1, p1
+ move-object/from16 v3, v17
- invoke-direct/range {v1 .. v7}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+ iget-object v3, v3, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- return-object p1
+ move-object/from16 v25, v3
+
+ check-cast v25, Ljava/lang/String;
+
+ move-object/from16 v3, v16
+
+ iget-object v3, v3, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+ move-object/from16 v26, v3
+
+ check-cast v26, Ljava/util/List;
+
+ move-object/from16 v18, v0
+
+ move-wide/from16 v23, v1
+
+ invoke-direct/range {v18 .. v26}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;)V
+
+ return-object v0
:cond_1
invoke-static {}, Lj0/n/c/h;->throwNpe()V
+ const/4 v0, 0x0
+
throw v0
:cond_2
- const-string p1, "reader"
+ move-object v0, v10
- invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+ const-string v1, "reader"
+
+ invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
throw v0
.end method
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$customStatusActivity$2.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$customStatusActivity$2.smali
index bcb585ea4d..3fc9d10916 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$customStatusActivity$2.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$customStatusActivity$2.smali
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+ value = Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;)V
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$listeningActivity$2.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$listeningActivity$2.smali
index 1b3756ee9f..2fa030908c 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$listeningActivity$2.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$listeningActivity$2.smali
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+ value = Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;)V
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$playingActivity$2.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$playingActivity$2.smali
index d6db40f9fd..02414ac01f 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$playingActivity$2.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$playingActivity$2.smali
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+ value = Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;)V
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$primaryActivity$2.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$primaryActivity$2.smali
index f384a030dd..bf5c62f53b 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$primaryActivity$2.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$primaryActivity$2.smali
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+ value = Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;)V
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$streamingActivity$2.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$streamingActivity$2.smali
index 47fb560c73..74f61f2e66 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$streamingActivity$2.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$streamingActivity$2.smali
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+ value = Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;)V
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$watchingActivity$2.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$watchingActivity$2.smali
index 170a97d2f0..a559e1a4e9 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$watchingActivity$2.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$watchingActivity$2.smali
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+ value = Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;)V
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence.smali b/com.discord/smali/com/discord/models/domain/ModelPresence.smali
index 00f091f35e..88f64360fe 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence.smali
@@ -32,10 +32,22 @@
.field public final listeningActivity$delegate:Lkotlin/Lazy;
+.field public final nick:Ljava/lang/String;
+
.field public final playingActivity$delegate:Lkotlin/Lazy;
.field public final primaryActivity$delegate:Lkotlin/Lazy;
+.field public final roles:Ljava/util/List;
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Ljava/util/List<",
+ "Ljava/lang/Long;",
+ ">;"
+ }
+ .end annotation
+.end field
+
.field public final status:Lcom/discord/models/domain/ModelPresence$Status;
.field public final streamingActivity$delegate:Lkotlin/Lazy;
@@ -46,7 +58,7 @@
# direct methods
-.method public constructor (Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+.method public constructor (Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;)V
.locals 1
.annotation system Ldalvik/annotation/Signature;
value = {
@@ -58,7 +70,11 @@
">;",
"Lcom/discord/models/domain/ModelPresence$ClientStatuses;",
"Lcom/discord/models/domain/ModelUser;",
- "J)V"
+ "J",
+ "Ljava/lang/String;",
+ "Ljava/util/List<",
+ "Ljava/lang/Long;",
+ ">;)V"
}
.end annotation
@@ -80,6 +96,10 @@
iput-wide p5, p0, Lcom/discord/models/domain/ModelPresence;->guildId:J
+ iput-object p7, p0, Lcom/discord/models/domain/ModelPresence;->nick:Ljava/lang/String;
+
+ iput-object p8, p0, Lcom/discord/models/domain/ModelPresence;->roles:Ljava/util/List;
+
new-instance p1, Lcom/discord/models/domain/ModelPresence$playingActivity$2;
invoke-direct {p1, p0}, Lcom/discord/models/domain/ModelPresence$playingActivity$2;->(Lcom/discord/models/domain/ModelPresence;)V
@@ -157,47 +177,86 @@
throw v0
.end method
-.method public synthetic constructor (Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
- .locals 7
+.method public synthetic constructor (Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ .locals 10
- and-int/lit8 p8, p7, 0x4
+ and-int/lit8 v0, p9, 0x4
- if-eqz p8, :cond_0
+ if-eqz v0, :cond_0
- sget-object p3, Lcom/discord/models/domain/ModelPresence$ClientStatuses;->Companion:Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;
+ sget-object v0, Lcom/discord/models/domain/ModelPresence$ClientStatuses;->Companion:Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;
- invoke-virtual {p3}, Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;->empty()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
+ invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;->empty()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
- move-result-object p3
+ move-result-object v0
+
+ move-object v4, v0
+
+ goto :goto_0
:cond_0
- move-object v3, p3
+ move-object v4, p3
- and-int/lit8 p3, p7, 0x8
+ :goto_0
+ and-int/lit8 v0, p9, 0x8
- if-eqz p3, :cond_1
+ const/4 v1, 0x0
- const/4 p4, 0x0
+ if-eqz v0, :cond_1
+
+ move-object v5, v1
+
+ goto :goto_1
:cond_1
- move-object v4, p4
+ move-object v5, p4
- and-int/lit8 p3, p7, 0x10
+ :goto_1
+ and-int/lit8 v0, p9, 0x10
- if-eqz p3, :cond_2
+ if-eqz v0, :cond_2
- const-wide/16 p5, 0x0
+ const-wide/16 v2, 0x0
+
+ move-wide v6, v2
+
+ goto :goto_2
:cond_2
- move-wide v5, p5
+ move-wide v6, p5
- move-object v0, p0
+ :goto_2
+ and-int/lit8 v0, p9, 0x20
- move-object v1, p1
+ if-eqz v0, :cond_3
- move-object v2, p2
+ move-object v8, v1
- invoke-direct/range {v0 .. v6}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+ goto :goto_3
+
+ :cond_3
+ move-object/from16 v8, p7
+
+ :goto_3
+ and-int/lit8 v0, p9, 0x40
+
+ if-eqz v0, :cond_4
+
+ move-object v9, v1
+
+ goto :goto_4
+
+ :cond_4
+ move-object/from16 v9, p8
+
+ :goto_4
+ move-object v1, p0
+
+ move-object v2, p1
+
+ move-object v3, p2
+
+ invoke-direct/range {v1 .. v9}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;)V
return-void
.end method
@@ -212,69 +271,114 @@
return-object p0
.end method
-.method public static synthetic copy$default(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JILjava/lang/Object;)Lcom/discord/models/domain/ModelPresence;
- .locals 4
+.method public static synthetic copy$default(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/models/domain/ModelPresence;
+ .locals 9
- and-int/lit8 p8, p7, 0x1
+ move-object v0, p0
- if-eqz p8, :cond_0
+ and-int/lit8 v1, p9, 0x1
- iget-object p1, p0, Lcom/discord/models/domain/ModelPresence;->status:Lcom/discord/models/domain/ModelPresence$Status;
+ if-eqz v1, :cond_0
+
+ iget-object v1, v0, Lcom/discord/models/domain/ModelPresence;->status:Lcom/discord/models/domain/ModelPresence$Status;
+
+ goto :goto_0
:cond_0
- and-int/lit8 p8, p7, 0x2
+ move-object v1, p1
- if-eqz p8, :cond_1
+ :goto_0
+ and-int/lit8 v2, p9, 0x2
- iget-object p2, p0, Lcom/discord/models/domain/ModelPresence;->activities:Ljava/util/List;
+ if-eqz v2, :cond_1
+
+ iget-object v2, v0, Lcom/discord/models/domain/ModelPresence;->activities:Ljava/util/List;
+
+ goto :goto_1
:cond_1
- move-object p8, p2
+ move-object v2, p2
- and-int/lit8 p2, p7, 0x4
+ :goto_1
+ and-int/lit8 v3, p9, 0x4
- if-eqz p2, :cond_2
+ if-eqz v3, :cond_2
- iget-object p3, p0, Lcom/discord/models/domain/ModelPresence;->clientStatuses:Lcom/discord/models/domain/ModelPresence$ClientStatuses;
+ iget-object v3, v0, Lcom/discord/models/domain/ModelPresence;->clientStatuses:Lcom/discord/models/domain/ModelPresence$ClientStatuses;
+
+ goto :goto_2
:cond_2
- move-object v0, p3
+ move-object v3, p3
- and-int/lit8 p2, p7, 0x8
+ :goto_2
+ and-int/lit8 v4, p9, 0x8
- if-eqz p2, :cond_3
+ if-eqz v4, :cond_3
- iget-object p4, p0, Lcom/discord/models/domain/ModelPresence;->user:Lcom/discord/models/domain/ModelUser;
+ iget-object v4, v0, Lcom/discord/models/domain/ModelPresence;->user:Lcom/discord/models/domain/ModelUser;
+
+ goto :goto_3
:cond_3
- move-object v1, p4
+ move-object v4, p4
- and-int/lit8 p2, p7, 0x10
+ :goto_3
+ and-int/lit8 v5, p9, 0x10
- if-eqz p2, :cond_4
+ if-eqz v5, :cond_4
- iget-wide p5, p0, Lcom/discord/models/domain/ModelPresence;->guildId:J
+ iget-wide v5, v0, Lcom/discord/models/domain/ModelPresence;->guildId:J
+
+ goto :goto_4
:cond_4
- move-wide v2, p5
+ move-wide v5, p5
- move-object p2, p0
+ :goto_4
+ and-int/lit8 v7, p9, 0x20
- move-object p3, p1
+ if-eqz v7, :cond_5
- move-object p4, p8
+ iget-object v7, v0, Lcom/discord/models/domain/ModelPresence;->nick:Ljava/lang/String;
- move-object p5, v0
+ goto :goto_5
- move-object p6, v1
+ :cond_5
+ move-object/from16 v7, p7
- move-wide p7, v2
+ :goto_5
+ and-int/lit8 v8, p9, 0x40
- invoke-virtual/range {p2 .. p8}, Lcom/discord/models/domain/ModelPresence;->copy(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)Lcom/discord/models/domain/ModelPresence;
+ if-eqz v8, :cond_6
- move-result-object p0
+ iget-object v8, v0, Lcom/discord/models/domain/ModelPresence;->roles:Ljava/util/List;
- return-object p0
+ goto :goto_6
+
+ :cond_6
+ move-object/from16 v8, p8
+
+ :goto_6
+ move-object p1, v1
+
+ move-object p2, v2
+
+ move-object p3, v3
+
+ move-object p4, v4
+
+ move-wide p5, v5
+
+ move-object/from16 p7, v7
+
+ move-object/from16 p8, v8
+
+ invoke-virtual/range {p0 .. p8}, Lcom/discord/models/domain/ModelPresence;->copy(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;)Lcom/discord/models/domain/ModelPresence;
+
+ move-result-object v0
+
+ return-object v0
.end method
.method private final getActivityByType(I)Lcom/discord/models/domain/activity/ModelActivity;
@@ -380,8 +484,32 @@
return-wide v0
.end method
-.method public final copy(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)Lcom/discord/models/domain/ModelPresence;
- .locals 8
+.method public final component6()Ljava/lang/String;
+ .locals 1
+
+ iget-object v0, p0, Lcom/discord/models/domain/ModelPresence;->nick:Ljava/lang/String;
+
+ return-object v0
+.end method
+
+.method public final component7()Ljava/util/List;
+ .locals 1
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "()",
+ "Ljava/util/List<",
+ "Ljava/lang/Long;",
+ ">;"
+ }
+ .end annotation
+
+ iget-object v0, p0, Lcom/discord/models/domain/ModelPresence;->roles:Ljava/util/List;
+
+ return-object v0
+.end method
+
+.method public final copy(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;)Lcom/discord/models/domain/ModelPresence;
+ .locals 10
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
@@ -392,7 +520,11 @@
">;",
"Lcom/discord/models/domain/ModelPresence$ClientStatuses;",
"Lcom/discord/models/domain/ModelUser;",
- "J)",
+ "J",
+ "Ljava/lang/String;",
+ "Ljava/util/List<",
+ "Ljava/lang/Long;",
+ ">;)",
"Lcom/discord/models/domain/ModelPresence;"
}
.end annotation
@@ -417,27 +549,31 @@
move-wide v6, p5
- invoke-direct/range {v1 .. v7}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+ move-object/from16 v8, p7
+
+ move-object/from16 v9, p8
+
+ invoke-direct/range {v1 .. v9}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;)V
return-object v0
:cond_0
- const-string p1, "clientStatuses"
+ const-string v1, "clientStatuses"
- invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+ invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
throw v0
:cond_1
- const-string p1, "status"
+ const-string v1, "status"
- invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+ invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
throw v0
.end method
.method public equals(Ljava/lang/Object;)Z
- .locals 4
+ .locals 5
if-eq p0, p1, :cond_1
@@ -491,9 +627,29 @@
iget-wide v2, p1, Lcom/discord/models/domain/ModelPresence;->guildId:J
- cmp-long p1, v0, v2
+ cmp-long v4, v0, v2
- if-nez p1, :cond_0
+ if-nez v4, :cond_0
+
+ iget-object v0, p0, Lcom/discord/models/domain/ModelPresence;->nick:Ljava/lang/String;
+
+ iget-object v1, p1, Lcom/discord/models/domain/ModelPresence;->nick:Ljava/lang/String;
+
+ invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+ move-result v0
+
+ if-eqz v0, :cond_0
+
+ iget-object v0, p0, Lcom/discord/models/domain/ModelPresence;->roles:Ljava/util/List;
+
+ iget-object p1, p1, Lcom/discord/models/domain/ModelPresence;->roles:Ljava/util/List;
+
+ invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+ move-result p1
+
+ if-eqz p1, :cond_0
goto :goto_0
@@ -569,6 +725,14 @@
return-object v0
.end method
+.method public final getNick()Ljava/lang/String;
+ .locals 1
+
+ iget-object v0, p0, Lcom/discord/models/domain/ModelPresence;->nick:Ljava/lang/String;
+
+ return-object v0
+.end method
+
.method public final getPlayingActivity()Lcom/discord/models/domain/activity/ModelActivity;
.locals 1
@@ -597,6 +761,22 @@
return-object v0
.end method
+.method public final getRoles()Ljava/util/List;
+ .locals 1
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "()",
+ "Ljava/util/List<",
+ "Ljava/lang/Long;",
+ ">;"
+ }
+ .end annotation
+
+ iget-object v0, p0, Lcom/discord/models/domain/ModelPresence;->roles:Ljava/util/List;
+
+ return-object v0
+.end method
+
.method public final getStatus()Lcom/discord/models/domain/ModelPresence$Status;
.locals 1
@@ -642,7 +822,7 @@
.end method
.method public hashCode()I
- .locals 5
+ .locals 6
iget-object v0, p0, Lcom/discord/models/domain/ModelPresence;->status:Lcom/discord/models/domain/ModelPresence$Status;
@@ -704,30 +884,66 @@
invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->hashCode()I
- move-result v1
+ move-result v2
+
+ goto :goto_3
:cond_3
- add-int/2addr v0, v1
+ const/4 v2, 0x0
+
+ :goto_3
+ add-int/2addr v0, v2
mul-int/lit8 v0, v0, 0x1f
- iget-wide v1, p0, Lcom/discord/models/domain/ModelPresence;->guildId:J
+ iget-wide v2, p0, Lcom/discord/models/domain/ModelPresence;->guildId:J
- const/16 v3, 0x20
+ const/16 v4, 0x20
- ushr-long v3, v1, v3
+ ushr-long v4, v2, v4
- xor-long/2addr v1, v3
+ xor-long/2addr v2, v4
- long-to-int v2, v1
+ long-to-int v3, v2
+ add-int/2addr v0, v3
+
+ mul-int/lit8 v0, v0, 0x1f
+
+ iget-object v2, p0, Lcom/discord/models/domain/ModelPresence;->nick:Ljava/lang/String;
+
+ if-eqz v2, :cond_4
+
+ invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+ move-result v2
+
+ goto :goto_4
+
+ :cond_4
+ const/4 v2, 0x0
+
+ :goto_4
add-int/2addr v0, v2
+ mul-int/lit8 v0, v0, 0x1f
+
+ iget-object v2, p0, Lcom/discord/models/domain/ModelPresence;->roles:Ljava/util/List;
+
+ if-eqz v2, :cond_5
+
+ invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+ move-result v1
+
+ :cond_5
+ add-int/2addr v0, v1
+
return v0
.end method
.method public toString()Ljava/lang/String;
- .locals 4
+ .locals 3
const-string v0, "ModelPresence(status="
@@ -769,9 +985,25 @@
iget-wide v1, p0, Lcom/discord/models/domain/ModelPresence;->guildId:J
- const-string v3, ")"
+ invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
- invoke-static {v0, v1, v2, v3}, Lf/e/b/a/a;->t(Ljava/lang/StringBuilder;JLjava/lang/String;)Ljava/lang/String;
+ const-string v1, ", nick="
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+ iget-object v1, p0, Lcom/discord/models/domain/ModelPresence;->nick:Ljava/lang/String;
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+ const-string v1, ", roles="
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+ iget-object v1, p0, Lcom/discord/models/domain/ModelPresence;->roles:Ljava/util/List;
+
+ const-string v2, ")"
+
+ invoke-static {v0, v1, v2}, Lf/e/b/a/a;->w(Ljava/lang/StringBuilder;Ljava/util/List;Ljava/lang/String;)Ljava/lang/String;
move-result-object v0
diff --git a/com.discord/smali/com/discord/restapi/RestAPIBuilder.smali b/com.discord/smali/com/discord/restapi/RestAPIBuilder.smali
index b7e331e949..48254aabb6 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIBuilder.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIBuilder.smali
@@ -12,7 +12,7 @@
# static fields
-.field public static final API_VERSION:I = 0x8
+.field public static final API_VERSION:I = 0x6
.field public static final CONTENT_TYPE_JSON:Ljava/lang/String; = "application/json"
@@ -385,7 +385,7 @@
if-eqz p5, :cond_3
- const-string/jumbo v2, "v8/"
+ const-string/jumbo v2, "v6/"
move-object/from16 v6, p3
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPermissionOverwrites$Companion.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPermissionOverwrites$Companion.smali
index fb0eb2e18c..58ecf72505 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPermissionOverwrites$Companion.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPermissionOverwrites$Companion.smali
@@ -38,16 +38,12 @@
new-instance v6, Lcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;
- const/4 v0, 0x1
-
- invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
- move-result-object v1
-
invoke-static {p1, p2}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
move-result-object v2
+ const-string v1, "member"
+
const/4 v5, 0x0
move-object v0, v6
@@ -56,7 +52,7 @@
move-object v4, p4
- invoke-direct/range {v0 .. v5}, Lcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;->(Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+ invoke-direct/range {v0 .. v5}, Lcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;->(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
return-object v6
.end method
@@ -66,16 +62,12 @@
new-instance v6, Lcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;
- const/4 v0, 0x0
-
- invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
- move-result-object v1
-
invoke-static {p1, p2}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
move-result-object v2
+ const-string v1, "role"
+
const/4 v5, 0x0
move-object v0, v6
@@ -84,7 +76,7 @@
move-object v4, p4
- invoke-direct/range {v0 .. v5}, Lcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;->(Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+ invoke-direct/range {v0 .. v5}, Lcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;->(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
return-object v6
.end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPermissionOverwrites.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPermissionOverwrites.smali
index 58c86f21c6..6b4c1b6631 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPermissionOverwrites.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPermissionOverwrites.smali
@@ -31,7 +31,7 @@
.field public final id:Ljava/lang/String;
-.field public final type:Ljava/lang/Integer;
+.field public final type:Ljava/lang/String;
# direct methods
@@ -49,12 +49,12 @@
return-void
.end method
-.method public constructor (Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;)V
+.method public constructor (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;)V
.locals 0
invoke-direct {p0}, Ljava/lang/Object;->()V
- iput-object p1, p0, Lcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;->type:Ljava/lang/Integer;
+ iput-object p1, p0, Lcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;->type:Ljava/lang/String;
iput-object p2, p0, Lcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;->id:Ljava/lang/String;
@@ -65,10 +65,10 @@
return-void
.end method
-.method public synthetic constructor (Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+.method public synthetic constructor (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
.locals 0
- invoke-direct {p0, p1, p2, p3, p4}, Lcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;->(Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;)V
+ invoke-direct {p0, p1, p2, p3, p4}, Lcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;->(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;)V
return-void
.end method
diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali
index 379d725d3d..446c933730 100644
--- a/com.discord/smali/com/discord/stores/StoreClientVersion.smali
+++ b/com.discord/smali/com/discord/stores/StoreClientVersion.smali
@@ -28,7 +28,7 @@
invoke-direct {p0}, Lcom/discord/stores/Store;->()V
- const/16 v0, 0x4d3
+ const/16 v0, 0x4d4
iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I
diff --git a/com.discord/smali/com/discord/stores/StoreStream.smali b/com.discord/smali/com/discord/stores/StoreStream.smali
index 4a532cb52f..2099f3fa27 100644
--- a/com.discord/smali/com/discord/stores/StoreStream.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream.smali
@@ -4345,10 +4345,55 @@
.end method
.method private final handlePresenceUpdate(JLcom/discord/models/domain/ModelPresence;)V
- .locals 1
+ .locals 8
.annotation runtime Lcom/discord/stores/StoreThread;
.end annotation
+ invoke-virtual {p3}, Lcom/discord/models/domain/ModelPresence;->getUser()Lcom/discord/models/domain/ModelUser;
+
+ move-result-object v0
+
+ if-eqz v0, :cond_0
+
+ invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
+
+ move-result-object v0
+
+ goto :goto_0
+
+ :cond_0
+ const/4 v0, 0x0
+
+ :goto_0
+ if-eqz v0, :cond_1
+
+ invoke-virtual {p3}, Lcom/discord/models/domain/ModelPresence;->getGuildId()J
+
+ move-result-wide v0
+
+ invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v3
+
+ invoke-virtual {p3}, Lcom/discord/models/domain/ModelPresence;->getUser()Lcom/discord/models/domain/ModelUser;
+
+ move-result-object v4
+
+ invoke-virtual {p3}, Lcom/discord/models/domain/ModelPresence;->getRoles()Ljava/util/List;
+
+ move-result-object v5
+
+ invoke-virtual {p3}, Lcom/discord/models/domain/ModelPresence;->getNick()Ljava/lang/String;
+
+ move-result-object v6
+
+ const/4 v7, 0x0
+
+ move-object v2, p0
+
+ invoke-direct/range {v2 .. v7}, Lcom/discord/stores/StoreStream;->synthesizeGuildMemberAdd(Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;)V
+
+ :cond_1
iget-object v0, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
invoke-virtual {v0, p3}, Lcom/discord/stores/StoreUser;->handlePresenceUpdate(Lcom/discord/models/domain/ModelPresence;)V
diff --git a/com.discord/smali/com/discord/stores/StoreUserPresence.smali b/com.discord/smali/com/discord/stores/StoreUserPresence.smali
index e6882408c1..1810ea7f79 100644
--- a/com.discord/smali/com/discord/stores/StoreUserPresence.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserPresence.smali
@@ -80,7 +80,7 @@
# direct methods
.method public constructor (Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreStream;)V
- .locals 9
+ .locals 11
const/4 v0, 0x0
@@ -136,13 +136,17 @@
const-wide/16 v5, 0x0
- const/16 v7, 0x1c
+ const/4 v7, 0x0
const/4 v8, 0x0
+ const/16 v9, 0x7c
+
+ const/4 v10, 0x0
+
move-object v0, p1
- invoke-direct/range {v0 .. v8}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ invoke-direct/range {v0 .. v10}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
iput-object p1, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
@@ -285,285 +289,297 @@
.end method
.method private final flattenPresence(J)V
- .locals 13
+ .locals 16
.annotation runtime Lcom/discord/stores/StoreThread;
.end annotation
- iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->userGuildPresences:Ljava/util/HashMap;
+ move-object/from16 v0, p0
- invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ iget-object v1, v0, Lcom/discord/stores/StoreUserPresence;->userGuildPresences:Ljava/util/HashMap;
+
+ invoke-static/range {p1 .. p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v2
+
+ invoke-virtual {v1, v2}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
move-result-object v1
- invoke-virtual {v0, v1}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+ check-cast v1, Ljava/util/Map;
- move-result-object v0
+ const/4 v2, 0x0
- check-cast v0, Ljava/util/Map;
+ if-eqz v1, :cond_4
- const/4 v1, 0x0
+ invoke-interface {v1}, Ljava/util/Map;->values()Ljava/util/Collection;
- if-eqz v0, :cond_4
+ move-result-object v1
- invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection;
+ if-eqz v1, :cond_4
- move-result-object v0
+ invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
- if-eqz v0, :cond_4
+ move-result-object v1
- invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+ invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
- move-result-object v0
+ move-result v3
- invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+ if-nez v3, :cond_0
- move-result v2
-
- if-nez v2, :cond_0
-
- move-object v2, v1
+ move-object v3, v2
goto :goto_0
:cond_0
- invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+ invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
- move-result-object v2
+ move-result-object v3
- invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+ invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
- move-result v3
+ move-result v4
- if-nez v3, :cond_1
+ if-nez v4, :cond_1
goto :goto_0
:cond_1
- move-object v3, v2
+ move-object v4, v3
- check-cast v3, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;
+ check-cast v4, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;
- invoke-virtual {v3}, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->getTimestamp()J
+ invoke-virtual {v4}, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->getTimestamp()J
- move-result-wide v3
+ move-result-wide v4
:cond_2
- invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+ invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
- move-result-object v5
+ move-result-object v6
- move-object v6, v5
+ move-object v7, v6
- check-cast v6, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;
+ check-cast v7, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;
- invoke-virtual {v6}, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->getTimestamp()J
+ invoke-virtual {v7}, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->getTimestamp()J
- move-result-wide v6
+ move-result-wide v7
- cmp-long v8, v3, v6
+ cmp-long v9, v4, v7
- if-gez v8, :cond_3
+ if-gez v9, :cond_3
- move-object v2, v5
+ move-object v3, v6
- move-wide v3, v6
+ move-wide v4, v7
:cond_3
- invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+ invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
- move-result v5
+ move-result v6
- if-nez v5, :cond_2
+ if-nez v6, :cond_2
:goto_0
- check-cast v2, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;
+ check-cast v3, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;
- if-eqz v2, :cond_4
+ if-eqz v3, :cond_4
- invoke-virtual {v2}, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->getPresence()Lcom/discord/models/domain/ModelPresence;
+ invoke-virtual {v3}, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->getPresence()Lcom/discord/models/domain/ModelPresence;
- move-result-object v0
+ move-result-object v1
goto :goto_1
:cond_4
- move-object v0, v1
+ move-object v1, v2
:goto_1
- if-eqz v0, :cond_5
+ if-eqz v1, :cond_5
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getStatus()Lcom/discord/models/domain/ModelPresence$Status;
+ invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence;->getStatus()Lcom/discord/models/domain/ModelPresence$Status;
- move-result-object v2
+ move-result-object v3
- if-eqz v2, :cond_5
+ if-eqz v3, :cond_5
goto :goto_2
:cond_5
- sget-object v2, Lcom/discord/models/domain/ModelPresence$Status;->OFFLINE:Lcom/discord/models/domain/ModelPresence$Status;
+ sget-object v3, Lcom/discord/models/domain/ModelPresence$Status;->OFFLINE:Lcom/discord/models/domain/ModelPresence$Status;
:goto_2
- move-object v4, v2
+ move-object v5, v3
- if-eqz v0, :cond_6
+ if-eqz v1, :cond_6
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
-
- move-result-object v2
-
- if-eqz v2, :cond_6
-
- sget-object v3, Lcom/discord/utilities/presence/PresenceUtils;->INSTANCE:Lcom/discord/utilities/presence/PresenceUtils;
-
- invoke-virtual {v3}, Lcom/discord/utilities/presence/PresenceUtils;->getACTIVITY_COMPARATOR$app_productionDiscordExternalRelease()Ljava/util/Comparator;
+ invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
move-result-object v3
- invoke-static {v2, v3}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+ if-eqz v3, :cond_6
- move-result-object v2
+ sget-object v4, Lcom/discord/utilities/presence/PresenceUtils;->INSTANCE:Lcom/discord/utilities/presence/PresenceUtils;
- invoke-static {v2}, Lj0/i/l;->reversed(Ljava/lang/Iterable;)Ljava/util/List;
+ invoke-virtual {v4}, Lcom/discord/utilities/presence/PresenceUtils;->getACTIVITY_COMPARATOR$app_productionDiscordExternalRelease()Ljava/util/Comparator;
- move-result-object v2
+ move-result-object v4
- move-object v5, v2
+ invoke-static {v3, v4}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+
+ move-result-object v3
+
+ invoke-static {v3}, Lj0/i/l;->reversed(Ljava/lang/Iterable;)Ljava/util/List;
+
+ move-result-object v3
+
+ move-object v6, v3
goto :goto_3
:cond_6
- move-object v5, v1
+ move-object v6, v2
:goto_3
- if-eqz v0, :cond_7
+ if-eqz v1, :cond_7
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getClientStatuses()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
+ invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence;->getClientStatuses()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
- move-result-object v0
+ move-result-object v1
goto :goto_4
:cond_7
- move-object v0, v1
+ move-object v1, v2
:goto_4
- sget-object v2, Lcom/discord/models/domain/ModelPresence$Status;->OFFLINE:Lcom/discord/models/domain/ModelPresence$Status;
+ sget-object v3, Lcom/discord/models/domain/ModelPresence$Status;->OFFLINE:Lcom/discord/models/domain/ModelPresence$Status;
- const/4 v12, 0x1
+ const/4 v15, 0x1
- if-ne v4, v2, :cond_8
+ if-ne v5, v3, :cond_8
- iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->userGuildPresences:Ljava/util/HashMap;
+ iget-object v1, v0, Lcom/discord/stores/StoreUserPresence;->userGuildPresences:Ljava/util/HashMap;
- invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ invoke-static/range {p1 .. p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v2
+
+ invoke-virtual {v1, v2}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+
+ iget-object v1, v0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
+
+ invoke-static/range {p1 .. p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v2
+
+ invoke-virtual {v1, v2}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
move-result-object v1
- invoke-virtual {v0, v1}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+ check-cast v1, Lcom/discord/models/domain/ModelPresence;
- iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
+ if-eqz v1, :cond_c
- invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
- move-result-object p1
-
- invoke-virtual {v0, p1}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
-
- move-result-object p1
-
- check-cast p1, Lcom/discord/models/domain/ModelPresence;
-
- if-eqz p1, :cond_c
-
- iput-boolean v12, p0, Lcom/discord/stores/StoreUserPresence;->isDirty:Z
+ iput-boolean v15, v0, Lcom/discord/stores/StoreUserPresence;->isDirty:Z
goto :goto_6
:cond_8
- iget-object v2, p0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
+ iget-object v3, v0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
- invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ invoke-static/range {p1 .. p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v4
+
+ invoke-virtual {v3, v4}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
move-result-object v3
- invoke-virtual {v2, v3}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+ check-cast v3, Lcom/discord/models/domain/ModelPresence;
+
+ if-eqz v3, :cond_9
+
+ invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence;->getStatus()Lcom/discord/models/domain/ModelPresence$Status;
move-result-object v2
- check-cast v2, Lcom/discord/models/domain/ModelPresence;
-
- if-eqz v2, :cond_9
-
- invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence;->getStatus()Lcom/discord/models/domain/ModelPresence$Status;
-
- move-result-object v1
-
:cond_9
- if-ne v1, v4, :cond_a
+ if-ne v2, v5, :cond_a
- invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
+ invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
- move-result-object v1
+ move-result-object v2
- invoke-static {v1, v5}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+ invoke-static {v2, v6}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
- move-result v1
+ move-result v2
- xor-int/2addr v1, v12
+ xor-int/2addr v2, v15
- if-nez v1, :cond_a
+ if-nez v2, :cond_a
- invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence;->getClientStatuses()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
+ invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence;->getClientStatuses()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
- move-result-object v1
+ move-result-object v2
- invoke-static {v1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+ invoke-static {v2, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
- move-result v1
+ move-result v2
- xor-int/2addr v1, v12
+ xor-int/2addr v2, v15
- if-eqz v1, :cond_c
+ if-eqz v2, :cond_c
:cond_a
- iget-object v1, p0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
+ iget-object v2, v0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
- invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ invoke-static/range {p1 .. p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
- move-result-object p1
+ move-result-object v3
- new-instance p2, Lcom/discord/models/domain/ModelPresence;
+ new-instance v14, Lcom/discord/models/domain/ModelPresence;
- if-eqz v0, :cond_b
+ if-eqz v1, :cond_b
goto :goto_5
:cond_b
- sget-object v0, Lcom/discord/models/domain/ModelPresence$ClientStatuses;->Companion:Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;
+ sget-object v1, Lcom/discord/models/domain/ModelPresence$ClientStatuses;->Companion:Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;->empty()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
+ invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;->empty()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
- move-result-object v0
+ move-result-object v1
:goto_5
- move-object v6, v0
+ move-object v7, v1
- const/4 v7, 0x0
+ const/4 v8, 0x0
- const-wide/16 v8, 0x0
-
- const/16 v10, 0x18
+ const-wide/16 v9, 0x0
const/4 v11, 0x0
- move-object v3, p2
+ const/4 v12, 0x0
- invoke-direct/range {v3 .. v11}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ const/16 v13, 0x78
- invoke-interface {v1, p1, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ const/4 v1, 0x0
- iput-boolean v12, p0, Lcom/discord/stores/StoreUserPresence;->isDirty:Z
+ move-object v4, v14
+
+ move-object v15, v14
+
+ move-object v14, v1
+
+ invoke-direct/range {v4 .. v14}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+ invoke-interface {v2, v3, v15}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+ const/4 v1, 0x1
+
+ iput-boolean v1, v0, Lcom/discord/stores/StoreUserPresence;->isDirty:Z
:cond_c
:goto_6
@@ -871,7 +887,7 @@
.end method
.method private final updateSelfPresence(Lcom/discord/models/domain/ModelUserSettings;Ljava/util/List;Z)V
- .locals 12
+ .locals 17
.annotation runtime Lcom/discord/stores/StoreThread;
.end annotation
@@ -886,251 +902,271 @@
}
.end annotation
- iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->meUser:Lcom/discord/models/domain/ModelUser;
+ move-object/from16 v0, p0
- if-eqz v0, :cond_a
+ iget-object v1, v0, Lcom/discord/stores/StoreUserPresence;->meUser:Lcom/discord/models/domain/ModelUser;
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
+ if-eqz v1, :cond_a
- move-result-wide v0
+ invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+ move-result-wide v1
if-eqz p1, :cond_0
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelUserSettings;->getPresenceStatus()Lcom/discord/models/domain/ModelPresence$Status;
+ invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserSettings;->getPresenceStatus()Lcom/discord/models/domain/ModelPresence$Status;
- move-result-object v2
+ move-result-object v3
- if-eqz v2, :cond_0
+ if-eqz v3, :cond_0
goto :goto_0
:cond_0
- iget-object v2, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+ iget-object v3, v0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+
+ invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence;->getStatus()Lcom/discord/models/domain/ModelPresence$Status;
+
+ move-result-object v3
+
+ :goto_0
+ const-string v4, "userSettings?.presenceSt\u2026 ?: localPresence.status"
+
+ invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ const/4 v4, 0x0
+
+ if-eqz p2, :cond_3
+
+ invoke-interface/range {p2 .. p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+ move-result-object v5
+
+ :cond_1
+ invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z
+
+ move-result v6
+
+ if-eqz v6, :cond_2
+
+ invoke-interface {v5}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+ move-result-object v6
+
+ move-object v7, v6
+
+ check-cast v7, Lcom/discord/models/domain/ModelSession;
+
+ invoke-virtual {v7}, Lcom/discord/models/domain/ModelSession;->isActive()Z
+
+ move-result v7
+
+ if-eqz v7, :cond_1
+
+ goto :goto_1
+
+ :cond_2
+ move-object v6, v4
+
+ :goto_1
+ check-cast v6, Lcom/discord/models/domain/ModelSession;
+
+ if-eqz v6, :cond_3
+
+ invoke-virtual {v6}, Lcom/discord/models/domain/ModelSession;->getActivities()Ljava/util/List;
+
+ move-result-object v5
+
+ if-eqz v5, :cond_3
+
+ move-object v1, v5
+
+ goto :goto_2
+
+ :cond_3
+ iget-object v5, v0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
+
+ invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v1
+
+ invoke-virtual {v5, v1}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+ move-result-object v1
+
+ check-cast v1, Lcom/discord/models/domain/ModelPresence;
+
+ if-eqz v1, :cond_4
+
+ invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
+
+ move-result-object v1
+
+ goto :goto_2
+
+ :cond_4
+ move-object v1, v4
+
+ :goto_2
+ if-eqz p1, :cond_5
+
+ invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserSettings;->getCustomStatus()Lcom/discord/models/domain/ModelCustomStatusSetting;
+
+ move-result-object v4
+
+ :cond_5
+ if-eqz v4, :cond_7
+
+ invoke-direct {v0, v4}, Lcom/discord/stores/StoreUserPresence;->getCustomStatusActivityFromSetting(Lcom/discord/models/domain/ModelCustomStatusSetting;)Lcom/discord/models/domain/activity/ModelActivity;
+
+ move-result-object v2
+
+ if-eqz v2, :cond_6
+
+ iget-object v4, v0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+
+ invoke-virtual {v4}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
+
+ move-result-object v4
+
+ invoke-direct {v0, v2, v4}, Lcom/discord/stores/StoreUserPresence;->replaceActivityInList(Lcom/discord/models/domain/activity/ModelActivity;Ljava/util/List;)Ljava/util/List;
+
+ move-result-object v2
+
+ goto :goto_3
+
+ :cond_6
+ const/4 v2, 0x4
+
+ iget-object v4, v0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+
+ invoke-virtual {v4}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
+
+ move-result-object v4
+
+ invoke-direct {v0, v2, v4}, Lcom/discord/stores/StoreUserPresence;->removeActivityInList(ILjava/util/List;)Ljava/util/List;
+
+ move-result-object v2
+
+ goto :goto_3
+
+ :cond_7
+ iget-object v2, v0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+
+ invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
+
+ move-result-object v2
+
+ :goto_3
+ move-object v6, v2
+
+ iget-object v2, v0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence;->getStatus()Lcom/discord/models/domain/ModelPresence$Status;
move-result-object v2
- :goto_0
- const-string v3, "userSettings?.presenceSt\u2026 ?: localPresence.status"
+ const/4 v15, 0x1
- invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ if-ne v3, v2, :cond_8
- const/4 v3, 0x0
+ iget-object v2, v0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
- if-eqz p2, :cond_3
+ invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
- invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+ move-result-object v2
- move-result-object p2
+ invoke-static {v6, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
- :cond_1
- invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
+ move-result v2
- move-result v4
+ xor-int/2addr v2, v15
- if-eqz v4, :cond_2
-
- invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
- move-result-object v4
-
- move-object v5, v4
-
- check-cast v5, Lcom/discord/models/domain/ModelSession;
-
- invoke-virtual {v5}, Lcom/discord/models/domain/ModelSession;->isActive()Z
-
- move-result v5
-
- if-eqz v5, :cond_1
-
- goto :goto_1
-
- :cond_2
- move-object v4, v3
-
- :goto_1
- check-cast v4, Lcom/discord/models/domain/ModelSession;
-
- if-eqz v4, :cond_3
-
- invoke-virtual {v4}, Lcom/discord/models/domain/ModelSession;->getActivities()Ljava/util/List;
-
- move-result-object p2
-
- if-eqz p2, :cond_3
-
- goto :goto_2
-
- :cond_3
- iget-object p2, p0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
-
- invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
- move-result-object v0
-
- invoke-virtual {p2, v0}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
- move-result-object p2
-
- check-cast p2, Lcom/discord/models/domain/ModelPresence;
-
- if-eqz p2, :cond_4
-
- invoke-virtual {p2}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
-
- move-result-object p2
-
- goto :goto_2
-
- :cond_4
- move-object p2, v3
-
- :goto_2
- if-eqz p1, :cond_5
-
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelUserSettings;->getCustomStatus()Lcom/discord/models/domain/ModelCustomStatusSetting;
-
- move-result-object v3
-
- :cond_5
- if-eqz v3, :cond_7
-
- invoke-direct {p0, v3}, Lcom/discord/stores/StoreUserPresence;->getCustomStatusActivityFromSetting(Lcom/discord/models/domain/ModelCustomStatusSetting;)Lcom/discord/models/domain/activity/ModelActivity;
-
- move-result-object p1
-
- if-eqz p1, :cond_6
-
- iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
-
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
-
- move-result-object v0
-
- invoke-direct {p0, p1, v0}, Lcom/discord/stores/StoreUserPresence;->replaceActivityInList(Lcom/discord/models/domain/activity/ModelActivity;Ljava/util/List;)Ljava/util/List;
-
- move-result-object p1
-
- goto :goto_3
-
- :cond_6
- const/4 p1, 0x4
-
- iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
-
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
-
- move-result-object v0
-
- invoke-direct {p0, p1, v0}, Lcom/discord/stores/StoreUserPresence;->removeActivityInList(ILjava/util/List;)Ljava/util/List;
-
- move-result-object p1
-
- goto :goto_3
-
- :cond_7
- iget-object p1, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
-
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
-
- move-result-object p1
-
- :goto_3
- move-object v5, p1
-
- iget-object p1, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
-
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getStatus()Lcom/discord/models/domain/ModelPresence$Status;
-
- move-result-object p1
-
- const/4 v0, 0x1
-
- if-ne v2, p1, :cond_8
-
- iget-object p1, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
-
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
-
- move-result-object p1
-
- invoke-static {v5, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
- move-result p1
-
- xor-int/2addr p1, v0
-
- if-eqz p1, :cond_9
+ if-eqz v2, :cond_9
:cond_8
- new-instance p1, Lcom/discord/models/domain/ModelPresence;
-
- const/4 v6, 0x0
+ new-instance v2, Lcom/discord/models/domain/ModelPresence;
const/4 v7, 0x0
- const-wide/16 v8, 0x0
+ const/4 v8, 0x0
- const/16 v10, 0x1c
+ const-wide/16 v9, 0x0
const/4 v11, 0x0
- move-object v3, p1
+ const/4 v12, 0x0
+
+ const/16 v13, 0x7c
+
+ const/4 v14, 0x0
move-object v4, v2
- invoke-direct/range {v3 .. v11}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ move-object v5, v3
- iput-object p1, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+ invoke-direct/range {v4 .. v14}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
- iget-object v1, p0, Lcom/discord/stores/StoreUserPresence;->localPresenceSubject:Lrx/subjects/SerializedSubject;
+ iput-object v2, v0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
- iget-object v1, v1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+ iget-object v4, v0, Lcom/discord/stores/StoreUserPresence;->localPresenceSubject:Lrx/subjects/SerializedSubject;
- invoke-virtual {v1, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+ iget-object v4, v4, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
- iput-boolean v0, p0, Lcom/discord/stores/StoreUserPresence;->isLocalPresenceDirty:Z
+ invoke-virtual {v4, v2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+
+ iput-boolean v15, v0, Lcom/discord/stores/StoreUserPresence;->isLocalPresenceDirty:Z
:cond_9
- const-wide v0, 0x7fffffffffffffffL
+ const-wide v14, 0x7fffffffffffffffL
- new-instance p1, Lcom/discord/models/domain/ModelPresence;
+ new-instance v2, Lcom/discord/models/domain/ModelPresence;
- const/4 v6, 0x0
+ const/4 v7, 0x0
- iget-object v7, p0, Lcom/discord/stores/StoreUserPresence;->meUser:Lcom/discord/models/domain/ModelUser;
+ iget-object v8, v0, Lcom/discord/stores/StoreUserPresence;->meUser:Lcom/discord/models/domain/ModelUser;
- const-wide/16 v8, 0x0
-
- const/16 v10, 0x14
+ const-wide/16 v9, 0x0
const/4 v11, 0x0
- move-object v3, p1
+ const/4 v12, 0x0
+
+ const/16 v13, 0x74
+
+ const/16 v16, 0x0
move-object v4, v2
- move-object v5, p2
+ move-object v5, v3
- invoke-direct/range {v3 .. v11}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ move-object v6, v1
- invoke-virtual {p0, v0, v1, p1}, Lcom/discord/stores/StoreUserPresence;->handlePresenceUpdate(JLcom/discord/models/domain/ModelPresence;)V
+ move-wide v0, v14
+
+ move-object/from16 v14, v16
+
+ invoke-direct/range {v4 .. v14}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+ move-wide v3, v0
+
+ move-object/from16 v0, p0
+
+ invoke-virtual {v0, v3, v4, v2}, Lcom/discord/stores/StoreUserPresence;->handlePresenceUpdate(JLcom/discord/models/domain/ModelPresence;)V
if-nez p3, :cond_a
- iget-object p1, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+ iget-object v1, v0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getCustomStatusActivity()Lcom/discord/models/domain/activity/ModelActivity;
+ invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence;->getCustomStatusActivity()Lcom/discord/models/domain/activity/ModelActivity;
- move-result-object p1
+ move-result-object v1
- if-nez p1, :cond_a
+ if-nez v1, :cond_a
- const/4 p1, 0x0
+ const/4 v1, 0x0
- iput-boolean p1, p0, Lcom/discord/stores/StoreUserPresence;->isLocalPresenceDirty:Z
+ iput-boolean v1, v0, Lcom/discord/stores/StoreUserPresence;->isLocalPresenceDirty:Z
:cond_a
return-void
@@ -1509,7 +1545,7 @@
.end method
.method public final handleGuildMemberRemove(Lcom/discord/models/domain/ModelGuildMember;)V
- .locals 12
+ .locals 14
.annotation runtime Lcom/discord/stores/StoreThread;
.end annotation
@@ -1519,7 +1555,7 @@
move-result-wide v0
- new-instance v11, Lcom/discord/models/domain/ModelPresence;
+ new-instance v13, Lcom/discord/models/domain/ModelPresence;
sget-object v3, Lcom/discord/models/domain/ModelPresence$Status;->OFFLINE:Lcom/discord/models/domain/ModelPresence$Status;
@@ -1533,15 +1569,19 @@
const-wide/16 v7, 0x0
- const/16 v9, 0x14
+ const/4 v9, 0x0
const/4 v10, 0x0
- move-object v2, v11
+ const/16 v11, 0x74
- invoke-direct/range {v2 .. v10}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ const/4 v12, 0x0
- invoke-virtual {p0, v0, v1, v11}, Lcom/discord/stores/StoreUserPresence;->handlePresenceUpdate(JLcom/discord/models/domain/ModelPresence;)V
+ move-object v2, v13
+
+ invoke-direct/range {v2 .. v12}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+ invoke-virtual {p0, v0, v1, v13}, Lcom/discord/stores/StoreUserPresence;->handlePresenceUpdate(JLcom/discord/models/domain/ModelPresence;)V
return-void
@@ -1857,7 +1897,7 @@
.end method
.method public final updateActivity(ILcom/discord/models/domain/activity/ModelActivity;Z)V
- .locals 10
+ .locals 12
.annotation runtime Lcom/discord/stores/StoreThread;
.end annotation
@@ -1978,13 +2018,17 @@
const-wide/16 v6, 0x0
- const/16 v8, 0x1c
+ const/4 v8, 0x0
const/4 v9, 0x0
+ const/16 v10, 0x7c
+
+ const/4 v11, 0x0
+
move-object v1, p1
- invoke-direct/range {v1 .. v9}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ invoke-direct/range {v1 .. v11}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
iput-object p1, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
index bf8ad51c7f..73a360ad5c 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
@@ -177,7 +177,7 @@
const-string v3, "browser_user_agent"
- const-string v4, "Discord-Android/1235"
+ const-string v4, "Discord-Android/1236"
invoke-direct {v2, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V
@@ -185,7 +185,7 @@
const/4 v1, 0x2
- const/16 v2, 0x4d3
+ const/16 v2, 0x4d4
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -205,7 +205,7 @@
const-string v3, "client_version"
- const-string v4, "35.0"
+ const-string v4, "35.1"
invoke-direct {v2, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings.smali
index 372539e163..1ea831ed88 100644
--- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings.smali
+++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings.smali
@@ -7,10 +7,12 @@
.field public static final synthetic $EnumSwitchMapping$1:[I
+.field public static final synthetic $EnumSwitchMapping$2:[I
+
# direct methods
.method public static synthetic constructor ()V
- .locals 6
+ .locals 7
invoke-static {}, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->values()[Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
@@ -32,67 +34,67 @@
sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$0:[I
- sget-object v1, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->GUILD:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+ sget-object v3, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->GUILD:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
- const/4 v1, 0x2
+ const/4 v3, 0x2
- aput v1, v0, v2
+ aput v3, v0, v2
sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$0:[I
- sget-object v3, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->CHANNEL:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+ sget-object v4, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->CHANNEL:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
- const/4 v3, 0x3
-
- aput v3, v0, v1
-
- sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$0:[I
-
- sget-object v4, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->USER:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
-
- const/4 v4, 0x4
+ const/4 v4, 0x3
aput v4, v0, v3
sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$0:[I
- sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->ROLE:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+ sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->USER:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
- const/4 v5, 0x5
+ const/4 v5, 0x4
aput v5, v0, v4
sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$0:[I
- sget-object v4, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->INVITE:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+ sget-object v6, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->ROLE:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
- const/4 v4, 0x6
+ const/4 v6, 0x5
- aput v4, v0, v5
+ aput v6, v0, v5
sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$0:[I
- sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->WEBHOOK:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+ sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->INVITE:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
- const/4 v5, 0x7
+ const/4 v5, 0x6
- aput v5, v0, v4
+ aput v5, v0, v6
sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$0:[I
- sget-object v4, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->EMOJI:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+ sget-object v6, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->WEBHOOK:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
- const/16 v4, 0x8
+ const/4 v6, 0x7
- aput v4, v0, v5
+ aput v6, v0, v5
sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$0:[I
- sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->INTEGRATION:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+ sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->EMOJI:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
- const/16 v5, 0x9
+ const/16 v5, 0x8
- aput v5, v0, v4
+ aput v5, v0, v6
+
+ sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$0:[I
+
+ sget-object v6, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->INTEGRATION:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+
+ const/16 v6, 0x9
+
+ aput v6, v0, v5
invoke-static {}, Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;->values()[Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;
@@ -104,21 +106,41 @@
sput-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$1:[I
- sget-object v4, Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;->CREATE:Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;
+ sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;->CREATE:Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;
aput v2, v0, v2
sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$1:[I
- sget-object v2, Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;->UPDATE:Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;
-
- aput v1, v0, v1
-
- sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$1:[I
-
- sget-object v1, Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;->DELETE:Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;
+ sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;->UPDATE:Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;
aput v3, v0, v3
+ sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$1:[I
+
+ sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;->DELETE:Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;
+
+ aput v4, v0, v4
+
+ invoke-static {}, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;->values()[Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ move-result-object v0
+
+ array-length v0, v0
+
+ new-array v0, v0, [I
+
+ sput-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$2:[I
+
+ sget-object v4, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;->MEMBER:Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ aput v2, v0, v1
+
+ sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$2:[I
+
+ sget-object v1, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;->ROLE:Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ aput v3, v0, v2
+
return-void
.end method
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
index 422c186ea4..4d6b74b720 100644
--- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
+++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
@@ -3011,7 +3011,7 @@
move-result-object v0
- if-eqz v0, :cond_b
+ if-eqz v0, :cond_a
check-cast v0, Ljava/util/Collection;
@@ -3023,11 +3023,7 @@
if-eqz v1, :cond_0
- invoke-virtual {v1}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getType()I
-
- move-result v1
-
- invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+ invoke-virtual {v1}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getType()Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
move-result-object v1
@@ -3046,12 +3042,33 @@
goto :goto_1
:cond_1
- invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+ invoke-virtual {v1}, Ljava/lang/Enum;->ordinal()I
- move-result v5
+ move-result v1
- if-ne v5, v4, :cond_3
+ if-eqz v1, :cond_3
+ if-eq v1, v4, :cond_2
+
+ :goto_1
+ move-object v2, v3
+
+ goto :goto_2
+
+ :cond_2
+ invoke-virtual {p3}, Lcom/discord/models/domain/ModelAuditLogEntry;->getOptions()Lcom/discord/models/domain/ModelAuditLogEntry$Options;
+
+ move-result-object p3
+
+ if-eqz p3, :cond_5
+
+ invoke-virtual {p3}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getRoleName()Ljava/lang/String;
+
+ move-result-object v2
+
+ goto :goto_2
+
+ :cond_3
sget-object v1, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->USER:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
invoke-interface {p4, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
@@ -3060,13 +3077,13 @@
check-cast p4, Ljava/util/Map;
- if-eqz p4, :cond_6
+ if-eqz p4, :cond_5
invoke-virtual {p3}, Lcom/discord/models/domain/ModelAuditLogEntry;->getOptions()Lcom/discord/models/domain/ModelAuditLogEntry$Options;
move-result-object p3
- if-eqz p3, :cond_2
+ if-eqz p3, :cond_4
invoke-virtual {p3}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getId()J
@@ -3076,7 +3093,7 @@
move-result-object v2
- :cond_2
+ :cond_4
invoke-interface {p4, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
move-result-object p3
@@ -3085,48 +3102,17 @@
check-cast v2, Ljava/lang/String;
- goto :goto_3
-
- :cond_3
- :goto_1
- if-nez v1, :cond_4
-
- goto :goto_2
-
- :cond_4
- invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
-
- move-result p4
-
- if-nez p4, :cond_5
-
- invoke-virtual {p3}, Lcom/discord/models/domain/ModelAuditLogEntry;->getOptions()Lcom/discord/models/domain/ModelAuditLogEntry$Options;
-
- move-result-object p3
-
- if-eqz p3, :cond_6
-
- invoke-virtual {p3}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getRoleName()Ljava/lang/String;
-
- move-result-object v2
-
- goto :goto_3
-
:cond_5
:goto_2
- move-object v2, v3
-
- :cond_6
- :goto_3
invoke-virtual {p2}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getKey()Ljava/lang/String;
move-result-object p2
- if-nez p2, :cond_7
+ if-nez p2, :cond_6
- goto/16 :goto_4
+ goto/16 :goto_3
- :cond_7
+ :cond_6
invoke-virtual {p2}, Ljava/lang/String;->hashCode()I
move-result p3
@@ -3141,22 +3127,22 @@
const/4 v7, 0x0
- if-eq p3, p4, :cond_9
+ if-eq p3, p4, :cond_8
const p4, 0x589a349
- if-eq p3, p4, :cond_8
+ if-eq p3, p4, :cond_7
- goto :goto_4
+ goto :goto_3
- :cond_8
+ :cond_7
const-string p3, "allow"
invoke-virtual {p2, p3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result p2
- if-eqz p2, :cond_a
+ if-eqz p2, :cond_9
const p2, 0x7f12099e
@@ -3200,16 +3186,16 @@
invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- goto :goto_4
+ goto :goto_3
- :cond_9
+ :cond_8
const-string p3, "deny"
invoke-virtual {p2, p3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result p2
- if-eqz p2, :cond_a
+ if-eqz p2, :cond_9
const p2, 0x7f12099d
@@ -3253,11 +3239,11 @@
invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- :cond_a
- :goto_4
+ :cond_9
+ :goto_3
return-object v3
- :cond_b
+ :cond_a
new-instance p1, Lkotlin/TypeCastException;
const-string p2, "null cannot be cast to non-null type kotlin.collections.Collection<*>"
@@ -3267,13 +3253,13 @@
throw p1
.end method
-.method private final getPermissionBits(J)Ljava/util/HashSet;
- .locals 7
+.method private final getPermissionBits(I)Ljava/util/HashSet;
+ .locals 4
.annotation system Ldalvik/annotation/Signature;
value = {
- "(J)",
+ "(I)",
"Ljava/util/HashSet<",
- "Ljava/lang/Long;",
+ "Ljava/lang/Integer;",
">;"
}
.end annotation
@@ -3285,21 +3271,19 @@
const/4 v1, 0x0
:goto_0
- const/16 v2, 0x3f
+ const/16 v2, 0x1f
if-gt v1, v2, :cond_1
- const-wide/16 v2, 0x1
+ const/4 v2, 0x1
- shl-long/2addr v2, v1
+ shl-int/2addr v2, v1
- and-long v4, p1, v2
+ and-int v3, p1, v2
- cmp-long v6, v4, v2
+ if-ne v3, v2, :cond_0
- if-nez v6, :cond_0
-
- invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
move-result-object v2
@@ -5137,7 +5121,7 @@
.end method
.method private final transformPermissionChange(Lcom/discord/models/domain/ModelAuditLogEntry$Change;)Ljava/util/List;
- .locals 13
+ .locals 8
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
@@ -5153,7 +5137,7 @@
move-result-object v0
- instance-of v1, v0, Ljava/lang/String;
+ instance-of v1, v0, Ljava/lang/Long;
const/4 v2, 0x0
@@ -5162,139 +5146,142 @@
move-object v0, v2
:cond_0
- check-cast v0, Ljava/lang/String;
+ check-cast v0, Ljava/lang/Long;
- const-wide/16 v3, 0x0
+ const/4 v1, 0x0
if-eqz v0, :cond_1
- invoke-static {v0}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
+ invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
- move-result-wide v0
+ move-result-wide v3
+
+ long-to-int v0, v3
goto :goto_0
:cond_1
- move-wide v0, v3
+ const/4 v0, 0x0
:goto_0
invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getNewValue()Ljava/lang/Object;
move-result-object p1
- instance-of v5, p1, Ljava/lang/String;
+ instance-of v3, p1, Ljava/lang/Long;
- if-nez v5, :cond_2
+ if-nez v3, :cond_2
move-object p1, v2
:cond_2
- check-cast p1, Ljava/lang/String;
+ check-cast p1, Ljava/lang/Long;
if-eqz p1, :cond_3
- invoke-static {p1}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
+ invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
move-result-wide v3
- :cond_3
- not-long v5, v0
-
- and-long/2addr v5, v3
-
- not-long v3, v3
-
- and-long/2addr v0, v3
-
- new-instance p1, Ljava/util/HashSet;
-
- invoke-direct {p1}, Ljava/util/HashSet;->()V
-
- new-instance v3, Ljava/util/HashSet;
-
- invoke-direct {v3}, Ljava/util/HashSet;->()V
-
- const/4 v4, 0x0
-
- const/16 v7, 0x3f
-
- :goto_1
- if-gt v4, v7, :cond_6
-
- const-wide/16 v8, 0x1
-
- shl-long/2addr v8, v4
-
- and-long v10, v5, v8
-
- cmp-long v12, v10, v8
-
- if-nez v12, :cond_4
-
- invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
- move-result-object v10
-
- invoke-virtual {p1, v10}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
-
- :cond_4
- and-long v10, v0, v8
-
- cmp-long v12, v10, v8
-
- if-nez v12, :cond_5
-
- invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
- move-result-object v8
-
- invoke-virtual {v3, v8}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
-
- :cond_5
- add-int/lit8 v4, v4, 0x1
+ long-to-int p1, v3
goto :goto_1
+ :cond_3
+ const/4 p1, 0x0
+
+ :goto_1
+ not-int v3, v0
+
+ and-int/2addr v3, p1
+
+ not-int p1, p1
+
+ and-int/2addr p1, v0
+
+ new-instance v0, Ljava/util/HashSet;
+
+ invoke-direct {v0}, Ljava/util/HashSet;->()V
+
+ new-instance v4, Ljava/util/HashSet;
+
+ invoke-direct {v4}, Ljava/util/HashSet;->()V
+
+ const/16 v5, 0x1f
+
+ :goto_2
+ const/4 v6, 0x1
+
+ if-gt v1, v5, :cond_6
+
+ shl-int/2addr v6, v1
+
+ and-int v7, v3, v6
+
+ if-ne v7, v6, :cond_4
+
+ invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+ move-result-object v7
+
+ invoke-virtual {v0, v7}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
+
+ :cond_4
+ and-int v7, p1, v6
+
+ if-ne v7, v6, :cond_5
+
+ invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+ move-result-object v6
+
+ invoke-virtual {v4, v6}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
+
+ :cond_5
+ add-int/lit8 v1, v1, 0x1
+
+ goto :goto_2
+
:cond_6
- new-instance v0, Ljava/util/ArrayList;
+ new-instance p1, Ljava/util/ArrayList;
- invoke-direct {v0}, Ljava/util/ArrayList;->()V
+ invoke-direct {p1}, Ljava/util/ArrayList;->()V
- invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
+ invoke-interface {v0}, Ljava/util/Collection;->isEmpty()Z
move-result v1
- xor-int/lit8 v1, v1, 0x1
+ xor-int/2addr v1, v6
if-eqz v1, :cond_7
new-instance v1, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
- const-string v4, "allow"
+ const-string v3, "allow"
- invoke-direct {v1, v4, v2, p1}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
+ invoke-direct {v1, v3, v2, v0}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
- invoke-virtual {v0, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+ invoke-virtual {p1, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
:cond_7
- invoke-interface {v3}, Ljava/util/Collection;->isEmpty()Z
+ invoke-interface {v4}, Ljava/util/Collection;->isEmpty()Z
- move-result p1
+ move-result v0
- xor-int/lit8 p1, p1, 0x1
+ xor-int/2addr v0, v6
- if-eqz p1, :cond_8
+ if-eqz v0, :cond_8
- new-instance p1, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
+ new-instance v0, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
const-string v1, "deny"
- invoke-direct {p1, v1, v2, v3}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
+ invoke-direct {v0, v1, v2, v4}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
- invoke-virtual {v0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+ invoke-virtual {p1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
:cond_8
- return-object v0
+ return-object p1
.end method
.method private final transformPermissionOverride(Lcom/discord/models/domain/ModelAuditLogEntry$Change;)Ljava/util/List;
@@ -5314,7 +5301,7 @@
move-result-object v0
- instance-of v1, v0, Ljava/lang/String;
+ instance-of v1, v0, Ljava/lang/Long;
const/4 v2, 0x0
@@ -5323,56 +5310,58 @@
move-object v0, v2
:cond_0
- check-cast v0, Ljava/lang/String;
+ check-cast v0, Ljava/lang/Long;
- const-string v1, "0"
+ const-wide/16 v3, 0x0
if-eqz v0, :cond_1
+ invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+ move-result-wide v0
+
goto :goto_0
:cond_1
- move-object v0, v1
+ move-wide v0, v3
:goto_0
- sget-object v3, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
+ sget-object v5, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
- invoke-static {v0}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
+ long-to-int v1, v0
- move-result-wide v4
-
- invoke-direct {v3, v4, v5}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getPermissionBits(J)Ljava/util/HashSet;
+ invoke-direct {v5, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getPermissionBits(I)Ljava/util/HashSet;
move-result-object v0
invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getNewValue()Ljava/lang/Object;
- move-result-object v3
+ move-result-object v1
- instance-of v4, v3, Ljava/lang/String;
+ instance-of v5, v1, Ljava/lang/Long;
- if-nez v4, :cond_2
+ if-nez v5, :cond_2
goto :goto_1
:cond_2
- move-object v2, v3
+ move-object v2, v1
:goto_1
- check-cast v2, Ljava/lang/String;
+ check-cast v2, Ljava/lang/Long;
if-eqz v2, :cond_3
- move-object v1, v2
-
- :cond_3
- sget-object v2, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
-
- invoke-static {v1}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
+ invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
move-result-wide v3
- invoke-direct {v2, v3, v4}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getPermissionBits(J)Ljava/util/HashSet;
+ :cond_3
+ sget-object v1, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
+
+ long-to-int v2, v3
+
+ invoke-direct {v1, v2}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getPermissionBits(I)Ljava/util/HashSet;
move-result-object v1
diff --git a/com.discord/smali/com/discord/utilities/error/Error$Response.smali b/com.discord/smali/com/discord/utilities/error/Error$Response.smali
index 73b03610c5..cd921462e9 100644
--- a/com.discord/smali/com/discord/utilities/error/Error$Response.smali
+++ b/com.discord/smali/com/discord/utilities/error/Error$Response.smali
@@ -44,11 +44,6 @@
.field public retryAfter:I
-.field public skemaError:Lcom/discord/utilities/error/Error$SkemaError;
- .annotation build Landroidx/annotation/Nullable;
- .end annotation
-.end field
-
# direct methods
.method public constructor (Ljava/lang/String;)V
@@ -122,7 +117,7 @@
.end method
.method private getMessageToast(Landroid/content/Context;I)Ljava/lang/String;
- .locals 4
+ .locals 3
.param p2 # I
.annotation build Landroidx/annotation/StringRes;
.end annotation
@@ -152,46 +147,14 @@
return-object p1
:cond_0
- iget-object v0, p0, Lcom/discord/utilities/error/Error$Response;->skemaError:Lcom/discord/utilities/error/Error$SkemaError;
+ iget-object v0, p0, Lcom/discord/utilities/error/Error$Response;->message:Ljava/lang/String;
- if-eqz v0, :cond_3
+ if-eqz v0, :cond_1
- invoke-static {v0}, Lcom/discord/utilities/error/Error$SkemaError;->access$400(Lcom/discord/utilities/error/Error$SkemaError;)Ljava/util/List;
-
- move-result-object v0
-
- invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
-
- move-result v0
-
- const/4 v1, 0x0
-
- if-nez v0, :cond_1
-
- iget-object p1, p0, Lcom/discord/utilities/error/Error$Response;->skemaError:Lcom/discord/utilities/error/Error$SkemaError;
-
- invoke-static {p1}, Lcom/discord/utilities/error/Error$SkemaError;->access$400(Lcom/discord/utilities/error/Error$SkemaError;)Ljava/util/List;
-
- move-result-object p1
-
- invoke-interface {p1, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
- move-result-object p1
-
- check-cast p1, Lcom/discord/utilities/error/Error$SkemaErrorItem;
-
- invoke-static {p1}, Lcom/discord/utilities/error/Error$SkemaErrorItem;->access$500(Lcom/discord/utilities/error/Error$SkemaErrorItem;)Ljava/lang/String;
-
- move-result-object p1
-
- return-object p1
+ return-object v0
:cond_1
- iget-object v0, p0, Lcom/discord/utilities/error/Error$Response;->skemaError:Lcom/discord/utilities/error/Error$SkemaError;
-
- invoke-static {v0}, Lcom/discord/utilities/error/Error$SkemaError;->access$600(Lcom/discord/utilities/error/Error$SkemaError;)Ljava/util/Map;
-
- move-result-object v0
+ iget-object v0, p0, Lcom/discord/utilities/error/Error$Response;->messages:Ljava/util/Map;
invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection;
@@ -204,66 +167,9 @@
:cond_2
invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
- move-result v2
-
- if-eqz v2, :cond_3
-
- invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
- move-result-object v2
-
- check-cast v2, Lcom/discord/utilities/error/Error$SkemaError;
-
- invoke-static {v2}, Lcom/discord/utilities/error/Error$SkemaError;->access$400(Lcom/discord/utilities/error/Error$SkemaError;)Ljava/util/List;
-
- move-result-object v3
-
- invoke-interface {v3}, Ljava/util/List;->isEmpty()Z
-
- move-result v3
-
- if-nez v3, :cond_2
-
- invoke-static {v2}, Lcom/discord/utilities/error/Error$SkemaError;->access$400(Lcom/discord/utilities/error/Error$SkemaError;)Ljava/util/List;
-
- move-result-object p1
-
- invoke-interface {p1, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
- move-result-object p1
-
- check-cast p1, Lcom/discord/utilities/error/Error$SkemaErrorItem;
-
- invoke-static {p1}, Lcom/discord/utilities/error/Error$SkemaErrorItem;->access$500(Lcom/discord/utilities/error/Error$SkemaErrorItem;)Ljava/lang/String;
-
- move-result-object p1
-
- return-object p1
-
- :cond_3
- iget-object v0, p0, Lcom/discord/utilities/error/Error$Response;->message:Ljava/lang/String;
-
- if-eqz v0, :cond_4
-
- return-object v0
-
- :cond_4
- iget-object v0, p0, Lcom/discord/utilities/error/Error$Response;->messages:Ljava/util/Map;
-
- invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection;
-
- move-result-object v0
-
- invoke-interface {v0}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
-
- move-result-object v0
-
- :cond_5
- invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
move-result v1
- if-eqz v1, :cond_7
+ if-eqz v1, :cond_4
invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
@@ -275,12 +181,12 @@
move-result-object v1
- :cond_6
+ :cond_3
invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
move-result v2
- if-eqz v2, :cond_5
+ if-eqz v2, :cond_2
invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
@@ -288,11 +194,11 @@
check-cast v2, Ljava/lang/String;
- if-eqz v2, :cond_6
+ if-eqz v2, :cond_3
return-object v2
- :cond_7
+ :cond_4
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
move-result-object p1
@@ -303,7 +209,7 @@
# virtual methods
.method public assignField(Lcom/discord/models/domain/Model$JsonReader;)V
- .locals 6
+ .locals 5
.annotation system Ldalvik/annotation/Throws;
value = {
Ljava/io/IOException;
@@ -318,13 +224,11 @@
move-result v1
- const/4 v2, 0x4
+ const/4 v2, 0x3
- const/4 v3, 0x3
+ const/4 v3, 0x2
- const/4 v4, 0x2
-
- const/4 v5, 0x1
+ const/4 v4, 0x1
sparse-switch v1, :sswitch_data_0
@@ -382,31 +286,16 @@
goto :goto_1
- :sswitch_4
- const-string v1, "errors"
-
- invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
- move-result v1
-
- if-eqz v1, :cond_0
-
- const/4 v1, 0x4
-
- goto :goto_1
-
:cond_0
:goto_0
const/4 v1, -0x1
:goto_1
- if-eqz v1, :cond_8
+ if-eqz v1, :cond_4
- if-eq v1, v5, :cond_7
+ if-eq v1, v4, :cond_3
- if-eq v1, v4, :cond_6
-
- if-eq v1, v3, :cond_5
+ if-eq v1, v3, :cond_2
if-eq v1, v2, :cond_1
@@ -422,176 +311,9 @@
invoke-interface {v1, v0, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- goto/16 :goto_5
-
- :cond_1
- new-instance v0, Lcom/discord/utilities/error/Error$SkemaError;
-
- const/4 v1, 0x0
-
- invoke-direct {v0, v1}, Lcom/discord/utilities/error/Error$SkemaError;->(Lcom/discord/utilities/error/Error$1;)V
-
- invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->parse(Lcom/discord/models/domain/Model;)Lcom/discord/models/domain/Model;
-
- move-result-object p1
-
- check-cast p1, Lcom/discord/utilities/error/Error$SkemaError;
-
- iput-object p1, p0, Lcom/discord/utilities/error/Error$Response;->skemaError:Lcom/discord/utilities/error/Error$SkemaError;
-
- invoke-static {p1}, Lcom/discord/utilities/error/Error$SkemaError;->access$400(Lcom/discord/utilities/error/Error$SkemaError;)Ljava/util/List;
-
- move-result-object p1
-
- invoke-interface {p1}, Ljava/util/List;->isEmpty()Z
-
- move-result p1
-
- if-nez p1, :cond_3
-
- new-instance p1, Ljava/util/ArrayList;
-
- invoke-direct {p1}, Ljava/util/ArrayList;->()V
-
- iget-object v0, p0, Lcom/discord/utilities/error/Error$Response;->skemaError:Lcom/discord/utilities/error/Error$SkemaError;
-
- invoke-static {v0}, Lcom/discord/utilities/error/Error$SkemaError;->access$400(Lcom/discord/utilities/error/Error$SkemaError;)Ljava/util/List;
-
- move-result-object v0
-
- invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
- move-result-object v0
-
- :goto_2
- invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
- move-result v1
-
- if-eqz v1, :cond_2
-
- invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
- move-result-object v1
-
- check-cast v1, Lcom/discord/utilities/error/Error$SkemaErrorItem;
-
- invoke-static {v1}, Lcom/discord/utilities/error/Error$SkemaErrorItem;->access$500(Lcom/discord/utilities/error/Error$SkemaErrorItem;)Ljava/lang/String;
-
- move-result-object v1
-
- invoke-virtual {p1, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
goto :goto_2
- :cond_2
- iget-object v0, p0, Lcom/discord/utilities/error/Error$Response;->messages:Ljava/util/Map;
-
- const-string v1, "_misc"
-
- invoke-interface {v0, v1, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
- :cond_3
- iget-object p1, p0, Lcom/discord/utilities/error/Error$Response;->skemaError:Lcom/discord/utilities/error/Error$SkemaError;
-
- invoke-static {p1}, Lcom/discord/utilities/error/Error$SkemaError;->access$600(Lcom/discord/utilities/error/Error$SkemaError;)Ljava/util/Map;
-
- move-result-object p1
-
- invoke-interface {p1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
-
- move-result-object p1
-
- invoke-interface {p1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
-
- move-result-object p1
-
- :goto_3
- invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
- move-result v0
-
- if-eqz v0, :cond_9
-
- invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
- move-result-object v0
-
- check-cast v0, Ljava/util/Map$Entry;
-
- new-instance v1, Ljava/util/ArrayList;
-
- invoke-direct {v1}, Ljava/util/ArrayList;->()V
-
- invoke-interface {v0}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
-
- move-result-object v2
-
- check-cast v2, Ljava/lang/String;
-
- invoke-interface {v0}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
-
- move-result-object v0
-
- check-cast v0, Lcom/discord/utilities/error/Error$SkemaError;
-
- invoke-static {v0}, Lcom/discord/utilities/error/Error$SkemaError;->access$400(Lcom/discord/utilities/error/Error$SkemaError;)Ljava/util/List;
-
- move-result-object v3
-
- invoke-interface {v3}, Ljava/util/List;->isEmpty()Z
-
- move-result v3
-
- if-nez v3, :cond_4
-
- invoke-static {v0}, Lcom/discord/utilities/error/Error$SkemaError;->access$400(Lcom/discord/utilities/error/Error$SkemaError;)Ljava/util/List;
-
- move-result-object v3
-
- invoke-interface {v3}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
- move-result-object v3
-
- :goto_4
- invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
-
- move-result v4
-
- if-eqz v4, :cond_4
-
- invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
- move-result-object v4
-
- check-cast v4, Lcom/discord/utilities/error/Error$SkemaErrorItem;
-
- invoke-static {v4}, Lcom/discord/utilities/error/Error$SkemaErrorItem;->access$500(Lcom/discord/utilities/error/Error$SkemaErrorItem;)Ljava/lang/String;
-
- move-result-object v4
-
- invoke-virtual {v1, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
- goto :goto_4
-
- :cond_4
- invoke-static {v0}, Lcom/discord/utilities/error/Error$SkemaError;->access$600(Lcom/discord/utilities/error/Error$SkemaError;)Ljava/util/Map;
-
- move-result-object v0
-
- invoke-interface {v0}, Ljava/util/Map;->keySet()Ljava/util/Set;
-
- move-result-object v0
-
- invoke-virtual {v1, v0}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
-
- iget-object v0, p0, Lcom/discord/utilities/error/Error$Response;->messages:Ljava/util/Map;
-
- invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
- goto :goto_3
-
- :cond_5
+ :cond_1
iget-boolean v0, p0, Lcom/discord/utilities/error/Error$Response;->global:Z
invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextBoolean(Z)Z
@@ -600,9 +322,9 @@
iput-boolean p1, p0, Lcom/discord/utilities/error/Error$Response;->global:Z
- goto :goto_5
+ goto :goto_2
- :cond_6
+ :cond_2
iget v0, p0, Lcom/discord/utilities/error/Error$Response;->retryAfter:I
invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I
@@ -611,9 +333,9 @@
iput p1, p0, Lcom/discord/utilities/error/Error$Response;->retryAfter:I
- goto :goto_5
+ goto :goto_2
- :cond_7
+ :cond_3
iget-object v0, p0, Lcom/discord/utilities/error/Error$Response;->message:Ljava/lang/String;
invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextString(Ljava/lang/String;)Ljava/lang/String;
@@ -622,9 +344,9 @@
iput-object p1, p0, Lcom/discord/utilities/error/Error$Response;->message:Ljava/lang/String;
- goto :goto_5
+ goto :goto_2
- :cond_8
+ :cond_4
iget v0, p0, Lcom/discord/utilities/error/Error$Response;->code:I
invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I
@@ -633,15 +355,13 @@
iput p1, p0, Lcom/discord/utilities/error/Error$Response;->code:I
- :cond_9
- :goto_5
+ :goto_2
return-void
nop
:sswitch_data_0
.sparse-switch
- -0x4d2a9095 -> :sswitch_4
-0x4a16fc5d -> :sswitch_3
-0x3771127b -> :sswitch_2
0x2eaded -> :sswitch_1
@@ -734,9 +454,13 @@
return v2
:cond_6
- iget-object v1, p0, Lcom/discord/utilities/error/Error$Response;->skemaError:Lcom/discord/utilities/error/Error$SkemaError;
+ invoke-virtual {p0}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
- iget-object v3, p1, Lcom/discord/utilities/error/Error$Response;->skemaError:Lcom/discord/utilities/error/Error$SkemaError;
+ move-result-object v1
+
+ invoke-virtual {p1}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
+
+ move-result-object v3
if-nez v1, :cond_7
@@ -745,7 +469,7 @@
goto :goto_1
:cond_7
- invoke-virtual {v1, v3}, Lcom/discord/utilities/error/Error$SkemaError;->equals(Ljava/lang/Object;)Z
+ invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
move-result v1
@@ -755,31 +479,6 @@
return v2
:cond_8
- invoke-virtual {p0}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
-
- move-result-object v1
-
- invoke-virtual {p1}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
-
- move-result-object v3
-
- if-nez v1, :cond_9
-
- if-eqz v3, :cond_a
-
- goto :goto_2
-
- :cond_9
- invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
- move-result v1
-
- if-nez v1, :cond_a
-
- :goto_2
- return v2
-
- :cond_a
invoke-virtual {p0}, Lcom/discord/utilities/error/Error$Response;->getMessage()Ljava/lang/String;
move-result-object v1
@@ -788,23 +487,23 @@
move-result-object p1
- if-nez v1, :cond_b
+ if-nez v1, :cond_9
- if-eqz p1, :cond_c
+ if-eqz p1, :cond_a
- goto :goto_3
+ goto :goto_2
- :cond_b
+ :cond_9
invoke-virtual {v1, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
move-result p1
- if-nez p1, :cond_c
+ if-nez p1, :cond_a
- :goto_3
+ :goto_2
return v2
- :cond_c
+ :cond_a
return v0
.end method
@@ -916,7 +615,9 @@
:goto_1
add-int/2addr v0, v1
- iget-object v1, p0, Lcom/discord/utilities/error/Error$Response;->skemaError:Lcom/discord/utilities/error/Error$SkemaError;
+ invoke-virtual {p0}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
+
+ move-result-object v1
mul-int/lit8 v0, v0, 0x3b
@@ -927,31 +628,11 @@
goto :goto_2
:cond_2
- invoke-virtual {v1}, Lcom/discord/utilities/error/Error$SkemaError;->hashCode()I
-
- move-result v1
-
- :goto_2
- add-int/2addr v0, v1
-
- invoke-virtual {p0}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
-
- 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
+ :goto_2
add-int/2addr v0, v1
invoke-virtual {p0}, Lcom/discord/utilities/error/Error$Response;->getMessage()Ljava/lang/String;
@@ -960,16 +641,16 @@
mul-int/lit8 v0, v0, 0x3b
- if-nez v1, :cond_4
+ if-nez v1, :cond_3
- goto :goto_4
+ goto :goto_3
- :cond_4
+ :cond_3
invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
move-result v2
- :goto_4
+ :goto_3
add-int/2addr v0, v2
return v0
@@ -1038,14 +719,6 @@
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
- const-string v1, ", skemaError="
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- iget-object v1, p0, Lcom/discord/utilities/error/Error$Response;->skemaError:Lcom/discord/utilities/error/Error$SkemaError;
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
const-string v1, ", messages="
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/discord/utilities/error/Error$SkemaError.smali b/com.discord/smali/com/discord/utilities/error/Error$SkemaError.smali
deleted file mode 100644
index d2e5ddd806..0000000000
--- a/com.discord/smali/com/discord/utilities/error/Error$SkemaError.smali
+++ /dev/null
@@ -1,319 +0,0 @@
-.class public Lcom/discord/utilities/error/Error$SkemaError;
-.super Ljava/lang/Object;
-.source "Error.java"
-
-# interfaces
-.implements Lcom/discord/models/domain/Model;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
- value = Lcom/discord/utilities/error/Error;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x9
- name = "SkemaError"
-.end annotation
-
-
-# instance fields
-.field public errors:Ljava/util/List;
- .annotation build Landroidx/annotation/NonNull;
- .end annotation
-
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "Ljava/util/List<",
- "Lcom/discord/utilities/error/Error$SkemaErrorItem;",
- ">;"
- }
- .end annotation
-.end field
-
-.field public subErrors:Ljava/util/Map;
- .annotation build Landroidx/annotation/NonNull;
- .end annotation
-
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "Ljava/util/Map<",
- "Ljava/lang/String;",
- "Lcom/discord/utilities/error/Error$SkemaError;",
- ">;"
- }
- .end annotation
-.end field
-
-
-# direct methods
-.method public constructor ()V
- .locals 1
-
- invoke-direct {p0}, Ljava/lang/Object;->()V
-
- invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
-
- move-result-object v0
-
- iput-object v0, p0, Lcom/discord/utilities/error/Error$SkemaError;->errors:Ljava/util/List;
-
- new-instance v0, Ljava/util/HashMap;
-
- invoke-direct {v0}, Ljava/util/HashMap;->()V
-
- iput-object v0, p0, Lcom/discord/utilities/error/Error$SkemaError;->subErrors:Ljava/util/Map;
-
- return-void
-.end method
-
-.method public synthetic constructor (Lcom/discord/utilities/error/Error$1;)V
- .locals 0
-
- invoke-direct {p0}, Lcom/discord/utilities/error/Error$SkemaError;->()V
-
- return-void
-.end method
-
-.method public static synthetic a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/utilities/error/Error$SkemaErrorItem;
- .locals 2
- .annotation system Ldalvik/annotation/Throws;
- value = {
- Ljava/io/IOException;
- }
- .end annotation
-
- new-instance v0, Lcom/discord/utilities/error/Error$SkemaErrorItem;
-
- const/4 v1, 0x0
-
- invoke-direct {v0, v1}, Lcom/discord/utilities/error/Error$SkemaErrorItem;->(Lcom/discord/utilities/error/Error$1;)V
-
- invoke-virtual {p0, v0}, Lcom/discord/models/domain/Model$JsonReader;->parse(Lcom/discord/models/domain/Model;)Lcom/discord/models/domain/Model;
-
- move-result-object p0
-
- check-cast p0, Lcom/discord/utilities/error/Error$SkemaErrorItem;
-
- return-object p0
-.end method
-
-.method public static synthetic access$400(Lcom/discord/utilities/error/Error$SkemaError;)Ljava/util/List;
- .locals 0
-
- iget-object p0, p0, Lcom/discord/utilities/error/Error$SkemaError;->errors:Ljava/util/List;
-
- return-object p0
-.end method
-
-.method public static synthetic access$600(Lcom/discord/utilities/error/Error$SkemaError;)Ljava/util/Map;
- .locals 0
-
- iget-object p0, p0, Lcom/discord/utilities/error/Error$SkemaError;->subErrors:Ljava/util/Map;
-
- return-object p0
-.end method
-
-
-# virtual methods
-.method public assignField(Lcom/discord/models/domain/Model$JsonReader;)V
- .locals 3
- .annotation system Ldalvik/annotation/Throws;
- value = {
- Ljava/io/IOException;
- }
- .end annotation
-
- invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->nextName()Ljava/lang/String;
-
- move-result-object v0
-
- const-string v1, "_errors"
-
- invoke-virtual {v1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
- move-result v1
-
- if-eqz v1, :cond_0
-
- new-instance v0, Lf/a/m/a/b;
-
- invoke-direct {v0, p1}, Lf/a/m/a/b;->(Lcom/discord/models/domain/Model$JsonReader;)V
-
- invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
-
- move-result-object p1
-
- iput-object p1, p0, Lcom/discord/utilities/error/Error$SkemaError;->errors:Ljava/util/List;
-
- goto :goto_0
-
- :cond_0
- iget-object v1, p0, Lcom/discord/utilities/error/Error$SkemaError;->subErrors:Ljava/util/Map;
-
- new-instance v2, Lcom/discord/utilities/error/Error$SkemaError;
-
- invoke-direct {v2}, Lcom/discord/utilities/error/Error$SkemaError;->()V
-
- invoke-virtual {p1, v2}, Lcom/discord/models/domain/Model$JsonReader;->parse(Lcom/discord/models/domain/Model;)Lcom/discord/models/domain/Model;
-
- move-result-object p1
-
- invoke-interface {v1, v0, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
- :goto_0
- return-void
-.end method
-
-.method public canEqual(Ljava/lang/Object;)Z
- .locals 0
-
- instance-of p1, p1, Lcom/discord/utilities/error/Error$SkemaError;
-
- return p1
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
- .locals 4
-
- const/4 v0, 0x1
-
- if-ne p1, p0, :cond_0
-
- return v0
-
- :cond_0
- instance-of v1, p1, Lcom/discord/utilities/error/Error$SkemaError;
-
- const/4 v2, 0x0
-
- if-nez v1, :cond_1
-
- return v2
-
- :cond_1
- check-cast p1, Lcom/discord/utilities/error/Error$SkemaError;
-
- invoke-virtual {p1, p0}, Lcom/discord/utilities/error/Error$SkemaError;->canEqual(Ljava/lang/Object;)Z
-
- move-result v1
-
- if-nez v1, :cond_2
-
- return v2
-
- :cond_2
- iget-object v1, p0, Lcom/discord/utilities/error/Error$SkemaError;->errors:Ljava/util/List;
-
- iget-object v3, p1, Lcom/discord/utilities/error/Error$SkemaError;->errors:Ljava/util/List;
-
- if-nez v1, :cond_3
-
- if-eqz v3, :cond_4
-
- goto :goto_0
-
- :cond_3
- invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
- move-result v1
-
- if-nez v1, :cond_4
-
- :goto_0
- return v2
-
- :cond_4
- iget-object v1, p0, Lcom/discord/utilities/error/Error$SkemaError;->subErrors:Ljava/util/Map;
-
- iget-object p1, p1, Lcom/discord/utilities/error/Error$SkemaError;->subErrors:Ljava/util/Map;
-
- if-nez v1, :cond_5
-
- if-eqz p1, :cond_6
-
- goto :goto_1
-
- :cond_5
- invoke-virtual {v1, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
- move-result p1
-
- if-nez p1, :cond_6
-
- :goto_1
- return v2
-
- :cond_6
- return v0
-.end method
-
-.method public hashCode()I
- .locals 4
-
- iget-object v0, p0, Lcom/discord/utilities/error/Error$SkemaError;->errors:Ljava/util/List;
-
- const/16 v1, 0x2b
-
- if-nez v0, :cond_0
-
- const/16 v0, 0x2b
-
- goto :goto_0
-
- :cond_0
- invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
- move-result v0
-
- :goto_0
- const/16 v2, 0x3b
-
- add-int/2addr v0, v2
-
- iget-object v3, p0, Lcom/discord/utilities/error/Error$SkemaError;->subErrors:Ljava/util/Map;
-
- mul-int/lit8 v0, v0, 0x3b
-
- if-nez v3, :cond_1
-
- goto :goto_1
-
- :cond_1
- invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
-
- move-result v1
-
- :goto_1
- add-int/2addr v0, v1
-
- return v0
-.end method
-
-.method public toString()Ljava/lang/String;
- .locals 3
-
- const-string v0, "Error.SkemaError(errors="
-
- invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- move-result-object v0
-
- iget-object v1, p0, Lcom/discord/utilities/error/Error$SkemaError;->errors:Ljava/util/List;
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
- const-string v1, ", subErrors="
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- iget-object v1, p0, Lcom/discord/utilities/error/Error$SkemaError;->subErrors:Ljava/util/Map;
-
- const-string v2, ")"
-
- invoke-static {v0, v1, v2}, Lf/e/b/a/a;->y(Ljava/lang/StringBuilder;Ljava/util/Map;Ljava/lang/String;)Ljava/lang/String;
-
- move-result-object v0
-
- return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/utilities/error/Error$SkemaErrorItem.smali b/com.discord/smali/com/discord/utilities/error/Error$SkemaErrorItem.smali
deleted file mode 100644
index d4246ea9e3..0000000000
--- a/com.discord/smali/com/discord/utilities/error/Error$SkemaErrorItem.smali
+++ /dev/null
@@ -1,293 +0,0 @@
-.class public Lcom/discord/utilities/error/Error$SkemaErrorItem;
-.super Ljava/lang/Object;
-.source "Error.java"
-
-# interfaces
-.implements Lcom/discord/models/domain/Model;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
- value = Lcom/discord/utilities/error/Error;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x9
- name = "SkemaErrorItem"
-.end annotation
-
-
-# instance fields
-.field public code:Ljava/lang/String;
-
-.field public message:Ljava/lang/String;
-
-
-# direct methods
-.method public constructor ()V
- .locals 0
-
- invoke-direct {p0}, Ljava/lang/Object;->()V
-
- return-void
-.end method
-
-.method public synthetic constructor (Lcom/discord/utilities/error/Error$1;)V
- .locals 0
-
- invoke-direct {p0}, Lcom/discord/utilities/error/Error$SkemaErrorItem;->()V
-
- return-void
-.end method
-
-.method public static synthetic access$500(Lcom/discord/utilities/error/Error$SkemaErrorItem;)Ljava/lang/String;
- .locals 0
-
- iget-object p0, p0, Lcom/discord/utilities/error/Error$SkemaErrorItem;->message:Ljava/lang/String;
-
- return-object p0
-.end method
-
-
-# virtual methods
-.method public assignField(Lcom/discord/models/domain/Model$JsonReader;)V
- .locals 4
- .annotation system Ldalvik/annotation/Throws;
- value = {
- Ljava/io/IOException;
- }
- .end annotation
-
- invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->nextName()Ljava/lang/String;
-
- move-result-object v0
-
- invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
-
- move-result v1
-
- const v2, 0x2eaded
-
- const/4 v3, 0x1
-
- if-eq v1, v2, :cond_1
-
- const v2, 0x38eb0007
-
- if-eq v1, v2, :cond_0
-
- goto :goto_0
-
- :cond_0
- const-string v1, "message"
-
- invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
- move-result v0
-
- if-eqz v0, :cond_2
-
- const/4 v0, 0x1
-
- goto :goto_1
-
- :cond_1
- const-string v1, "code"
-
- invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
- move-result v0
-
- if-eqz v0, :cond_2
-
- const/4 v0, 0x0
-
- goto :goto_1
-
- :cond_2
- :goto_0
- const/4 v0, -0x1
-
- :goto_1
- const/4 v1, 0x0
-
- if-eqz v0, :cond_4
-
- if-eq v0, v3, :cond_3
-
- invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->skipValue()V
-
- goto :goto_2
-
- :cond_3
- invoke-virtual {p1, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextString(Ljava/lang/String;)Ljava/lang/String;
-
- move-result-object p1
-
- iput-object p1, p0, Lcom/discord/utilities/error/Error$SkemaErrorItem;->message:Ljava/lang/String;
-
- goto :goto_2
-
- :cond_4
- invoke-virtual {p1, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextString(Ljava/lang/String;)Ljava/lang/String;
-
- move-result-object p1
-
- iput-object p1, p0, Lcom/discord/utilities/error/Error$SkemaErrorItem;->code:Ljava/lang/String;
-
- :goto_2
- return-void
-.end method
-
-.method public canEqual(Ljava/lang/Object;)Z
- .locals 0
-
- instance-of p1, p1, Lcom/discord/utilities/error/Error$SkemaErrorItem;
-
- return p1
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
- .locals 4
-
- const/4 v0, 0x1
-
- if-ne p1, p0, :cond_0
-
- return v0
-
- :cond_0
- instance-of v1, p1, Lcom/discord/utilities/error/Error$SkemaErrorItem;
-
- const/4 v2, 0x0
-
- if-nez v1, :cond_1
-
- return v2
-
- :cond_1
- check-cast p1, Lcom/discord/utilities/error/Error$SkemaErrorItem;
-
- invoke-virtual {p1, p0}, Lcom/discord/utilities/error/Error$SkemaErrorItem;->canEqual(Ljava/lang/Object;)Z
-
- move-result v1
-
- if-nez v1, :cond_2
-
- return v2
-
- :cond_2
- iget-object v1, p0, Lcom/discord/utilities/error/Error$SkemaErrorItem;->code:Ljava/lang/String;
-
- iget-object v3, p1, Lcom/discord/utilities/error/Error$SkemaErrorItem;->code:Ljava/lang/String;
-
- if-nez v1, :cond_3
-
- if-eqz v3, :cond_4
-
- goto :goto_0
-
- :cond_3
- invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
- move-result v1
-
- if-nez v1, :cond_4
-
- :goto_0
- return v2
-
- :cond_4
- iget-object v1, p0, Lcom/discord/utilities/error/Error$SkemaErrorItem;->message:Ljava/lang/String;
-
- iget-object p1, p1, Lcom/discord/utilities/error/Error$SkemaErrorItem;->message:Ljava/lang/String;
-
- if-nez v1, :cond_5
-
- if-eqz p1, :cond_6
-
- goto :goto_1
-
- :cond_5
- invoke-virtual {v1, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
- move-result p1
-
- if-nez p1, :cond_6
-
- :goto_1
- return v2
-
- :cond_6
- return v0
-.end method
-
-.method public hashCode()I
- .locals 4
-
- iget-object v0, p0, Lcom/discord/utilities/error/Error$SkemaErrorItem;->code:Ljava/lang/String;
-
- const/16 v1, 0x2b
-
- if-nez v0, :cond_0
-
- const/16 v0, 0x2b
-
- goto :goto_0
-
- :cond_0
- invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
- move-result v0
-
- :goto_0
- const/16 v2, 0x3b
-
- add-int/2addr v0, v2
-
- iget-object v3, p0, Lcom/discord/utilities/error/Error$SkemaErrorItem;->message:Ljava/lang/String;
-
- mul-int/lit8 v0, v0, 0x3b
-
- if-nez v3, :cond_1
-
- goto :goto_1
-
- :cond_1
- invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
-
- move-result v1
-
- :goto_1
- add-int/2addr v0, v1
-
- return v0
-.end method
-
-.method public toString()Ljava/lang/String;
- .locals 3
-
- const-string v0, "Error.SkemaErrorItem(code="
-
- invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- move-result-object v0
-
- iget-object v1, p0, Lcom/discord/utilities/error/Error$SkemaErrorItem;->code:Ljava/lang/String;
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- const-string v1, ", message="
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- iget-object v1, p0, Lcom/discord/utilities/error/Error$SkemaErrorItem;->message:Ljava/lang/String;
-
- const-string v2, ")"
-
- invoke-static {v0, v1, v2}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
- move-result-object v0
-
- return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/utilities/error/Error.smali b/com.discord/smali/com/discord/utilities/error/Error.smali
index addae99141..b78e8ee3af 100644
--- a/com.discord/smali/com/discord/utilities/error/Error.smali
+++ b/com.discord/smali/com/discord/utilities/error/Error.smali
@@ -7,8 +7,6 @@
.annotation system Ldalvik/annotation/MemberClasses;
value = {
Lcom/discord/utilities/error/Error$Response;,
- Lcom/discord/utilities/error/Error$SkemaError;,
- Lcom/discord/utilities/error/Error$SkemaErrorItem;,
Lcom/discord/utilities/error/Error$Type;
}
.end annotation
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali
index 46043986a5..bdb9ab8d44 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali
+++ b/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/1235"
+ const-string v0, "Discord-Android/1236"
return-object v0
.end method
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
index 1dfebd87da..38bcf9e015 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
@@ -480,7 +480,7 @@
new-array v1, v2, [Ljava/lang/Object;
- const-string v3, "35.0"
+ const-string v3, "35.1"
aput-object v3, v1, v5
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
index 5cf9583a65..ea1089dd54 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
@@ -1831,7 +1831,7 @@
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
- const-string v0, " - 35.0 (1235)"
+ const-string v0, " - 35.1 (1236)"
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/f/a/m/a/b.smali b/com.discord/smali/f/a/m/a/b.smali
deleted file mode 100644
index 072c5ac86f..0000000000
--- a/com.discord/smali/f/a/m/a/b.smali
+++ /dev/null
@@ -1,36 +0,0 @@
-.class public final synthetic Lf/a/m/a/b;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
-
-
-# instance fields
-.field public final synthetic a:Lcom/discord/models/domain/Model$JsonReader;
-
-
-# direct methods
-.method public synthetic constructor (Lcom/discord/models/domain/Model$JsonReader;)V
- .locals 0
-
- invoke-direct {p0}, Ljava/lang/Object;->()V
-
- iput-object p1, p0, Lf/a/m/a/b;->a:Lcom/discord/models/domain/Model$JsonReader;
-
- return-void
-.end method
-
-
-# virtual methods
-.method public final get()Ljava/lang/Object;
- .locals 1
-
- iget-object v0, p0, Lf/a/m/a/b;->a:Lcom/discord/models/domain/Model$JsonReader;
-
- invoke-static {v0}, Lcom/discord/utilities/error/Error$SkemaError;->a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/utilities/error/Error$SkemaErrorItem;
-
- move-result-object v0
-
- return-object v0
-.end method