Changes of com.discord v1246

This commit is contained in:
root 2020-08-22 02:33:25 +00:00
parent 2eceb9387f
commit dac0c344e5
65 changed files with 2328 additions and 262 deletions

View file

@ -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/1245"
.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1246"
.field public static final VERSION_CODE:I = 0x4dd
.field public static final VERSION_CODE:I = 0x4de
.field public static final VERSION_NAME:Ljava/lang/String; = "36.4"
.field public static final VERSION_NAME:Ljava/lang/String; = "36.5"
# direct methods

View file

@ -153,15 +153,7 @@
.field public editedTimestamp:Ljava/lang/String;
.field public final editedTimestampMilliseconds:Ljava/util/concurrent/atomic/AtomicReference;
.annotation system Ldalvik/annotation/Signature;
value = {
"Ljava/util/concurrent/atomic/AtomicReference<",
"Ljava/lang/Object;",
">;"
}
.end annotation
.end field
.field public transient editedTimestampMilliseconds:Ljava/lang/Long;
.field public embeds:Ljava/util/List;
.annotation system Ldalvik/annotation/Signature;
@ -254,15 +246,7 @@
.field public timestamp:Ljava/lang/String;
.field public final timestampMilliseconds:Ljava/util/concurrent/atomic/AtomicReference;
.annotation system Ldalvik/annotation/Signature;
value = {
"Ljava/util/concurrent/atomic/AtomicReference<",
"Ljava/lang/Object;",
">;"
}
.end annotation
.end field
.field public transient timestampMilliseconds:Ljava/lang/Long;
.field public tts:Z
@ -315,18 +299,6 @@
iput-object v0, p0, Lcom/discord/models/domain/ModelMessage;->author:Lcom/discord/models/domain/ModelUser;
new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
iput-object v0, p0, Lcom/discord/models/domain/ModelMessage;->timestampMilliseconds:Ljava/util/concurrent/atomic/AtomicReference;
new-instance v0, Ljava/util/concurrent/atomic/AtomicReference;
invoke-direct {v0}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
iput-object v0, p0, Lcom/discord/models/domain/ModelMessage;->editedTimestampMilliseconds:Ljava/util/concurrent/atomic/AtomicReference;
return-void
.end method
@ -393,18 +365,6 @@
iput-object v2, v0, Lcom/discord/models/domain/ModelMessage;->author:Lcom/discord/models/domain/ModelUser;
new-instance v2, Ljava/util/concurrent/atomic/AtomicReference;
invoke-direct {v2}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
iput-object v2, v0, Lcom/discord/models/domain/ModelMessage;->timestampMilliseconds:Ljava/util/concurrent/atomic/AtomicReference;
new-instance v2, Ljava/util/concurrent/atomic/AtomicReference;
invoke-direct {v2}, Ljava/util/concurrent/atomic/AtomicReference;-><init>()V
iput-object v2, v0, Lcom/discord/models/domain/ModelMessage;->editedTimestampMilliseconds:Ljava/util/concurrent/atomic/AtomicReference;
if-eqz v1, :cond_0
move-wide v2, p1
@ -2953,36 +2913,6 @@
return v2
:cond_2f
invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getTimestampMilliseconds()J
move-result-wide v3
invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getTimestampMilliseconds()J
move-result-wide v5
cmp-long v1, v3, v5
if-eqz v1, :cond_30
return v2
:cond_30
invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getEditedTimestampMilliseconds()J
move-result-wide v3
invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getEditedTimestampMilliseconds()J
move-result-wide v5
cmp-long v1, v3, v5
if-eqz v1, :cond_31
return v2
:cond_31
invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getLocalAttachments()Ljava/util/List;
move-result-object v1
@ -2991,23 +2921,23 @@
move-result-object p1
if-nez v1, :cond_32
if-nez v1, :cond_30
if-eqz p1, :cond_33
if-eqz p1, :cond_31
goto :goto_13
:cond_32
:cond_30
invoke-virtual {v1, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
move-result p1
if-nez p1, :cond_33
if-nez p1, :cond_31
:goto_13
return v2
:cond_33
:cond_31
return v0
.end method
@ -3120,34 +3050,7 @@
.method public getEditedTimestamp()J
.locals 2
invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getEditedTimestampMilliseconds()J
move-result-wide v0
return-wide v0
.end method
.method public getEditedTimestampMilliseconds()J
.locals 4
iget-object v0, p0, Lcom/discord/models/domain/ModelMessage;->editedTimestampMilliseconds:Ljava/util/concurrent/atomic/AtomicReference;
invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
move-result-object v0
if-nez v0, :cond_1
iget-object v1, p0, Lcom/discord/models/domain/ModelMessage;->editedTimestampMilliseconds:Ljava/util/concurrent/atomic/AtomicReference;
monitor-enter v1
:try_start_0
iget-object v0, p0, Lcom/discord/models/domain/ModelMessage;->editedTimestampMilliseconds:Ljava/util/concurrent/atomic/AtomicReference;
invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
move-result-object v0
iget-object v0, p0, Lcom/discord/models/domain/ModelMessage;->editedTimestampMilliseconds:Ljava/lang/Long;
if-nez v0, :cond_0
@ -3155,33 +3058,16 @@
invoke-static {v0}, Lcom/discord/utilities/time/TimeUtils;->parseUTCDate(Ljava/lang/String;)J
move-result-wide v2
move-result-wide v0
invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
move-result-object v0
iget-object v2, p0, Lcom/discord/models/domain/ModelMessage;->editedTimestampMilliseconds:Ljava/util/concurrent/atomic/AtomicReference;
invoke-virtual {v2, v0}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
iput-object v0, p0, Lcom/discord/models/domain/ModelMessage;->editedTimestampMilliseconds:Ljava/lang/Long;
:cond_0
monitor-exit v1
goto :goto_0
:catchall_0
move-exception v0
monitor-exit v1
:try_end_0
.catchall {:try_start_0 .. :try_end_0} :catchall_0
throw v0
:cond_1
:goto_0
check-cast v0, Ljava/lang/Long;
iget-object v0, p0, Lcom/discord/models/domain/ModelMessage;->editedTimestampMilliseconds:Ljava/lang/Long;
invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
@ -3190,6 +3076,14 @@
return-wide v0
.end method
.method public getEditedTimestampMilliseconds()Ljava/lang/Long;
.locals 1
iget-object v0, p0, Lcom/discord/models/domain/ModelMessage;->editedTimestampMilliseconds:Ljava/lang/Long;
return-object v0
.end method
.method public getEmbeds()Ljava/util/List;
.locals 1
.annotation system Ldalvik/annotation/Signature;
@ -3394,34 +3288,7 @@
.method public getTimestamp()J
.locals 2
invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getTimestampMilliseconds()J
move-result-wide v0
return-wide v0
.end method
.method public getTimestampMilliseconds()J
.locals 4
iget-object v0, p0, Lcom/discord/models/domain/ModelMessage;->timestampMilliseconds:Ljava/util/concurrent/atomic/AtomicReference;
invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
move-result-object v0
if-nez v0, :cond_1
iget-object v1, p0, Lcom/discord/models/domain/ModelMessage;->timestampMilliseconds:Ljava/util/concurrent/atomic/AtomicReference;
monitor-enter v1
:try_start_0
iget-object v0, p0, Lcom/discord/models/domain/ModelMessage;->timestampMilliseconds:Ljava/util/concurrent/atomic/AtomicReference;
invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicReference;->get()Ljava/lang/Object;
move-result-object v0
iget-object v0, p0, Lcom/discord/models/domain/ModelMessage;->timestampMilliseconds:Ljava/lang/Long;
if-nez v0, :cond_0
@ -3429,33 +3296,16 @@
invoke-static {v0}, Lcom/discord/utilities/time/TimeUtils;->parseUTCDate(Ljava/lang/String;)J
move-result-wide v2
move-result-wide v0
invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
move-result-object v0
iget-object v2, p0, Lcom/discord/models/domain/ModelMessage;->timestampMilliseconds:Ljava/util/concurrent/atomic/AtomicReference;
invoke-virtual {v2, v0}, Ljava/util/concurrent/atomic/AtomicReference;->set(Ljava/lang/Object;)V
iput-object v0, p0, Lcom/discord/models/domain/ModelMessage;->timestampMilliseconds:Ljava/lang/Long;
:cond_0
monitor-exit v1
goto :goto_0
:catchall_0
move-exception v0
monitor-exit v1
:try_end_0
.catchall {:try_start_0 .. :try_end_0} :catchall_0
throw v0
:cond_1
:goto_0
check-cast v0, Ljava/lang/Long;
iget-object v0, p0, Lcom/discord/models/domain/ModelMessage;->timestampMilliseconds:Ljava/lang/Long;
invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
@ -3464,6 +3314,14 @@
return-wide v0
.end method
.method public getTimestampMilliseconds()Ljava/lang/Long;
.locals 1
iget-object v0, p0, Lcom/discord/models/domain/ModelMessage;->timestampMilliseconds:Ljava/lang/Long;
return-object v0
.end method
.method public getType()I
.locals 1
@ -3737,13 +3595,13 @@
mul-int/lit8 v3, v3, 0x3b
ushr-long v7, v5, v2
ushr-long v1, v5, v2
xor-long/2addr v5, v7
xor-long/2addr v1, v5
long-to-int v1, v5
long-to-int v2, v1
add-int/2addr v3, v1
add-int/2addr v3, v2
invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getAttachments()Ljava/util/List;
@ -3791,9 +3649,9 @@
move-result v1
const/16 v5, 0x4f
const/16 v2, 0x4f
const/16 v6, 0x61
const/16 v5, 0x61
if-eqz v1, :cond_7
@ -3838,10 +3696,10 @@
goto :goto_9
:cond_9
const/16 v5, 0x61
const/16 v2, 0x61
:goto_9
add-int/2addr v3, v5
add-int/2addr v3, v2
invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getReactions()Ljava/util/Map;
@ -4063,34 +3921,6 @@
:goto_14
add-int/2addr v3, v1
invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getTimestampMilliseconds()J
move-result-wide v5
mul-int/lit8 v3, v3, 0x3b
ushr-long v7, v5, v2
xor-long/2addr v5, v7
long-to-int v1, v5
add-int/2addr v3, v1
invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getEditedTimestampMilliseconds()J
move-result-wide v5
mul-int/lit8 v3, v3, 0x3b
ushr-long v1, v5, v2
xor-long/2addr v1, v5
long-to-int v2, v1
add-int/2addr v3, v2
invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getLocalAttachments()Ljava/util/List;
move-result-object v1
@ -4557,21 +4387,21 @@
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getTimestampMilliseconds()J
invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getTimestampMilliseconds()Ljava/lang/Long;
move-result-wide v1
move-result-object v1
invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
const-string v1, ", editedTimestampMilliseconds="
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getEditedTimestampMilliseconds()J
invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getEditedTimestampMilliseconds()Ljava/lang/Long;
move-result-wide v1
move-result-object v1
invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
const-string v1, ", stale="

View file

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

View file

@ -177,7 +177,7 @@
const-string v3, "browser_user_agent"
const-string v4, "Discord-Android/1245"
const-string v4, "Discord-Android/1246"
invoke-direct {v2, v3, v4}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
@ -185,7 +185,7 @@
const/4 v1, 0x2
const/16 v2, 0x4dd
const/16 v2, 0x4de
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@ -205,7 +205,7 @@
const-string v3, "client_version"
const-string v4, "36.4"
const-string v4, "36.5"
invoke-direct {v2, v3, v4}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V

View file

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

View file

@ -2156,11 +2156,19 @@
if-nez v3, :cond_4
invoke-virtual {p2}, Lcom/discord/models/domain/ModelMessage;->getTimestampMilliseconds()J
invoke-virtual {p2}, Lcom/discord/models/domain/ModelMessage;->getTimestampMilliseconds()Ljava/lang/Long;
move-result-object v3
invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
move-result-wide v5
invoke-virtual {p3}, Lcom/discord/models/domain/ModelMessage;->getTimestampMilliseconds()J
invoke-virtual {p3}, Lcom/discord/models/domain/ModelMessage;->getTimestampMilliseconds()Ljava/lang/Long;
move-result-object v3
invoke-virtual {v3}, Ljava/lang/Long;->longValue()J
move-result-wide v7

View file

@ -480,7 +480,7 @@
new-array v1, v2, [Ljava/lang/Object;
const-string v3, "36.4"
const-string v3, "36.5"
aput-object v3, v1, v5