Changes of com.discord v1054

This commit is contained in:
root 2020-03-05 00:10:59 +01:00
parent 10499d975a
commit e897ccb56d
32 changed files with 336 additions and 386 deletions

View File

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

View File

@ -3,9 +3,9 @@
#
#Do NOT modify, delete, or commit to source control!
#
#Tue Mar 03 23:15:58 UTC 2020
version_name=12.2
#Wed Mar 04 21:32:06 UTC 2020
version_name=12.3
package_name=com.discord
build_id=ad43b0a6-4dda-4a80-8203-6ac9e3cf5591
version_code=1053
build_id=9aa4e452-3d7f-4eb0-bcf3-46d97b95a2b0
version_code=1054
app_name=com.discord

View File

@ -1008,7 +1008,7 @@ Fixes and Updates {fixed}
<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">ad43b0a6-4dda-4a80-8203-6ac9e3cf5591</string>
<string name="com.crashlytics.android.build_id">9aa4e452-3d7f-4eb0-bcf3-46d97b95a2b0</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

@ -38,11 +38,11 @@
.field public static final SAMSUNGxDISCORD_CLIENT_ID:Ljava/lang/String; = "97t47j218f"
.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1053"
.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1054"
.field public static final VERSION_CODE:I = 0x41d
.field public static final VERSION_CODE:I = 0x41e
.field public static final VERSION_NAME:Ljava/lang/String; = "12.2"
.field public static final VERSION_NAME:Ljava/lang/String; = "12.3"
# direct methods

View File

@ -28,7 +28,7 @@
invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
const/16 v0, 0x41d
const/16 v0, 0x41e
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/1053"
const-string v4, "Discord-Android/1054"
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, 0x41d
const/16 v2, 0x41e
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@ -201,7 +201,7 @@
const/4 v1, 0x3
const-string v2, "12.2"
const-string v2, "12.3"
const-string v3, ""

View File

@ -2207,6 +2207,66 @@
throw v1
.end method
.method public static final openModal(Ljava/lang/String;Ljava/lang/String;)V
.locals 5
const/4 v0, 0x0
if-eqz p0, :cond_1
if-eqz p1, :cond_0
sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
const/4 v1, 0x2
new-array v1, v1, [Lkotlin/Pair;
const/4 v2, 0x0
new-instance v3, Lkotlin/Pair;
const-string v4, "location_section"
invoke-direct {v3, v4, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
aput-object v3, v1, v2
const/4 p1, 0x1
new-instance v2, Lkotlin/Pair;
const-string v3, "type"
invoke-direct {v2, v3, p0}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
aput-object v2, v1, p1
invoke-static {v1}, Lw/q/l;->mapOf([Lkotlin/Pair;)Ljava/util/Map;
move-result-object p0
const-string p1, "open_modal"
invoke-virtual {v0, p1, p0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
return-void
:cond_0
const-string p0, "location"
invoke-static {p0}, Lw/u/b/j;->a(Ljava/lang/String;)V
throw v0
:cond_1
const-string p0, "modalName"
invoke-static {p0}, Lw/u/b/j;->a(Ljava/lang/String;)V
throw v0
.end method
.method public static synthetic openUserSheet$default(Lcom/discord/utilities/analytics/AnalyticsTracker;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)V
.locals 1
@ -5626,66 +5686,6 @@
throw v0
.end method
.method public final openModal(Ljava/lang/String;Ljava/lang/String;)V
.locals 5
const/4 v0, 0x0
if-eqz p1, :cond_1
if-eqz p2, :cond_0
sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
const/4 v1, 0x2
new-array v1, v1, [Lkotlin/Pair;
const/4 v2, 0x0
new-instance v3, Lkotlin/Pair;
const-string v4, "location_section"
invoke-direct {v3, v4, p2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
aput-object v3, v1, v2
const/4 p2, 0x1
new-instance v2, Lkotlin/Pair;
const-string v3, "type"
invoke-direct {v2, v3, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
aput-object v2, v1, p2
invoke-static {v1}, Lw/q/l;->mapOf([Lkotlin/Pair;)Ljava/util/Map;
move-result-object p1
const-string p2, "open_modal"
invoke-virtual {v0, p2, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
return-void
:cond_0
const-string p1, "location"
invoke-static {p1}, Lw/u/b/j;->a(Ljava/lang/String;)V
throw v0
:cond_1
const-string p1, "modalName"
invoke-static {p1}, Lw/u/b/j;->a(Ljava/lang/String;)V
throw v0
.end method
.method public final openUserSheet(Ljava/lang/String;Ljava/lang/String;)V
.locals 2

View File

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

View File

@ -42,11 +42,9 @@
if-eqz p4, :cond_0
sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
const-string v0, "DM Group Add"
const-string v1, "DM Group Add"
invoke-virtual {v0, v1, p4}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
invoke-static {v0, p4}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
sget-object p4, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
@ -96,7 +94,7 @@
.end method
.method public final launch(Landroid/content/Context;Ljava/lang/String;)V
.locals 3
.locals 2
const/4 v0, 0x0
@ -104,11 +102,9 @@
if-eqz p2, :cond_0
sget-object v1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
const-string v1, "DM Group Create"
const-string v2, "DM Group Create"
invoke-virtual {v1, v2, p2}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
invoke-static {v1, p2}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
const-class p2, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;

View File

@ -70,7 +70,7 @@
# virtual methods
.method public final call(Ljava/util/Map;Ljava/lang/Long;Ljava/util/Map;Ljava/util/Map;Ljava/lang/Integer;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/widgets/channels/list/WidgetChannelListModel;
.locals 14
.locals 15
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
@ -107,7 +107,7 @@
move-object/from16 v2, p7
invoke-interface {p1}, Ljava/util/Map;->values()Ljava/util/Collection;
invoke-interface/range {p1 .. p1}, Ljava/util/Map;->values()Ljava/util/Collection;
move-result-object v3
@ -330,7 +330,7 @@
const-wide/16 v9, 0x0
move-object p1, v1
move-object/from16 p1, v1
move-wide/from16 p2, v7
@ -342,9 +342,9 @@
invoke-direct/range {p1 .. p7}, Lcom/discord/widgets/channels/list/items/ChannelListItemHeader;-><init>(JIZJ)V
sget-object v2, Lcom/discord/widgets/tabs/TabsFeatureFlag;->Companion:Lcom/discord/widgets/tabs/TabsFeatureFlag$Companion;
sget-object v2, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->Companion:Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion;
invoke-virtual {v2}, Lcom/discord/widgets/tabs/TabsFeatureFlag$Companion;->getINSTANCE()Lcom/discord/widgets/tabs/TabsFeatureFlag;
invoke-virtual {v2}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion;->getTabsFeatureFlag()Lcom/discord/widgets/tabs/TabsFeatureFlag;
move-result-object v2
@ -363,7 +363,7 @@
move-result-object v0
:goto_7
move-object v6, v0
move-object v9, v0
goto :goto_8
@ -400,25 +400,47 @@
goto :goto_7
:goto_8
new-instance v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;
sget-object v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->Companion:Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion;
const/4 v5, 0x0
invoke-virtual {v0}, Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion;->getTabsFeatureFlag()Lcom/discord/widgets/tabs/TabsFeatureFlag;
const/4 v7, 0x0
move-result-object v0
const/4 v8, 0x0
invoke-virtual {v0}, Lcom/discord/widgets/tabs/TabsFeatureFlag;->isEnabled()Z
move-result v0
if-eqz v0, :cond_a
invoke-interface {v3}, Ljava/util/List;->isEmpty()Z
move-result v9
move-result v0
const/16 v10, 0xc
if-eqz v0, :cond_a
const/4 v12, 0x1
goto :goto_9
:cond_a
const/4 v12, 0x0
:goto_9
new-instance v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;
const/4 v8, 0x0
const/4 v10, 0x0
const/4 v11, 0x0
move-object v4, v0
const/16 v13, 0xc
invoke-direct/range {v4 .. v11}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;-><init>(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
const/4 v14, 0x0
move-object v7, v0
invoke-direct/range {v7 .. v14}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;-><init>(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
return-object v0
.end method

View File

@ -945,3 +945,13 @@
return-object v0
.end method
.method public final getTabsFeatureFlag()Lcom/discord/widgets/tabs/TabsFeatureFlag;
.locals 1
invoke-static {}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->access$getTabsFeatureFlag$cp()Lcom/discord/widgets/tabs/TabsFeatureFlag;
move-result-object v0
return-object v0
.end method

View File

@ -15,6 +15,8 @@
# static fields
.field public static final Companion:Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion;
.field public static final tabsFeatureFlag:Lcom/discord/widgets/tabs/TabsFeatureFlag;
# instance fields
.field public final isGuildSelected:Z
@ -48,6 +50,14 @@
sput-object v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->Companion:Lcom/discord/widgets/channels/list/WidgetChannelListModel$Companion;
sget-object v0, Lcom/discord/widgets/tabs/TabsFeatureFlag;->Companion:Lcom/discord/widgets/tabs/TabsFeatureFlag$Companion;
invoke-virtual {v0}, Lcom/discord/widgets/tabs/TabsFeatureFlag$Companion;->getINSTANCE()Lcom/discord/widgets/tabs/TabsFeatureFlag;
move-result-object v0
sput-object v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->tabsFeatureFlag:Lcom/discord/widgets/tabs/TabsFeatureFlag;
return-void
.end method
@ -142,6 +152,14 @@
return-void
.end method
.method public static final synthetic access$getTabsFeatureFlag$cp()Lcom/discord/widgets/tabs/TabsFeatureFlag;
.locals 1
sget-object v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->tabsFeatureFlag:Lcom/discord/widgets/tabs/TabsFeatureFlag;
return-object v0
.end method
.method public static synthetic copy$default(Lcom/discord/widgets/channels/list/WidgetChannelListModel;Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZZILjava/lang/Object;)Lcom/discord/widgets/channels/list/WidgetChannelListModel;
.locals 3

View File

@ -979,7 +979,7 @@
const/4 v2, 0x0
:goto_1
invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsList()Landroidx/recyclerview/widget/RecyclerView;
invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getEmptyFriendsStateView()Lcom/discord/widgets/friends/EmptyFriendsStateView;
move-result-object v5
@ -987,8 +987,6 @@
move-result v6
xor-int/2addr v6, v3
const/16 v7, 0x8
if-eqz v6, :cond_2
@ -1003,7 +1001,7 @@
:goto_2
invoke-virtual {v5, v6}, Landroid/view/View;->setVisibility(I)V
invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getEmptyFriendsStateView()Lcom/discord/widgets/friends/EmptyFriendsStateView;
invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsList()Landroidx/recyclerview/widget/RecyclerView;
move-result-object v5
@ -1013,15 +1011,15 @@
if-eqz v6, :cond_3
const/4 v6, 0x0
const/4 v6, 0x4
goto :goto_3
:cond_3
const/16 v6, 0x8
const/4 v6, 0x0
:goto_3
invoke-virtual {v5, v6}, Landroid/view/View;->setVisibility(I)V
invoke-virtual {v5, v6}, Landroid/view/ViewGroup;->setVisibility(I)V
iget-object v5, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->selectedGuildId:Ljava/lang/Long;

View File

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

View File

@ -163,7 +163,7 @@
.end method
.method public final show(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;)V
.locals 2
.locals 1
const/4 v0, 0x0
@ -171,11 +171,9 @@
if-eqz p3, :cond_0
sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
const-string v0, "Add Friend Modal"
const-string v1, "Add Friend Modal"
invoke-virtual {v0, v1, p3}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
invoke-static {v0, p3}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
new-instance p3, Landroid/content/Intent;

View File

@ -34,17 +34,15 @@
# virtual methods
.method public final show(Landroidx/fragment/app/FragmentManager;)V
.locals 3
.locals 2
if-eqz p1, :cond_0
sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
const-string v0, "Create Guild"
const-string v1, "Create Guild"
const-string v1, "Guild List"
const-string v2, "Guild List"
invoke-virtual {v0, v1, v2}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
invoke-static {v0, v1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
new-instance v0, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsAdd;

View File

@ -71,13 +71,11 @@
if-eqz p1, :cond_0
sget-object p1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2;->$source:Ljava/lang/String;
iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2;->$source:Ljava/lang/String;
const-string v0, "Instant Invite Modal"
const-string v1, "Instant Invite Modal"
invoke-virtual {p1, v1, v0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
invoke-static {v0, p1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$2;->$context:Landroid/content/Context;

View File

@ -74,7 +74,7 @@
.end method
.method public final invoke(Lkotlin/Pair;)V
.locals 4
.locals 3
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
@ -100,13 +100,11 @@
check-cast p1, Ljava/util/List;
sget-object v1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$3;->$source:Ljava/lang/String;
iget-object v2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion$launch$3;->$source:Ljava/lang/String;
const-string v2, "Instant Invite Modal"
const-string v3, "Instant Invite Modal"
invoke-virtual {v1, v3, v2}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
invoke-static {v2, v1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
invoke-interface {p1}, Ljava/util/List;->isEmpty()Z

View File

@ -34,7 +34,7 @@
# virtual methods
.method public final show(Landroid/content/Context;Ljava/lang/String;)V
.locals 3
.locals 2
const/4 v0, 0x0
@ -42,11 +42,9 @@
if-eqz p2, :cond_0
sget-object v1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
const-string v1, "Join Guild"
const-string v2, "Join Guild"
invoke-virtual {v1, v2, p2}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
invoke-static {v1, p2}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
const-class p2, Lcom/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton;

View File

@ -3,7 +3,7 @@
.source "LeftDrawerManager.kt"
# interfaces
.implements Le0/l/i;
.implements Lrx/functions/Func2;
# annotations
@ -18,38 +18,30 @@
.annotation system Ldalvik/annotation/Signature;
value = {
"<T:",
"<T1:",
"Ljava/lang/Object;",
"T2:",
"Ljava/lang/Object;",
"R:",
"Ljava/lang/Object;",
">",
"Ljava/lang/Object;",
"Le0/l/i<",
"TT;TR;>;"
"Lrx/functions/Func2<",
"TT1;TT2;TR;>;"
}
.end annotation
# static fields
.field public static final INSTANCE:Lcom/discord/widgets/main/LeftDrawerManager$observeShouldLockOpen$1;
# instance fields
.field public final synthetic this$0:Lcom/discord/widgets/main/LeftDrawerManager;
# direct methods
.method public static constructor <clinit>()V
.locals 1
new-instance v0, Lcom/discord/widgets/main/LeftDrawerManager$observeShouldLockOpen$1;
invoke-direct {v0}, Lcom/discord/widgets/main/LeftDrawerManager$observeShouldLockOpen$1;-><init>()V
sput-object v0, Lcom/discord/widgets/main/LeftDrawerManager$observeShouldLockOpen$1;->INSTANCE:Lcom/discord/widgets/main/LeftDrawerManager$observeShouldLockOpen$1;
return-void
.end method
.method public constructor <init>()V
.method public constructor <init>(Lcom/discord/widgets/main/LeftDrawerManager;)V
.locals 0
iput-object p1, p0, Lcom/discord/widgets/main/LeftDrawerManager$observeShouldLockOpen$1;->this$0:Lcom/discord/widgets/main/LeftDrawerManager;
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
return-void
@ -57,37 +49,113 @@
# virtual methods
.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
.locals 0
check-cast p1, Ljava/util/Map;
check-cast p1, Ljava/lang/Long;
invoke-virtual {p0, p1}, Lcom/discord/widgets/main/LeftDrawerManager$observeShouldLockOpen$1;->call(Ljava/util/Map;)Ljava/util/Collection;
check-cast p2, Ljava/lang/Long;
invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/main/LeftDrawerManager$observeShouldLockOpen$1;->call(Ljava/lang/Long;Ljava/lang/Long;)Z
move-result p1
invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
move-result-object p1
return-object p1
.end method
.method public final call(Ljava/util/Map;)Ljava/util/Collection;
.locals 0
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
"Ljava/util/Map<",
"Ljava/lang/Long;",
"+",
"Lcom/discord/models/domain/ModelChannel;",
">;)",
"Ljava/util/Collection<",
"Lcom/discord/models/domain/ModelChannel;",
">;"
}
.end annotation
.method public final call(Ljava/lang/Long;Ljava/lang/Long;)Z
.locals 8
invoke-interface {p1}, Ljava/util/Map;->values()Ljava/util/Collection;
const-wide/16 v0, 0x0
move-result-object p1
const/4 v2, 0x0
return-object p1
const/4 v3, 0x1
if-nez p1, :cond_0
goto :goto_0
:cond_0
invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
move-result-wide v4
cmp-long v6, v4, v0
if-eqz v6, :cond_2
:goto_0
const-wide/16 v4, -0x1
if-nez p1, :cond_1
goto :goto_1
:cond_1
invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
move-result-wide v6
cmp-long p1, v6, v4
if-eqz p1, :cond_2
:goto_1
const/4 p1, 0x1
goto :goto_2
:cond_2
const/4 p1, 0x0
:goto_2
if-nez p2, :cond_3
goto :goto_3
:cond_3
invoke-virtual {p2}, Ljava/lang/Long;->longValue()J
move-result-wide v4
cmp-long p2, v4, v0
if-eqz p2, :cond_4
:goto_3
const/4 p2, 0x1
goto :goto_4
:cond_4
const/4 p2, 0x0
:goto_4
xor-int/2addr p1, v3
iget-object v0, p0, Lcom/discord/widgets/main/LeftDrawerManager$observeShouldLockOpen$1;->this$0:Lcom/discord/widgets/main/LeftDrawerManager;
invoke-static {v0}, Lcom/discord/widgets/main/LeftDrawerManager;->access$getTabsFeatureFlag$p(Lcom/discord/widgets/main/LeftDrawerManager;)Lcom/discord/widgets/tabs/TabsFeatureFlag;
move-result-object v0
invoke-virtual {v0}, Lcom/discord/widgets/tabs/TabsFeatureFlag;->isEnabled()Z
move-result v0
if-eqz v0, :cond_5
if-nez p2, :cond_5
if-eqz p1, :cond_5
const/4 v2, 0x1
:cond_5
return v2
.end method

View File

@ -1,156 +0,0 @@
.class public final Lcom/discord/widgets/main/LeftDrawerManager$observeShouldLockOpen$2;
.super Ljava/lang/Object;
.source "LeftDrawerManager.kt"
# interfaces
.implements Lrx/functions/Func2;
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
value = Lcom/discord/widgets/main/LeftDrawerManager;->observeShouldLockOpen()Lrx/Observable;
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
accessFlags = 0x19
name = null
.end annotation
.annotation system Ldalvik/annotation/Signature;
value = {
"<T1:",
"Ljava/lang/Object;",
"T2:",
"Ljava/lang/Object;",
"R:",
"Ljava/lang/Object;",
">",
"Ljava/lang/Object;",
"Lrx/functions/Func2<",
"TT1;TT2;TR;>;"
}
.end annotation
# instance fields
.field public final synthetic this$0:Lcom/discord/widgets/main/LeftDrawerManager;
# direct methods
.method public constructor <init>(Lcom/discord/widgets/main/LeftDrawerManager;)V
.locals 0
iput-object p1, p0, Lcom/discord/widgets/main/LeftDrawerManager$observeShouldLockOpen$2;->this$0:Lcom/discord/widgets/main/LeftDrawerManager;
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;)Ljava/lang/Object;
.locals 0
check-cast p1, Ljava/util/Collection;
check-cast p2, Ljava/lang/Long;
invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/main/LeftDrawerManager$observeShouldLockOpen$2;->call(Ljava/util/Collection;Ljava/lang/Long;)Z
move-result p1
invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
move-result-object p1
return-object p1
.end method
.method public final call(Ljava/util/Collection;Ljava/lang/Long;)Z
.locals 7
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
"Ljava/util/Collection<",
"+",
"Lcom/discord/models/domain/ModelChannel;",
">;",
"Ljava/lang/Long;",
")Z"
}
.end annotation
const/4 v0, 0x1
const/4 v1, 0x0
if-nez p2, :cond_0
goto :goto_0
:cond_0
invoke-virtual {p2}, Ljava/lang/Long;->longValue()J
move-result-wide v2
const-wide/16 v4, 0x0
cmp-long v6, v2, v4
if-eqz v6, :cond_2
:goto_0
const-wide/16 v2, -0x1
if-nez p2, :cond_1
goto :goto_1
:cond_1
invoke-virtual {p2}, Ljava/lang/Long;->longValue()J
move-result-wide v4
cmp-long p2, v4, v2
if-eqz p2, :cond_2
:goto_1
const/4 p2, 0x1
goto :goto_2
:cond_2
const/4 p2, 0x0
:goto_2
invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
move-result p1
if-nez p1, :cond_4
iget-object p1, p0, Lcom/discord/widgets/main/LeftDrawerManager$observeShouldLockOpen$2;->this$0:Lcom/discord/widgets/main/LeftDrawerManager;
invoke-static {p1}, Lcom/discord/widgets/main/LeftDrawerManager;->access$getTabsFeatureFlag$p(Lcom/discord/widgets/main/LeftDrawerManager;)Lcom/discord/widgets/tabs/TabsFeatureFlag;
move-result-object p1
invoke-virtual {p1}, Lcom/discord/widgets/tabs/TabsFeatureFlag;->isEnabled()Z
move-result p1
if-eqz p1, :cond_3
if-nez p2, :cond_3
goto :goto_3
:cond_3
const/4 v0, 0x0
:cond_4
:goto_3
return v0
.end method

View File

@ -4,10 +4,10 @@
# instance fields
.field public final storeChannels:Lcom/discord/stores/StoreChannels;
.field public final storeChannelsSelected:Lcom/discord/stores/StoreChannelsSelected;
.field public final storeGuildSelected:Lcom/discord/stores/StoreGuildSelected;
.field public final tabsFeatureFlag:Lcom/discord/widgets/tabs/TabsFeatureFlag;
@ -27,12 +27,12 @@
move-object v0, p0
invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/main/LeftDrawerManager;-><init>(Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/widgets/tabs/TabsFeatureFlag;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/main/LeftDrawerManager;-><init>(Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreGuildSelected;Lcom/discord/widgets/tabs/TabsFeatureFlag;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
return-void
.end method
.method public constructor <init>(Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/widgets/tabs/TabsFeatureFlag;)V
.method public constructor <init>(Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreGuildSelected;Lcom/discord/widgets/tabs/TabsFeatureFlag;)V
.locals 1
const/4 v0, 0x0
@ -45,9 +45,9 @@
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
iput-object p1, p0, Lcom/discord/widgets/main/LeftDrawerManager;->storeChannels:Lcom/discord/stores/StoreChannels;
iput-object p1, p0, Lcom/discord/widgets/main/LeftDrawerManager;->storeChannelsSelected:Lcom/discord/stores/StoreChannelsSelected;
iput-object p2, p0, Lcom/discord/widgets/main/LeftDrawerManager;->storeChannelsSelected:Lcom/discord/stores/StoreChannelsSelected;
iput-object p2, p0, Lcom/discord/widgets/main/LeftDrawerManager;->storeGuildSelected:Lcom/discord/stores/StoreGuildSelected;
iput-object p3, p0, Lcom/discord/widgets/main/LeftDrawerManager;->tabsFeatureFlag:Lcom/discord/widgets/tabs/TabsFeatureFlag;
@ -61,21 +61,21 @@
throw v0
:cond_1
const-string p1, "storeChannelsSelected"
const-string p1, "storeGuildSelected"
invoke-static {p1}, Lw/u/b/j;->a(Ljava/lang/String;)V
throw v0
:cond_2
const-string p1, "storeChannels"
const-string p1, "storeChannelsSelected"
invoke-static {p1}, Lw/u/b/j;->a(Ljava/lang/String;)V
throw v0
.end method
.method public synthetic constructor <init>(Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/widgets/tabs/TabsFeatureFlag;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
.method public synthetic constructor <init>(Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreGuildSelected;Lcom/discord/widgets/tabs/TabsFeatureFlag;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
.locals 0
and-int/lit8 p5, p4, 0x1
@ -84,7 +84,7 @@
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;
invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getChannelsSelected()Lcom/discord/stores/StoreChannelsSelected;
move-result-object p1
@ -95,7 +95,7 @@
sget-object p2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
invoke-virtual {p2}, Lcom/discord/stores/StoreStream$Companion;->getChannelsSelected()Lcom/discord/stores/StoreChannelsSelected;
invoke-virtual {p2}, Lcom/discord/stores/StoreStream$Companion;->getGuildSelected()Lcom/discord/stores/StoreGuildSelected;
move-result-object p2
@ -111,7 +111,7 @@
move-result-object p3
:cond_2
invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/main/LeftDrawerManager;-><init>(Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/widgets/tabs/TabsFeatureFlag;)V
invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/main/LeftDrawerManager;-><init>(Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreGuildSelected;Lcom/discord/widgets/tabs/TabsFeatureFlag;)V
return-void
.end method
@ -137,27 +137,21 @@
}
.end annotation
iget-object v0, p0, Lcom/discord/widgets/main/LeftDrawerManager;->storeChannels:Lcom/discord/stores/StoreChannels;
iget-object v0, p0, Lcom/discord/widgets/main/LeftDrawerManager;->storeChannelsSelected:Lcom/discord/stores/StoreChannelsSelected;
invoke-virtual {v0}, Lcom/discord/stores/StoreChannels;->get()Lrx/Observable;
invoke-virtual {v0}, Lcom/discord/stores/StoreChannelsSelected;->getId()Lrx/Observable;
move-result-object v0
sget-object v1, Lcom/discord/widgets/main/LeftDrawerManager$observeShouldLockOpen$1;->INSTANCE:Lcom/discord/widgets/main/LeftDrawerManager$observeShouldLockOpen$1;
iget-object v1, p0, Lcom/discord/widgets/main/LeftDrawerManager;->storeGuildSelected:Lcom/discord/stores/StoreGuildSelected;
invoke-virtual {v0, v1}, Lrx/Observable;->f(Le0/l/i;)Lrx/Observable;
move-result-object v0
iget-object v1, p0, Lcom/discord/widgets/main/LeftDrawerManager;->storeChannelsSelected:Lcom/discord/stores/StoreChannelsSelected;
invoke-virtual {v1}, Lcom/discord/stores/StoreChannelsSelected;->getId()Lrx/Observable;
invoke-virtual {v1}, Lcom/discord/stores/StoreGuildSelected;->getId()Lrx/Observable;
move-result-object v1
new-instance v2, Lcom/discord/widgets/main/LeftDrawerManager$observeShouldLockOpen$2;
new-instance v2, Lcom/discord/widgets/main/LeftDrawerManager$observeShouldLockOpen$1;
invoke-direct {v2, p0}, Lcom/discord/widgets/main/LeftDrawerManager$observeShouldLockOpen$2;-><init>(Lcom/discord/widgets/main/LeftDrawerManager;)V
invoke-direct {v2, p0}, Lcom/discord/widgets/main/LeftDrawerManager$observeShouldLockOpen$1;-><init>(Lcom/discord/widgets/main/LeftDrawerManager;)V
invoke-static {v0, v1, v2}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;

View File

@ -542,7 +542,7 @@
move-object v1, v0
invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/main/LeftDrawerManager;-><init>(Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/widgets/tabs/TabsFeatureFlag;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/main/LeftDrawerManager;-><init>(Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreGuildSelected;Lcom/discord/widgets/tabs/TabsFeatureFlag;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
iput-object v0, p0, Lcom/discord/widgets/main/WidgetMain;->leftDrawerManager:Lcom/discord/widgets/main/LeftDrawerManager;

View File

@ -196,7 +196,7 @@
const-string v4, "toggle"
if-eqz v2, :cond_4
if-eqz v2, :cond_5
invoke-virtual {v2, v0}, Lcom/discord/widgets/main/WidgetMainDrawerLayout$LockableActionBarDrawerToggle;->setIsLeftDrawerLockedOpen(Z)V
@ -204,28 +204,32 @@
invoke-virtual {p0, p1, v0}, Landroidx/drawerlayout/widget/DrawerLayout;->setDrawerLockMode(II)V
if-ne p1, v1, :cond_3
if-eq p1, v1, :cond_2
invoke-virtual {p0, v0}, Landroidx/drawerlayout/widget/DrawerLayout;->isDrawerOpen(I)Z
move-result p1
if-eqz p1, :cond_3
:cond_2
iget-object p1, p0, Lcom/discord/widgets/main/WidgetMainDrawerLayout;->toggle:Lcom/discord/widgets/main/WidgetMainDrawerLayout$LockableActionBarDrawerToggle;
if-eqz p1, :cond_2
if-eqz p1, :cond_4
const/high16 v0, 0x3f800000 # 1.0f
invoke-virtual {p1, v0}, Lcom/discord/widgets/main/WidgetMainDrawerLayout$LockableActionBarDrawerToggle;->onLeftDrawerSlide(F)V
goto :goto_1
:cond_3
return-void
:cond_2
:cond_4
invoke-static {v4}, Lw/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
throw v3
:cond_3
:goto_1
return-void
:cond_4
:cond_5
invoke-static {v4}, Lw/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
throw v3

View File

@ -48,7 +48,7 @@
const-string v3, "helpChip"
const-string v4, "getHelpChip()Landroidx/cardview/widget/CardView;"
const-string v4, "getHelpChip()Lcom/google/android/material/chip/Chip;"
invoke-direct {v1, v2, v3, v4}, Lw/u/b/u;-><init>(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
@ -129,7 +129,7 @@
return-object p0
.end method
.method private final getHelpChip()Landroidx/cardview/widget/CardView;
.method private final getHelpChip()Lcom/google/android/material/chip/Chip;
.locals 3
iget-object v0, p0, Lcom/discord/widgets/media/WidgetQRScanner;->helpChip$delegate:Lkotlin/properties/ReadOnlyProperty;
@ -144,7 +144,7 @@
move-result-object v0
check-cast v0, Landroidx/cardview/widget/CardView;
check-cast v0, Lcom/google/android/material/chip/Chip;
return-object v0
.end method
@ -484,7 +484,7 @@
move-result v0
invoke-direct {p0}, Lcom/discord/widgets/media/WidgetQRScanner;->getHelpChip()Landroidx/cardview/widget/CardView;
invoke-direct {p0}, Lcom/discord/widgets/media/WidgetQRScanner;->getHelpChip()Lcom/google/android/material/chip/Chip;
move-result-object v2

View File

@ -101,13 +101,11 @@
invoke-virtual {v0, p1, v1}, Lcom/discord/app/AppDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
sget-object p1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
const-string p1, "Mobile Voice Overlay Upsell"
const-string v0, "Mobile Voice Overlay Upsell"
const-string v0, ""
const-string v1, ""
invoke-virtual {p1, v0, v1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
invoke-static {p1, v0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
const/4 p1, 0x1

View File

@ -97,13 +97,11 @@
invoke-virtual {v0, p1, v1}, Lcom/discord/app/AppDialog;->show(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;)V
sget-object p1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
const-string p1, "Mobile Samsung Link Upsell"
const-string v0, "Mobile Samsung Link Upsell"
const-string v0, ""
const-string v1, ""
invoke-virtual {p1, v0, v1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
invoke-static {p1, v0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
const/4 p1, 0x1

View File

@ -34,17 +34,15 @@
# virtual methods
.method public final show(Landroidx/fragment/app/FragmentManager;)V
.locals 3
.locals 2
if-eqz p1, :cond_0
sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
const-string v0, "Help Nav"
const-string v1, "Help Nav"
const-string v1, "Guild List"
const-string v2, "Guild List"
invoke-virtual {v0, v1, v2}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
invoke-static {v0, v1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
new-instance v0, Lcom/discord/widgets/nux/WidgetNavigationHelp;

View File

@ -1936,7 +1936,7 @@
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
const-string v0, " - 12.2 (1053)"
const-string v0, " - 12.3 (1054)"
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;

View File

@ -124,6 +124,12 @@
move-result-object p1
const-string v0, "Suspicious Activity"
const-string v1, ""
invoke-static {v0, v1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
const-class v0, Lcom/discord/widgets/user/account/WidgetUserAccountVerify;
invoke-static {p0, v0, p1}, Le/a/b/i;->b(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V

View File

@ -52,6 +52,12 @@
move-result-object p2
const-string v0, "CAPTCHA"
const-string v1, ""
invoke-static {v0, v1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->openModal(Ljava/lang/String;Ljava/lang/String;)V
const-class v0, Lcom/discord/widgets/user/captcha/WidgetUserCaptchaVerify;
invoke-static {p1, v0, p2}, Le/a/b/i;->b(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V