Changes of com.discord v1060

This commit is contained in:
root 2020-03-11 01:19:24 +01:00
parent 24066264d9
commit cc4688f3fd
12 changed files with 89 additions and 54 deletions

View file

@ -1,5 +1,5 @@
!!brut.androlib.meta.MetaInfo
apkFileName: com.discord-1059.apk
apkFileName: com.discord-1060.apk
compressionType: false
doNotCompress:
- arsc
@ -190,5 +190,5 @@ usesFramework:
tag: null
version: 2.4.1-197d46-SNAPSHOT
versionInfo:
versionCode: '1059'
versionName: '13.0'
versionCode: '1060'
versionName: 14-alpha1

View file

@ -3,9 +3,9 @@
#
#Do NOT modify, delete, or commit to source control!
#
#Tue Mar 10 21:51:51 UTC 2020
version_name=13.0
#Tue Mar 10 22:53:36 UTC 2020
version_name=14-alpha1
package_name=com.discord
build_id=60706b99-08e6-4c43-b7b2-485bd0c1c4ad
version_code=1059
build_id=d08bd0e5-7f30-4880-850b-3017d9cc0989
version_code=1060
app_name=com.discord

View file

@ -1014,7 +1014,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">60706b99-08e6-4c43-b7b2-485bd0c1c4ad</string>
<string name="com.crashlytics.android.build_id">d08bd0e5-7f30-4880-850b-3017d9cc0989</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/1059"
.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1060"
.field public static final VERSION_CODE:I = 0x423
.field public static final VERSION_CODE:I = 0x424
.field public static final VERSION_NAME:Ljava/lang/String; = "13.0"
.field public static final VERSION_NAME:Ljava/lang/String; = "14-alpha1"
# direct methods

View file

@ -28,7 +28,7 @@
invoke-direct {p0}, Lcom/discord/stores/Store;-><init>()V
const/16 v0, 0x423
const/16 v0, 0x424
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/1059"
const-string v4, "Discord-Android/1060"
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, 0x423
const/16 v2, 0x424
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@ -201,7 +201,7 @@
const/4 v1, 0x3
const-string v2, "13.0"
const-string v2, "14-alpha1"
const-string v3, ""

View file

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

View file

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

View file

@ -1302,11 +1302,9 @@
move-result v0
const/4 v1, 0x0
const/4 v1, 0x1
const/4 v2, 0x1
if-eqz v0, :cond_2
if-eqz v0, :cond_1
invoke-virtual {p0}, Lcom/discord/widgets/main/WidgetMain;->getDrawerLayout()Lcom/discord/widgets/main/WidgetMainDrawerLayout;
@ -1316,31 +1314,34 @@
move-result v0
if-eqz v0, :cond_1
if-eqz v0, :cond_0
:cond_0
const/4 v2, 0x0
invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireActivity()Landroidx/fragment/app/FragmentActivity;
move-result-object v0
invoke-virtual {v0, v1}, Landroid/app/Activity;->moveTaskToBack(Z)Z
goto :goto_0
:cond_1
:cond_0
sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getNavigation()Lcom/discord/stores/StoreNavigation;
move-result-object v0
sget-object v1, Lcom/discord/stores/StoreNavigation$DrawerAction;->OPEN:Lcom/discord/stores/StoreNavigation$DrawerAction;
sget-object v2, Lcom/discord/stores/StoreNavigation$DrawerAction;->OPEN:Lcom/discord/stores/StoreNavigation$DrawerAction;
const/4 v3, 0x2
const/4 v4, 0x0
invoke-static {v0, v1, v4, v3, v4}, Lcom/discord/stores/StoreNavigation;->setNavigationDrawerAction$default(Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreNavigation$DrawerAction;Landroidx/drawerlayout/widget/DrawerLayout;ILjava/lang/Object;)V
invoke-static {v0, v2, v4, v3, v4}, Lcom/discord/stores/StoreNavigation;->setNavigationDrawerAction$default(Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreNavigation$DrawerAction;Landroidx/drawerlayout/widget/DrawerLayout;ILjava/lang/Object;)V
goto :goto_0
:cond_2
:cond_1
sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getUserSettings()Lcom/discord/stores/StoreUserSettings;
@ -1353,13 +1354,13 @@
invoke-virtual {p0}, Lcom/discord/widgets/main/WidgetMain;->getDrawerLayout()Lcom/discord/widgets/main/WidgetMainDrawerLayout;
move-result-object v3
move-result-object v2
invoke-virtual {v3}, Lcom/discord/widgets/main/WidgetMainDrawerLayout;->isDrawerOpen()Z
invoke-virtual {v2}, Lcom/discord/widgets/main/WidgetMainDrawerLayout;->isDrawerOpen()Z
move-result v3
move-result v2
if-eqz v3, :cond_3
if-eqz v2, :cond_2
invoke-virtual {p0}, Lcom/discord/widgets/main/WidgetMain;->getDrawerLayout()Lcom/discord/widgets/main/WidgetMainDrawerLayout;
@ -1369,40 +1370,45 @@
goto :goto_0
:cond_3
if-eqz v0, :cond_0
:cond_2
if-eqz v0, :cond_4
invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getAppActivity()Lcom/discord/app/AppActivity;
move-result-object v0
if-eqz v0, :cond_4
if-eqz v0, :cond_3
invoke-virtual {v0}, Lcom/discord/app/AppActivity;->i()Z
move-result v0
if-eq v0, v2, :cond_0
if-eq v0, v1, :cond_4
:cond_4
:cond_3
iget-object v0, p0, Lcom/discord/widgets/main/WidgetMain;->openDrawerSubject:Lrx/subjects/PublishSubject;
invoke-static {}, Lcom/discord/utilities/time/ClockFactory;->get()Lcom/discord/utilities/time/Clock;
move-result-object v1
move-result-object v2
invoke-interface {v1}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
invoke-interface {v2}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
move-result-wide v3
move-result-wide v2
invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
move-result-object v1
move-result-object v2
invoke-virtual {v0, v1}, Lrx/subjects/PublishSubject;->onNext(Ljava/lang/Object;)V
invoke-virtual {v0, v2}, Lrx/subjects/PublishSubject;->onNext(Ljava/lang/Object;)V
goto :goto_0
:cond_4
const/4 v1, 0x0
:goto_0
return v2
return v1
.end method
.method private final isOnHomeTab()Z

View file

@ -1977,7 +1977,7 @@
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
const-string v0, " - 13.0 (1059)"
const-string v0, " - 14-alpha1 (1060)"
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;

View file

@ -640,11 +640,11 @@
.end method
.method public static final a(Landroid/content/Context;ZLandroid/content/Intent;)V
.locals 0
.locals 1
if-eqz p0, :cond_2
if-eqz p0, :cond_4
if-eqz p1, :cond_1
if-eqz p1, :cond_3
sget-object p1, Lcom/discord/widgets/tabs/TabsFeatureFlag;->Companion:Lcom/discord/widgets/tabs/TabsFeatureFlag$Companion;
@ -656,26 +656,55 @@
move-result p1
if-eqz p1, :cond_0
if-eqz p1, :cond_2
const-class p1, Lcom/discord/widgets/tabs/WidgetTabsHost;
const/4 p1, 0x1
goto :goto_0
if-eqz p2, :cond_0
const-string v0, "com.discord.intent.extra.EXTRA_OPEN_DRAWER"
invoke-virtual {p2, v0, p1}, Landroid/content/Intent;->getBooleanExtra(Ljava/lang/String;Z)Z
move-result p1
:cond_0
const-class p1, Lcom/discord/widgets/main/WidgetMain;
if-eqz p1, :cond_1
sget-object p1, Lcom/discord/stores/StoreNavigation$DrawerAction;->OPEN:Lcom/discord/stores/StoreNavigation$DrawerAction;
goto :goto_0
:cond_1
const-class p1, Lcom/discord/widgets/auth/WidgetAuthLanding;
sget-object p1, Lcom/discord/stores/StoreNavigation$DrawerAction;->CLOSE:Lcom/discord/stores/StoreNavigation$DrawerAction;
:goto_0
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, p1}, Lcom/discord/stores/StoreTabsNavigation;->selectHomeTab(Lcom/discord/stores/StoreNavigation$DrawerAction;)V
const-class p1, Lcom/discord/widgets/tabs/WidgetTabsHost;
goto :goto_1
:cond_2
const-class p1, Lcom/discord/widgets/main/WidgetMain;
goto :goto_1
:cond_3
const-class p1, Lcom/discord/widgets/auth/WidgetAuthLanding;
:goto_1
invoke-static {p0, p1, p2}, Le/a/b/i;->b(Landroid/content/Context;Ljava/lang/Class;Landroid/content/Intent;)V
return-void
:cond_2
:cond_4
const-string p0, "context"
invoke-static {p0}, Lw/u/b/j;->a(Ljava/lang/String;)V