Changes of com.discord v1140

This commit is contained in:
root 2020-05-14 23:26:15 +02:00
parent 00e75a24a4
commit 96dc8dff96
16 changed files with 476 additions and 174 deletions

View file

@ -1,5 +1,5 @@
!!brut.androlib.meta.MetaInfo
apkFileName: com.discord-1138.apk
apkFileName: com.discord-1140.apk
compressionType: false
doNotCompress:
- arsc
@ -190,5 +190,5 @@ usesFramework:
tag: null
version: 2.4.1-197d46-SNAPSHOT
versionInfo:
versionCode: '1138'
versionName: '22.1'
versionCode: '1140'
versionName: '22.2'

View file

@ -3,9 +3,9 @@
#
#Do NOT modify, delete, or commit to source control!
#
#Thu May 14 01:04:11 UTC 2020
version_name=22.1
#Thu May 14 20:11:46 UTC 2020
version_name=22.2
package_name=com.discord
build_id=10d6473a-95c1-4688-8ad9-7358c258678d
version_code=1138
build_id=830877a9-75e1-4b78-a4d3-dfa9379741e4
version_code=1140
app_name=com.discord

View file

@ -1057,7 +1057,7 @@ Last month, in response to COVID-19, we upped the Go Live viewer limit from 10 t
<string name="cloud_sync_modal_or">OR</string>
<string name="collapse">Collapse</string>
<string name="collapse_category">Collapse Category</string>
<string name="com.crashlytics.android.build_id">10d6473a-95c1-4688-8ad9-7358c258678d</string>
<string name="com.crashlytics.android.build_id">830877a9-75e1-4b78-a4d3-dfa9379741e4</string>
<string name="coming_soon">Coming Soon</string>
<string name="command_giphy_description">Search Animated GIFs on the Web</string>
<string name="command_me_description">Displays text with emphasis.</string>

View file

@ -40,11 +40,11 @@
.field public static final SAMSUNGxDISCORD_CLIENT_ID:Ljava/lang/String; = "97t47j218f"
.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1138"
.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1140"
.field public static final VERSION_CODE:I = 0x472
.field public static final VERSION_CODE:I = 0x474
.field public static final VERSION_NAME:Ljava/lang/String; = "22.1"
.field public static final VERSION_NAME:Ljava/lang/String; = "22.2"
# direct methods

View file

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

View file

@ -181,7 +181,7 @@
const-string v3, "browser_user_agent"
const-string v4, "Discord-Android/1138"
const-string v4, "Discord-Android/1140"
invoke-direct {v2, v3, v4}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
@ -189,7 +189,7 @@
const/4 v1, 0x2
const/16 v2, 0x472
const/16 v2, 0x474
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@ -205,7 +205,7 @@
const/4 v1, 0x3
const-string v2, "22.1"
const-string v2, "22.2"
const-string v3, ""

View file

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

View file

@ -492,7 +492,7 @@
new-array v1, v2, [Ljava/lang/Object;
const-string v3, "22.1"
const-string v3, "22.2"
aput-object v3, v1, v4

View file

@ -1989,7 +1989,7 @@
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
const-string v0, " - 22.1 (1138)"
const-string v0, " - 22.2 (1140)"
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;

View file

@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
value = Lcom/discord/widgets/user/WidgetUserMentions$Model$Companion;->get(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;)Lrx/Observable;
value = Lcom/discord/widgets/user/WidgetUserMentions$Model$Companion;->get(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;Lcom/discord/widgets/tabs/NavigationTab;)Lrx/Observable;
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
@ -46,26 +46,16 @@
.end annotation
# static fields
.field public static final INSTANCE:Lcom/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1;
# instance fields
.field public final synthetic $selectedTab:Lcom/discord/widgets/tabs/NavigationTab;
# direct methods
.method public static constructor <clinit>()V
.locals 1
new-instance v0, Lcom/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1;
invoke-direct {v0}, Lcom/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1;-><init>()V
sput-object v0, Lcom/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1;
return-void
.end method
.method public constructor <init>()V
.method public constructor <init>(Lcom/discord/widgets/tabs/NavigationTab;)V
.locals 0
iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1;->$selectedTab:Lcom/discord/widgets/tabs/NavigationTab;
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
return-void
@ -393,9 +383,15 @@
move-result v22
const/16 v24, 0x200
move-object/from16 v0, p0
const/16 v25, 0x0
iget-object v3, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1;->$selectedTab:Lcom/discord/widgets/tabs/NavigationTab;
move-object/from16 v24, v3
const/16 v25, 0x200
const/16 v26, 0x0
const-wide/16 v9, -0x1
@ -405,7 +401,7 @@
move-object/from16 v17, v4
invoke-direct/range {v6 .. v25}, Lcom/discord/widgets/user/WidgetUserMentions$Model;-><init>(JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
invoke-direct/range {v6 .. v26}, Lcom/discord/widgets/user/WidgetUserMentions$Model;-><init>(JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;Lcom/discord/widgets/tabs/NavigationTab;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
return-object v1
.end method

View file

@ -33,12 +33,13 @@
# virtual methods
.method public final get(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;)Lrx/Observable;
.locals 13
.method public final get(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;Lcom/discord/widgets/tabs/NavigationTab;)Lrx/Observable;
.locals 15
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
"Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;",
"Lcom/discord/widgets/tabs/NavigationTab;",
")",
"Lrx/Observable<",
"Lcom/discord/widgets/user/WidgetUserMentions$Model;",
@ -46,126 +47,139 @@
}
.end annotation
if-eqz p1, :cond_0
move-object/from16 v0, p2
invoke-virtual {p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->getMentionsLoadingStateSubject()Lrx/subjects/BehaviorSubject;
const/4 v1, 0x0
move-result-object v0
if-eqz p1, :cond_1
sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
if-eqz v0, :cond_0
invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getGuildSelected()Lcom/discord/stores/StoreGuildSelected;
move-result-object p1
invoke-virtual {p1}, Lcom/discord/stores/StoreGuildSelected;->get()Lrx/Observable;
move-result-object v1
sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getChannels()Lcom/discord/stores/StoreChannels;
move-result-object p1
invoke-virtual {p1}, Lcom/discord/stores/StoreChannels;->get()Lrx/Observable;
invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->getMentionsLoadingStateSubject()Lrx/subjects/BehaviorSubject;
move-result-object v2
sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getChannels()Lcom/discord/stores/StoreChannels;
invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getGuildSelected()Lcom/discord/stores/StoreGuildSelected;
move-result-object p1
move-result-object v1
invoke-virtual {p1}, Lcom/discord/stores/StoreChannels;->getNames()Lrx/Observable;
invoke-virtual {v1}, Lcom/discord/stores/StoreGuildSelected;->get()Lrx/Observable;
move-result-object v3
sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getGuilds()Lcom/discord/stores/StoreGuilds;
invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getChannels()Lcom/discord/stores/StoreChannels;
move-result-object p1
move-result-object v1
invoke-virtual {p1}, Lcom/discord/stores/StoreGuilds;->observeGuilds()Lrx/Observable;
invoke-virtual {v1}, Lcom/discord/stores/StoreChannels;->get()Lrx/Observable;
move-result-object v4
sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getGuilds()Lcom/discord/stores/StoreGuilds;
invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getChannels()Lcom/discord/stores/StoreChannels;
move-result-object p1
move-result-object v1
invoke-virtual {p1}, Lcom/discord/stores/StoreGuilds;->observeRoles()Lrx/Observable;
invoke-virtual {v1}, Lcom/discord/stores/StoreChannels;->getNames()Lrx/Observable;
move-result-object v5
sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getGuilds()Lcom/discord/stores/StoreGuilds;
invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getGuilds()Lcom/discord/stores/StoreGuilds;
move-result-object p1
move-result-object v1
invoke-virtual {p1}, Lcom/discord/stores/StoreGuilds;->observeComputed()Lrx/Observable;
invoke-virtual {v1}, Lcom/discord/stores/StoreGuilds;->observeGuilds()Lrx/Observable;
move-result-object v6
sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getUsers()Lcom/discord/stores/StoreUser;
invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getGuilds()Lcom/discord/stores/StoreGuilds;
move-result-object p1
move-result-object v1
invoke-virtual {p1}, Lcom/discord/stores/StoreUser;->observeMeId()Lrx/Observable;
invoke-virtual {v1}, Lcom/discord/stores/StoreGuilds;->observeRoles()Lrx/Observable;
move-result-object v7
sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getGuilds()Lcom/discord/stores/StoreGuilds;
move-result-object p1
move-result-object v1
invoke-virtual {p1}, Lcom/discord/stores/StoreUserSettings;->getAllowAnimatedEmojisObservable()Lrx/Observable;
invoke-virtual {v1}, Lcom/discord/stores/StoreGuilds;->observeComputed()Lrx/Observable;
move-result-object v8
sget-object v9, Lcom/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1;->INSTANCE:Lcom/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1;
sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
const-wide/16 v10, 0x12c
invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getUsers()Lcom/discord/stores/StoreUser;
sget-object v12, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
move-result-object v1
invoke-static/range {v0 .. v12}, Lcom/discord/utilities/rx/ObservableWithLeadingEdgeThrottle;->combineLatest(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func9;JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
invoke-virtual {v1}, Lcom/discord/stores/StoreUser;->observeMeId()Lrx/Observable;
move-result-object p1
move-result-object v9
const-string v0, "ObservableWithLeadingEdg\u2026LISECONDS\n )"
sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
invoke-static {p1, v0}, Ly/v/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
move-result-object v1
move-result-object p1
invoke-virtual {v1}, Lcom/discord/stores/StoreUserSettings;->getAllowAnimatedEmojisObservable()Lrx/Observable;
invoke-virtual {p1}, Lrx/Observable;->a()Lrx/Observable;
move-result-object v10
move-result-object p1
new-instance v11, Lcom/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1;
const-string v0, "ObservableWithLeadingEdg\u2026 .distinctUntilChanged()"
invoke-direct {v11, v0}, Lcom/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1;-><init>(Lcom/discord/widgets/tabs/NavigationTab;)V
invoke-static {p1, v0}, Ly/v/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
const-wide/16 v12, 0x12c
return-object p1
sget-object v14, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
invoke-static/range {v2 .. v14}, Lcom/discord/utilities/rx/ObservableWithLeadingEdgeThrottle;->combineLatest(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func9;JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
move-result-object v0
const-string v1, "ObservableWithLeadingEdg\u2026LISECONDS\n )"
invoke-static {v0, v1}, Ly/v/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
move-result-object v0
invoke-virtual {v0}, Lrx/Observable;->a()Lrx/Observable;
move-result-object v0
const-string v1, "ObservableWithLeadingEdg\u2026 .distinctUntilChanged()"
invoke-static {v0, v1}, Ly/v/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
return-object v0
:cond_0
const-string p1, "messageLoader"
const-string v0, "selectedTab"
invoke-static {p1}, Ly/v/b/j;->a(Ljava/lang/String;)V
invoke-static {v0}, Ly/v/b/j;->a(Ljava/lang/String;)V
const/4 p1, 0x0
throw v1
throw p1
:cond_1
const-string v0, "messageLoader"
invoke-static {v0}, Ly/v/b/j;->a(Ljava/lang/String;)V
throw v1
.end method

View file

@ -26,6 +26,8 @@
.field public interactionState:Lcom/discord/stores/StoreChat$InteractionState;
.field public isFocused:Z
.field public loadBeforeMessageId:Ljava/lang/Long;
.field public loadSubscription:Lrx/Subscription;
@ -444,6 +446,22 @@
throw v0
.end method
.method public final setIsFocused(Z)V
.locals 1
.annotation build Landroidx/annotation/UiThread;
.end annotation
iput-boolean p1, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->isFocused:Z
const/4 p1, 0x0
const/4 v0, 0x1
invoke-static {p0, p1, v0, p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->tryLoad$default(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
return-void
.end method
.method public final tryLoad(Lkotlin/jvm/functions/Function1;)V
.locals 10
.annotation build Landroidx/annotation/UiThread;
@ -500,7 +518,11 @@
const/4 v1, 0x1
if-eq p1, v1, :cond_0
if-ne p1, v1, :cond_2
iget-boolean p1, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->isFocused:Z
if-nez p1, :cond_0
goto :goto_1

View file

@ -76,6 +76,8 @@
.field public final oldestMessageId:J
.field public final selectedTab:Lcom/discord/widgets/tabs/NavigationTab;
.field public final userId:J
@ -94,8 +96,8 @@
return-void
.end method
.method public constructor <init>(JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;)V
.locals 6
.method public constructor <init>(JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;Lcom/discord/widgets/tabs/NavigationTab;)V
.locals 7
.annotation system Ldalvik/annotation/Signature;
value = {
"(JJ",
@ -112,6 +114,7 @@
"Ljava/lang/Long;",
">;JZZ",
"Ljava/lang/String;",
"Lcom/discord/widgets/tabs/NavigationTab;",
")V"
}
.end annotation
@ -124,37 +127,41 @@
move-object/from16 v3, p12
const/4 v4, 0x0
move-object/from16 v4, p18
if-eqz v1, :cond_2
const/4 v5, 0x0
if-eqz v2, :cond_1
if-eqz v1, :cond_3
if-eqz v3, :cond_0
if-eqz v2, :cond_2
if-eqz v3, :cond_1
if-eqz v4, :cond_0
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
move-wide v4, p1
move-wide v5, p1
iput-wide v4, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->userId:J
iput-wide v5, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->userId:J
move-wide v4, p3
move-wide v5, p3
iput-wide v4, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->channelId:J
iput-wide v5, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->channelId:J
move-object v4, p5
move-object v5, p5
iput-object v4, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guild:Lcom/discord/models/domain/ModelGuild;
iput-object v5, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guild:Lcom/discord/models/domain/ModelGuild;
move-wide v4, p6
move-wide v5, p6
iput-wide v4, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guildId:J
iput-wide v5, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guildId:J
iput-object v1, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->channelNames:Ljava/util/Map;
move-wide v4, p9
move-wide/from16 v5, p9
iput-wide v4, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->oldestMessageId:J
iput-wide v5, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->oldestMessageId:J
iput-object v2, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->list:Ljava/util/List;
@ -176,34 +183,43 @@
iput-object v1, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guildName:Ljava/lang/String;
iput-object v4, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->selectedTab:Lcom/discord/widgets/tabs/NavigationTab;
return-void
:cond_0
const-string v1, "selectedTab"
invoke-static {v1}, Ly/v/b/j;->a(Ljava/lang/String;)V
throw v5
:cond_1
const-string v1, "myRoleIds"
invoke-static {v1}, Ly/v/b/j;->a(Ljava/lang/String;)V
throw v4
throw v5
:cond_1
:cond_2
const-string v1, "list"
invoke-static {v1}, Ly/v/b/j;->a(Ljava/lang/String;)V
throw v4
throw v5
:cond_2
:cond_3
const-string v1, "channelNames"
invoke-static {v1}, Ly/v/b/j;->a(Ljava/lang/String;)V
throw v4
throw v5
.end method
.method public synthetic constructor <init>(JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
.locals 19
.method public synthetic constructor <init>(JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;Lcom/discord/widgets/tabs/NavigationTab;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
.locals 20
move/from16 v0, p18
move/from16 v0, p19
and-int/lit16 v0, v0, 0x200
@ -243,17 +259,19 @@
move-object/from16 v18, p17
invoke-direct/range {v1 .. v18}, Lcom/discord/widgets/user/WidgetUserMentions$Model;-><init>(JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;)V
move-object/from16 v19, p18
invoke-direct/range {v1 .. v19}, Lcom/discord/widgets/user/WidgetUserMentions$Model;-><init>(JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;Lcom/discord/widgets/tabs/NavigationTab;)V
return-void
.end method
.method public static synthetic copy$default(Lcom/discord/widgets/user/WidgetUserMentions$Model;JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/user/WidgetUserMentions$Model;
.method public static synthetic copy$default(Lcom/discord/widgets/user/WidgetUserMentions$Model;JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;Lcom/discord/widgets/tabs/NavigationTab;ILjava/lang/Object;)Lcom/discord/widgets/user/WidgetUserMentions$Model;
.locals 16
move-object/from16 v0, p0
move/from16 v1, p18
move/from16 v1, p19
and-int/lit8 v2, v1, 0x1
@ -409,18 +427,32 @@
move/from16 v15, p16
:goto_a
and-int/lit16 v1, v1, 0x800
move/from16 p16, v15
if-eqz v1, :cond_b
and-int/lit16 v15, v1, 0x800
iget-object v1, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guildName:Ljava/lang/String;
if-eqz v15, :cond_b
iget-object v15, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guildName:Ljava/lang/String;
goto :goto_b
:cond_b
move-object/from16 v1, p17
move-object/from16 v15, p17
:goto_b
and-int/lit16 v1, v1, 0x1000
if-eqz v1, :cond_c
iget-object v1, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->selectedTab:Lcom/discord/widgets/tabs/NavigationTab;
goto :goto_c
:cond_c
move-object/from16 v1, p18
:goto_c
move-wide/from16 p1, v2
move-wide/from16 p3, v4
@ -439,11 +471,11 @@
move/from16 p15, v14
move/from16 p16, v15
move-object/from16 p17, v15
move-object/from16 p17, v1
move-object/from16 p18, v1
invoke-virtual/range {p0 .. p17}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->copy(JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;)Lcom/discord/widgets/user/WidgetUserMentions$Model;
invoke-virtual/range {p0 .. p18}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->copy(JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;Lcom/discord/widgets/tabs/NavigationTab;)Lcom/discord/widgets/user/WidgetUserMentions$Model;
move-result-object v0
@ -488,6 +520,14 @@
return-object v0
.end method
.method public final component13()Lcom/discord/widgets/tabs/NavigationTab;
.locals 1
iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->selectedTab:Lcom/discord/widgets/tabs/NavigationTab;
return-object v0
.end method
.method public final component2()J
.locals 2
@ -593,8 +633,8 @@
return-wide v0
.end method
.method public final copy(JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;)Lcom/discord/widgets/user/WidgetUserMentions$Model;
.locals 19
.method public final copy(JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;Lcom/discord/widgets/tabs/NavigationTab;)Lcom/discord/widgets/user/WidgetUserMentions$Model;
.locals 20
.annotation system Ldalvik/annotation/Signature;
value = {
"(JJ",
@ -611,6 +651,7 @@
"Ljava/lang/Long;",
">;JZZ",
"Ljava/lang/String;",
"Lcom/discord/widgets/tabs/NavigationTab;",
")",
"Lcom/discord/widgets/user/WidgetUserMentions$Model;"
}
@ -618,11 +659,13 @@
const/4 v0, 0x0
if-eqz p8, :cond_2
if-eqz p8, :cond_3
if-eqz p11, :cond_1
if-eqz p11, :cond_2
if-eqz p12, :cond_0
if-eqz p12, :cond_1
if-eqz p18, :cond_0
new-instance v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;
@ -652,25 +695,34 @@
move-object/from16 v18, p17
invoke-direct/range {v1 .. v18}, Lcom/discord/widgets/user/WidgetUserMentions$Model;-><init>(JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;)V
move-object/from16 v19, p18
invoke-direct/range {v1 .. v19}, Lcom/discord/widgets/user/WidgetUserMentions$Model;-><init>(JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;Lcom/discord/widgets/tabs/NavigationTab;)V
return-object v0
:cond_0
const-string v1, "myRoleIds"
const-string v1, "selectedTab"
invoke-static {v1}, Ly/v/b/j;->a(Ljava/lang/String;)V
throw v0
:cond_1
const-string v1, "list"
const-string v1, "myRoleIds"
invoke-static {v1}, Ly/v/b/j;->a(Ljava/lang/String;)V
throw v0
:cond_2
const-string v1, "list"
invoke-static {v1}, Ly/v/b/j;->a(Ljava/lang/String;)V
throw v0
:cond_3
const-string v1, "channelNames"
invoke-static {v1}, Ly/v/b/j;->a(Ljava/lang/String;)V
@ -823,7 +875,17 @@
iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guildName:Ljava/lang/String;
iget-object p1, p1, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guildName:Ljava/lang/String;
iget-object v1, p1, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guildName:Ljava/lang/String;
invoke-static {v0, v1}, Ly/v/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
move-result v0
if-eqz v0, :cond_0
iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->selectedTab:Lcom/discord/widgets/tabs/NavigationTab;
iget-object p1, p1, Lcom/discord/widgets/user/WidgetUserMentions$Model;->selectedTab:Lcom/discord/widgets/tabs/NavigationTab;
invoke-static {v0, p1}, Ly/v/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
@ -950,6 +1012,14 @@
return-wide v0
.end method
.method public final getSelectedTab()Lcom/discord/widgets/tabs/NavigationTab;
.locals 1
iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->selectedTab:Lcom/discord/widgets/tabs/NavigationTab;
return-object v0
.end method
.method public getUserId()J
.locals 2
@ -1133,9 +1203,27 @@
invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
move-result v2
move-result v1
goto :goto_4
:cond_6
const/4 v1, 0x0
:goto_4
add-int/2addr v0, v1
mul-int/lit8 v0, v0, 0x1f
iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->selectedTab:Lcom/discord/widgets/tabs/NavigationTab;
if-eqz v1, :cond_7
invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
move-result v2
:cond_7
add-int/2addr v0, v2
return v0
@ -1268,9 +1356,21 @@
iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guildName:Ljava/lang/String;
const-string v2, ")"
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
invoke-static {v0, v1, v2}, Lf/e/b/a/a;->a(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
const-string v1, ", selectedTab="
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->selectedTab:Lcom/discord/widgets/tabs/NavigationTab;
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
const-string v1, ")"
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
move-result-object v0

View file

@ -0,0 +1,120 @@
.class public final Lcom/discord/widgets/user/WidgetUserMentions$observeModel$1;
.super Ljava/lang/Object;
.source "WidgetUserMentions.kt"
# interfaces
.implements Lg0/l/i;
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
value = Lcom/discord/widgets/user/WidgetUserMentions;->observeModel()Lrx/Observable;
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
accessFlags = 0x19
name = null
.end annotation
.annotation system Ldalvik/annotation/Signature;
value = {
"<T:",
"Ljava/lang/Object;",
"R:",
"Ljava/lang/Object;",
">",
"Ljava/lang/Object;",
"Lg0/l/i<",
"TT;",
"Lrx/Observable<",
"+TR;>;>;"
}
.end annotation
# instance fields
.field public final synthetic this$0:Lcom/discord/widgets/user/WidgetUserMentions;
# direct methods
.method public constructor <init>(Lcom/discord/widgets/user/WidgetUserMentions;)V
.locals 0
iput-object p1, p0, Lcom/discord/widgets/user/WidgetUserMentions$observeModel$1;->this$0:Lcom/discord/widgets/user/WidgetUserMentions;
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
return-void
.end method
# virtual methods
.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
.locals 0
check-cast p1, Lcom/discord/widgets/tabs/NavigationTab;
invoke-virtual {p0, p1}, Lcom/discord/widgets/user/WidgetUserMentions$observeModel$1;->call(Lcom/discord/widgets/tabs/NavigationTab;)Lrx/Observable;
move-result-object p1
return-object p1
.end method
.method public final call(Lcom/discord/widgets/tabs/NavigationTab;)Lrx/Observable;
.locals 3
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
"Lcom/discord/widgets/tabs/NavigationTab;",
")",
"Lrx/Observable<",
"Lcom/discord/widgets/user/WidgetUserMentions$Model;",
">;"
}
.end annotation
sget-object v0, Lcom/discord/widgets/tabs/NavigationTab;->MENTIONS:Lcom/discord/widgets/tabs/NavigationTab;
if-ne p1, v0, :cond_0
sget-object v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->Companion:Lcom/discord/widgets/user/WidgetUserMentions$Model$Companion;
iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserMentions$observeModel$1;->this$0:Lcom/discord/widgets/user/WidgetUserMentions;
invoke-static {v1}, Lcom/discord/widgets/user/WidgetUserMentions;->access$getMentionsLoader$p(Lcom/discord/widgets/user/WidgetUserMentions;)Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;
move-result-object v1
invoke-virtual {v0, v1, p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$Companion;->get(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;Lcom/discord/widgets/tabs/NavigationTab;)Lrx/Observable;
move-result-object p1
goto :goto_0
:cond_0
sget-object v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->Companion:Lcom/discord/widgets/user/WidgetUserMentions$Model$Companion;
iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserMentions$observeModel$1;->this$0:Lcom/discord/widgets/user/WidgetUserMentions;
invoke-static {v1}, Lcom/discord/widgets/user/WidgetUserMentions;->access$getMentionsLoader$p(Lcom/discord/widgets/user/WidgetUserMentions;)Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;
move-result-object v1
const-string v2, "selectedTab"
invoke-static {p1, v2}, Ly/v/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
invoke-virtual {v0, v1, p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$Companion;->get(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;Lcom/discord/widgets/tabs/NavigationTab;)Lrx/Observable;
move-result-object p1
const/4 v0, 0x1
invoke-virtual {p1, v0}, Lrx/Observable;->c(I)Lrx/Observable;
move-result-object p1
:goto_0
return-object p1
.end method

View file

@ -175,17 +175,19 @@
.end method
.method private final configureUI(Lcom/discord/widgets/user/WidgetUserMentions$Model;)V
.locals 9
.locals 11
invoke-virtual {p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuildId()J
move-result-wide v0
const-wide/16 v2, 0x0
const/4 v2, 0x1
cmp-long v4, v0, v2
const-wide/16 v3, 0x0
if-lez v4, :cond_0
cmp-long v5, v0, v3
if-lez v5, :cond_0
iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions;->mentionsLoader:Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;
@ -197,14 +199,12 @@
move-result v0
move v4, v0
move v6, v0
goto :goto_0
:cond_0
const/4 v0, 0x1
const/4 v4, 0x1
const/4 v6, 0x1
:goto_0
iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions;->mentionsAdapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
@ -218,57 +218,75 @@
invoke-virtual {v0}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->getFilters()Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;
move-result-object v1
move-result-object v3
invoke-virtual {p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuildId()J
move-result-wide v2
move-result-wide v4
const/4 v5, 0x0
const/4 v6, 0x0
const/16 v7, 0xc
const/4 v7, 0x0
const/4 v8, 0x0
invoke-static/range {v1 .. v8}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;->copy$default(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;JZZZILjava/lang/Object;)Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;
const/16 v9, 0xc
const/4 v10, 0x0
invoke-static/range {v3 .. v10}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;->copy$default(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;JZZZILjava/lang/Object;)Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;
move-result-object v1
invoke-virtual {v0, v1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->setFilters(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$Filters;)V
iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions;->mentionsLoader:Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;
invoke-virtual {p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getSelectedTab()Lcom/discord/widgets/tabs/NavigationTab;
move-result-object v1
sget-object v3, Lcom/discord/widgets/tabs/NavigationTab;->MENTIONS:Lcom/discord/widgets/tabs/NavigationTab;
if-ne v1, v3, :cond_2
goto :goto_1
:cond_2
const/4 v2, 0x0
:goto_1
invoke-virtual {v0, v2}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;->setIsFocused(Z)V
iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions;->tabsFeatureFlag:Lcom/discord/widgets/tabs/TabsFeatureFlag;
invoke-virtual {v0}, Lcom/discord/widgets/tabs/TabsFeatureFlag;->isEnabled()Z
move-result v0
if-eqz v0, :cond_2
if-eqz v0, :cond_3
invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserMentions;->isOnMentionsTab()Z
move-result v0
if-eqz v0, :cond_3
if-eqz v0, :cond_4
:cond_2
:cond_3
invoke-virtual {p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuildName()Ljava/lang/String;
move-result-object v0
invoke-direct {p0, v0}, Lcom/discord/widgets/user/WidgetUserMentions;->configureToolbar(Ljava/lang/String;)V
:cond_3
:cond_4
iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions;->viewModel:Lcom/discord/widgets/user/WidgetUserMentionsViewModel;
if-eqz v0, :cond_4
if-eqz v0, :cond_5
invoke-virtual {v0, p1}, Lcom/discord/widgets/user/WidgetUserMentionsViewModel;->setModel$app_productionDiscordExternalRelease(Lcom/discord/widgets/user/WidgetUserMentions$Model;)V
return-void
:cond_4
:cond_5
const-string p1, "viewModel"
invoke-static {p1}, Ly/v/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
@ -359,6 +377,42 @@
return v0
.end method
.method private final observeModel()Lrx/Observable;
.locals 2
.annotation system Ldalvik/annotation/Signature;
value = {
"()",
"Lrx/Observable<",
"Lcom/discord/widgets/user/WidgetUserMentions$Model;",
">;"
}
.end annotation
sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getTabsNavigation()Lcom/discord/stores/StoreTabsNavigation;
move-result-object v0
invoke-virtual {v0}, Lcom/discord/stores/StoreTabsNavigation;->observeSelectedTab()Lrx/Observable;
move-result-object v0
new-instance v1, Lcom/discord/widgets/user/WidgetUserMentions$observeModel$1;
invoke-direct {v1, p0}, Lcom/discord/widgets/user/WidgetUserMentions$observeModel$1;-><init>(Lcom/discord/widgets/user/WidgetUserMentions;)V
invoke-virtual {v0, v1}, Lrx/Observable;->k(Lg0/l/i;)Lrx/Observable;
move-result-object v0
const-string v1, "StoreStream.getTabsNavig\u2026(1)\n }\n }"
invoke-static {v0, v1}, Ly/v/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
return-object v0
.end method
# virtual methods
.method public getContentViewResId()I
@ -568,11 +622,7 @@
invoke-super {p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
sget-object v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->Companion:Lcom/discord/widgets/user/WidgetUserMentions$Model$Companion;
iget-object v1, p0, Lcom/discord/widgets/user/WidgetUserMentions;->mentionsLoader:Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;
invoke-virtual {v0, v1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$Companion;->get(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader;)Lrx/Observable;
invoke-direct {p0}, Lcom/discord/widgets/user/WidgetUserMentions;->observeModel()Lrx/Observable;
move-result-object v0