From b5721801ad42f9f1a931641cff480011aa7479b2 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 28 Oct 2020 23:25:41 +0000 Subject: [PATCH] Changes of com.discord v1302 --- com.discord/apktool.yml | 6 +- com.discord/original/AndroidManifest.xml | Bin 40468 -> 40468 bytes com.discord/res/values/strings.xml | 2 +- .../smali/com/discord/BuildConfig.smali | 6 +- .../smali/com/discord/app/AppLog.smali | 2 +- .../discord/stores/StoreClientVersion.smali | 2 +- ...endingReplies$onCreatePendingReply$1.smali | 58 +++--- .../analytics/AnalyticSuperProperties.smali | 6 +- .../analytics/AnalyticsTracker.smali | 2 +- .../rest/RestAPI$AppHeadersProvider.smali | 2 +- .../SurveyUtils$Survey$BrandSurvey$1.smali | 89 +++++++++ .../SurveyUtils$Survey$BrandSurvey.smali | 174 ++++++++++++++++++ .../SurveyUtils$Survey$NoticeKeys.smali | 2 + .../surveys/SurveyUtils$Survey.smali | 1 + .../SurveyUtils$getGenericSurvey$2.smali | 37 +++- .../utilities/surveys/SurveyUtils.smali | 2 + .../adapter/ChannelMembersListAdapter.smali | 4 +- ...dgetChatInputModel$Companion$get$1$2.smali | 18 +- ...WidgetChatInputModel$Companion$get$1.smali | 8 + .../widgets/debugging/WidgetFatalCrash.smali | 2 +- .../create/WidgetGuildCreateViewModel.smali | 2 +- .../widgets/settings/WidgetSettings.smali | 2 +- .../{smali => smali_classes2}/f/a/a/f$a.smali | 0 .../f/b/a/a/a$a.smali | 4 +- com.discord/{smali => smali_classes2}/h.smali | 0 com.discord/{smali => smali_classes2}/i.smali | 0 26 files changed, 371 insertions(+), 60 deletions(-) create mode 100644 com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey$1.smali create mode 100644 com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey.smali rename com.discord/{smali => smali_classes2}/f/a/a/f$a.smali (100%) rename com.discord/{smali => smali_classes2}/f/b/a/a/a$a.smali (99%) rename com.discord/{smali => smali_classes2}/h.smali (100%) rename com.discord/{smali => smali_classes2}/i.smali (100%) diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index 2fc0ca7c69..182f91b1ec 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-1301.apk +apkFileName: com.discord-1302.apk compressionType: false doNotCompress: - resources.arsc @@ -81,5 +81,5 @@ usesFramework: tag: null version: 2.4.2-83a459-SNAPSHOT versionInfo: - versionCode: '1301' - versionName: '46.0' + versionCode: '1302' + versionName: '46.1' diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index 49c0dd68825435bf0891999290acfc9b950d6c1e..5d95f5648047fe7bb6ffe15fb1337c9a31e3bdca 100644 GIT binary patch delta 23 fcmbQThiS?lrVUrP7!5aH<+^UgD7Ja6YkC9#cW()U delta 23 fcmbQThiS?lrVUrP7!5XG<+^UgD7tyAYkC9#cU%d9 diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index f8b47bde5e..cc9be4a610 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -1197,7 +1197,7 @@ We’re here to make a good impression." Presets Select a color Transparency - cdbef19d43a941a4a8f28c626aa4eb95 + 88ed558c32bf46c4968d40e99ff34400 Coming Soon Search Animated GIFs on the Web Text to search for diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali index 0e2428e7ea..9b3b81a1cf 100644 --- a/com.discord/smali/com/discord/BuildConfig.smali +++ b/com.discord/smali/com/discord/BuildConfig.smali @@ -42,11 +42,11 @@ .field public static final SAMSUNGxDISCORD_CLIENT_ID:Ljava/lang/String; = "97t47j218f" -.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1301" +.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1302" -.field public static final VERSION_CODE:I = 0x515 +.field public static final VERSION_CODE:I = 0x516 -.field public static final VERSION_NAME:Ljava/lang/String; = "46.0" +.field public static final VERSION_NAME:Ljava/lang/String; = "46.1" # direct methods diff --git a/com.discord/smali/com/discord/app/AppLog.smali b/com.discord/smali/com/discord/app/AppLog.smali index 4a2c95f525..c0b2538e3d 100644 --- a/com.discord/smali/com/discord/app/AppLog.smali +++ b/com.discord/smali/com/discord/app/AppLog.smali @@ -393,7 +393,7 @@ sget-object v0, Lcom/discord/utilities/buildutils/BuildUtils;->INSTANCE:Lcom/discord/utilities/buildutils/BuildUtils; - const-string v1, "46.0" + const-string v1, "46.1" invoke-virtual {v0, v1}, Lcom/discord/utilities/buildutils/BuildUtils;->isValidBuildVersionName(Ljava/lang/String;)Z diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali index 8eccf1010a..1afbb5e5ef 100644 --- a/com.discord/smali/com/discord/stores/StoreClientVersion.smali +++ b/com.discord/smali/com/discord/stores/StoreClientVersion.smali @@ -28,7 +28,7 @@ invoke-direct {p0}, Lcom/discord/stores/Store;->()V - const/16 v0, 0x515 + const/16 v0, 0x516 iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I diff --git a/com.discord/smali/com/discord/stores/StorePendingReplies$onCreatePendingReply$1.smali b/com.discord/smali/com/discord/stores/StorePendingReplies$onCreatePendingReply$1.smali index 73c221e873..c06d6e3a81 100644 --- a/com.discord/smali/com/discord/stores/StorePendingReplies$onCreatePendingReply$1.smali +++ b/com.discord/smali/com/discord/stores/StorePendingReplies$onCreatePendingReply$1.smali @@ -66,31 +66,45 @@ .method public final invoke()V .locals 8 - iget-object v0, p0, Lcom/discord/stores/StorePendingReplies$onCreatePendingReply$1;->this$0:Lcom/discord/stores/StorePendingReplies; + iget-object v0, p0, Lcom/discord/stores/StorePendingReplies$onCreatePendingReply$1;->$channel:Lcom/discord/models/domain/ModelChannel; - invoke-static {v0}, Lcom/discord/stores/StorePendingReplies;->access$getPendingReplies$p(Lcom/discord/stores/StorePendingReplies;)Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap; + invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->isPrivate()Z + + move-result v0 + + if-eqz v0, :cond_0 + + const/4 v0, 0x0 + + goto :goto_0 + + :cond_0 + iget-object v0, p0, Lcom/discord/stores/StorePendingReplies$onCreatePendingReply$1;->$channel:Lcom/discord/models/domain/ModelChannel; + + invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long; move-result-object v0 - iget-object v1, p0, Lcom/discord/stores/StorePendingReplies$onCreatePendingReply$1;->$channel:Lcom/discord/models/domain/ModelChannel; + :goto_0 + iget-object v1, p0, Lcom/discord/stores/StorePendingReplies$onCreatePendingReply$1;->this$0:Lcom/discord/stores/StorePendingReplies; - invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getId()J - - move-result-wide v1 - - invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v1}, Lcom/discord/stores/StorePendingReplies;->access$getPendingReplies$p(Lcom/discord/stores/StorePendingReplies;)Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap; move-result-object v1 - new-instance v2, Lcom/discord/stores/StorePendingReplies$PendingReply; + iget-object v2, p0, Lcom/discord/stores/StorePendingReplies$onCreatePendingReply$1;->$channel:Lcom/discord/models/domain/ModelChannel; - new-instance v3, Lcom/discord/models/domain/ModelMessage$MessageReference; + invoke-virtual {v2}, Lcom/discord/models/domain/ModelChannel;->getId()J - iget-object v4, p0, Lcom/discord/stores/StorePendingReplies$onCreatePendingReply$1;->$channel:Lcom/discord/models/domain/ModelChannel; + move-result-wide v2 - invoke-virtual {v4}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long; + invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - move-result-object v4 + move-result-object v2 + + new-instance v3, Lcom/discord/stores/StorePendingReplies$PendingReply; + + new-instance v4, Lcom/discord/models/domain/ModelMessage$MessageReference; iget-object v5, p0, Lcom/discord/stores/StorePendingReplies$onCreatePendingReply$1;->$channel:Lcom/discord/models/domain/ModelChannel; @@ -112,25 +126,25 @@ move-result-object v6 - invoke-direct {v3, v4, v5, v6}, Lcom/discord/models/domain/ModelMessage$MessageReference;->(Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Long;)V + invoke-direct {v4, v0, v5, v6}, Lcom/discord/models/domain/ModelMessage$MessageReference;->(Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Long;)V - iget-object v4, p0, Lcom/discord/stores/StorePendingReplies$onCreatePendingReply$1;->$message:Lcom/discord/models/domain/ModelMessage; + iget-object v0, p0, Lcom/discord/stores/StorePendingReplies$onCreatePendingReply$1;->$message:Lcom/discord/models/domain/ModelMessage; - invoke-virtual {v4}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser; + invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser; - move-result-object v4 + move-result-object v0 const-string v5, "message.author" - invoke-static {v4, v5}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v0, v5}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V - invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getId()J + invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J - move-result-wide v4 + move-result-wide v5 - invoke-direct {v2, v3, v4, v5}, Lcom/discord/stores/StorePendingReplies$PendingReply;->(Lcom/discord/models/domain/ModelMessage$MessageReference;J)V + invoke-direct {v3, v4, v5, v6}, Lcom/discord/stores/StorePendingReplies$PendingReply;->(Lcom/discord/models/domain/ModelMessage$MessageReference;J)V - invoke-interface {v0, v1, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v1, v2, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; iget-object v0, p0, Lcom/discord/stores/StorePendingReplies$onCreatePendingReply$1;->this$0:Lcom/discord/stores/StorePendingReplies; diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali index 68cdfacfa1..0ccaacabba 100644 --- a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali +++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali @@ -173,7 +173,7 @@ const-string v3, "browser_user_agent" - const-string v4, "Discord-Android/1301" + const-string v4, "Discord-Android/1302" invoke-direct {v2, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V @@ -181,7 +181,7 @@ const/4 v1, 0x2 - const/16 v2, 0x515 + const/16 v2, 0x516 invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -201,7 +201,7 @@ const-string v3, "client_version" - const-string v4, "46.0" + const-string v4, "46.1" invoke-direct {v2, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali index 7ceff14d1c..ce377506f7 100644 --- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali +++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali @@ -4074,7 +4074,7 @@ .method public final createGuildViewed(Lcom/discord/widgets/guilds/create/StockGuildTemplate;Lcom/discord/models/domain/ModelGuildTemplate;Ljava/lang/String;)V .locals 5 - const-string/jumbo v0, "stockGuildTemplate" + const-string v0, "stockGuildTemplate" invoke-static {p1, v0}, Lc0/n/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali index 79e4f6ab36..bb68e985da 100644 --- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali +++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali @@ -159,7 +159,7 @@ .method public getUserAgent()Ljava/lang/String; .locals 1 - const-string v0, "Discord-Android/1301" + const-string v0, "Discord-Android/1302" return-object v0 .end method diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey$1.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey$1.smali new file mode 100644 index 0000000000..d8e341365b --- /dev/null +++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey$1.smali @@ -0,0 +1,89 @@ +.class public final Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey$1; +.super Lc0/n/c/k; +.source "SurveyUtils.kt" + +# interfaces +.implements Lkotlin/jvm/functions/Function1; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey;->(Lcom/discord/models/domain/ModelUser;)V +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x19 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "Lc0/n/c/k;", + "Lkotlin/jvm/functions/Function1<", + "Landroid/app/Activity;", + "Ljava/lang/String;", + ">;" + } +.end annotation + + +# static fields +.field public static final INSTANCE:Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey$1; + + +# direct methods +.method public static constructor ()V + .locals 1 + + new-instance v0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey$1; + + invoke-direct {v0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey$1;->()V + + sput-object v0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey$1;->INSTANCE:Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey$1; + + return-void +.end method + +.method public constructor ()V + .locals 1 + + const/4 v0, 0x1 + + invoke-direct {p0, v0}, Lc0/n/c/k;->(I)V + + return-void +.end method + + +# virtual methods +.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 + + check-cast p1, Landroid/app/Activity; + + invoke-virtual {p0, p1}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey$1;->invoke(Landroid/app/Activity;)Ljava/lang/String; + + move-result-object p1 + + return-object p1 +.end method + +.method public final invoke(Landroid/app/Activity;)Ljava/lang/String; + .locals 1 + + const-string v0, "activity" + + invoke-static {p1, v0}, Lc0/n/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + + const v0, 0x7f120284 + + invoke-virtual {p1, v0}, Landroid/app/Activity;->getString(I)Ljava/lang/String; + + move-result-object p1 + + const-string v0, "activity.getString(R.str\u2026g.b_plus_a_survey_prompt)" + + invoke-static {p1, v0}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + + return-object p1 +.end method diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey.smali new file mode 100644 index 0000000000..d258565ab1 --- /dev/null +++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey.smali @@ -0,0 +1,174 @@ +.class public final Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey; +.super Lcom/discord/utilities/surveys/SurveyUtils$Survey; +.source "SurveyUtils.kt" + + +# annotations +.annotation system Ldalvik/annotation/EnclosingClass; + value = Lcom/discord/utilities/surveys/SurveyUtils$Survey; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x19 + name = "BrandSurvey" +.end annotation + + +# instance fields +.field public final meUser:Lcom/discord/models/domain/ModelUser; + + +# direct methods +.method public constructor (Lcom/discord/models/domain/ModelUser;)V + .locals 7 + + const-string v0, "meUser" + + invoke-static {p1, v0}, Lc0/n/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + + sget-object v5, Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey$1;->INSTANCE:Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey$1; + + const-string v2, "pdCXKkNu" + + const-string v3, "https://bandaequals.typeform.com/to/pdCXKkNu" + + const-string v4, "NOTICE_KEY_B_AND_A_SURVEY" + + const/4 v6, 0x0 + + move-object v1, p0 + + invoke-direct/range {v1 .. v6}, Lcom/discord/utilities/surveys/SurveyUtils$Survey;->(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/internal/DefaultConstructorMarker;)V + + iput-object p1, p0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey;->meUser:Lcom/discord/models/domain/ModelUser; + + return-void +.end method + +.method public static synthetic copy$default(Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey;Lcom/discord/models/domain/ModelUser;ILjava/lang/Object;)Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey; + .locals 0 + + and-int/lit8 p2, p2, 0x1 + + if-eqz p2, :cond_0 + + iget-object p1, p0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey;->meUser:Lcom/discord/models/domain/ModelUser; + + :cond_0 + invoke-virtual {p0, p1}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey;->copy(Lcom/discord/models/domain/ModelUser;)Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey; + + move-result-object p0 + + return-object p0 +.end method + + +# virtual methods +.method public final component1()Lcom/discord/models/domain/ModelUser; + .locals 1 + + iget-object v0, p0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey;->meUser:Lcom/discord/models/domain/ModelUser; + + return-object v0 +.end method + +.method public final copy(Lcom/discord/models/domain/ModelUser;)Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey; + .locals 1 + + const-string v0, "meUser" + + invoke-static {p1, v0}, Lc0/n/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + + new-instance v0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey; + + invoke-direct {v0, p1}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey;->(Lcom/discord/models/domain/ModelUser;)V + + return-object v0 +.end method + +.method public equals(Ljava/lang/Object;)Z + .locals 1 + + if-eq p0, p1, :cond_1 + + instance-of v0, p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey; + + if-eqz v0, :cond_0 + + check-cast p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey; + + iget-object v0, p0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey;->meUser:Lcom/discord/models/domain/ModelUser; + + iget-object p1, p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey;->meUser:Lcom/discord/models/domain/ModelUser; + + invoke-static {v0, p1}, Lc0/n/c/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z + + move-result p1 + + if-eqz p1, :cond_0 + + goto :goto_0 + + :cond_0 + const/4 p1, 0x0 + + return p1 + + :cond_1 + :goto_0 + const/4 p1, 0x1 + + return p1 +.end method + +.method public final getMeUser()Lcom/discord/models/domain/ModelUser; + .locals 1 + + iget-object v0, p0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey;->meUser:Lcom/discord/models/domain/ModelUser; + + return-object v0 +.end method + +.method public hashCode()I + .locals 1 + + iget-object v0, p0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey;->meUser:Lcom/discord/models/domain/ModelUser; + + if-eqz v0, :cond_0 + + invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->hashCode()I + + move-result v0 + + goto :goto_0 + + :cond_0 + const/4 v0, 0x0 + + :goto_0 + return v0 +.end method + +.method public toString()Ljava/lang/String; + .locals 2 + + const-string v0, "BrandSurvey(meUser=" + + invoke-static {v0}, Lf/e/c/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder; + + move-result-object v0 + + iget-object v1, p0, Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey;->meUser:Lcom/discord/models/domain/ModelUser; + + 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 + + return-object v0 +.end method diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$NoticeKeys.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$NoticeKeys.smali index b0a4cbeef7..d20c985706 100644 --- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$NoticeKeys.smali +++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$NoticeKeys.smali @@ -23,6 +23,8 @@ .field public static final NOTICE_KEY_NPS_SURVEY:Ljava/lang/String; = "NOTICE_KEY_NPS_SURVEY" +.field public static final NOTICE_KEY_PRODUCT_B_AND_A_SURVEY:Ljava/lang/String; = "NOTICE_KEY_B_AND_A_SURVEY" + .field public static final NOTICE_KEY_PRODUCT_FEEDBACK_SURVEY:Ljava/lang/String; = "NOTICE_KEY_PRODUCT_FEEDBACK_SURVEY" .field public static final NOTICE_KEY_USER_SURVEY:Ljava/lang/String; = "NOTICE_KEY_USER_SURVEY" diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey.smali index 90b3941daf..0ae1f3d98f 100644 --- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey.smali +++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey.smali @@ -22,6 +22,7 @@ Lcom/discord/utilities/surveys/SurveyUtils$Survey$ConsoleResearchSurvey;, Lcom/discord/utilities/surveys/SurveyUtils$Survey$CovidNewUserSurvey;, Lcom/discord/utilities/surveys/SurveyUtils$Survey$ProductFeedbackSurvey;, + Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey;, Lcom/discord/utilities/surveys/SurveyUtils$Survey$NoticeKeys; } .end annotation diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getGenericSurvey$2.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getGenericSurvey$2.smali index 59a75a3853..d567acbae9 100644 --- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getGenericSurvey$2.smali +++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$getGenericSurvey$2.smali @@ -71,7 +71,7 @@ invoke-direct {p1, v0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$NpsSurvey;->(Lcom/discord/models/domain/ModelUser;)V - goto :goto_4 + goto :goto_5 :cond_1 :goto_0 @@ -94,7 +94,7 @@ invoke-direct {p1, v0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$ConsoleResearchSurvey;->(Lcom/discord/models/domain/ModelUser;)V - goto :goto_4 + goto :goto_5 :cond_3 :goto_1 @@ -117,7 +117,7 @@ invoke-direct {p1, v0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$CovidNewUserSurvey;->(Lcom/discord/models/domain/ModelUser;)V - goto :goto_4 + goto :goto_5 :cond_5 :goto_2 @@ -130,9 +130,9 @@ :cond_6 invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I - move-result p1 + move-result v1 - if-ne p1, v0, :cond_7 + if-ne v1, v0, :cond_7 new-instance p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey$ProductFeedbackSurvey; @@ -140,13 +140,36 @@ invoke-direct {p1, v0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$ProductFeedbackSurvey;->(Lcom/discord/models/domain/ModelUser;)V - goto :goto_4 + goto :goto_5 :cond_7 :goto_3 + const/16 v0, 0xe + + if-nez p1, :cond_8 + + goto :goto_4 + + :cond_8 + invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I + + move-result p1 + + if-ne p1, v0, :cond_9 + + new-instance p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey; + + iget-object v0, p0, Lcom/discord/utilities/surveys/SurveyUtils$getGenericSurvey$2;->$meUser:Lcom/discord/models/domain/ModelUser; + + invoke-direct {p1, v0}, Lcom/discord/utilities/surveys/SurveyUtils$Survey$BrandSurvey;->(Lcom/discord/models/domain/ModelUser;)V + + goto :goto_5 + + :cond_9 + :goto_4 sget-object p1, Lcom/discord/utilities/surveys/SurveyUtils$Survey$None;->INSTANCE:Lcom/discord/utilities/surveys/SurveyUtils$Survey$None; - :goto_4 + :goto_5 return-object p1 .end method diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils.smali index ca684b05ee..581a18beca 100644 --- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils.smali +++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils.smali @@ -12,6 +12,8 @@ # static fields +.field public static final GENERIC_SURVEY_BUCKET_B_AND_A:I = 0xe + .field public static final GENERIC_SURVEY_BUCKET_CONSOLE_RESEARCH:I = 0x5 .field public static final GENERIC_SURVEY_BUCKET_COVID_NEW_USER:I = 0x6 diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter.smali index 4669c27c16..3bf535204a 100644 --- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter.smali +++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter.smali @@ -204,7 +204,7 @@ return-object p0 :cond_0 - const-string/jumbo p0, "stickyHeadersManager" + const-string p0, "stickyHeadersManager" invoke-static {p0}, Lc0/n/c/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V @@ -260,7 +260,7 @@ .method public getAndBindHeaderView(I)Landroid/view/View; .locals 8 - const-string/jumbo v0, "stickyHeadersManager" + const-string v0, "stickyHeadersManager" iget-object v1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter;->memberList:Lcom/discord/widgets/channels/memberlist/WidgetChannelMembersListViewModel$MemberList; diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel$Companion$get$1$2.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel$Companion$get$1$2.smali index 9974c064d7..da789b16ad 100644 --- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel$Companion$get$1$2.smali +++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel$Companion$get$1$2.smali @@ -71,12 +71,6 @@ invoke-static {v12, v1}, Lc0/n/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V - const-string v1, "pendingReplyState" - - move-object/from16 v15, p11 - - invoke-static {v15, v1}, Lc0/n/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V - iget-object v1, v0, Lcom/discord/widgets/chat/input/WidgetChatInputModel$Companion$get$1$2;->$channel:Lcom/discord/models/domain/ModelChannel; invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getId()J @@ -137,12 +131,12 @@ if-nez v8, :cond_1 - const/16 v16, 0x1 + const/4 v15, 0x1 goto :goto_1 :cond_1 - const/16 v16, 0x0 + const/4 v15, 0x0 :goto_1 sget-object v5, Lcom/discord/widgets/chat/input/WidgetChatInputModel;->Companion:Lcom/discord/widgets/chat/input/WidgetChatInputModel$Companion; @@ -196,6 +190,12 @@ move-result v13 + const-string v5, "pendingReplyState" + + move-object/from16 v10, p11 + + invoke-static {v10, v5}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + move-object/from16 v5, p1 move-object/from16 v6, p2 @@ -206,8 +206,6 @@ move-object/from16 v12, p7 - move/from16 v15, v16 - move/from16 v16, p10 move-object/from16 v17, p11 diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel$Companion$get$1.smali index 09e5c4930d..55c1806136 100644 --- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel$Companion$get$1.smali +++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel$Companion$get$1.smali @@ -290,8 +290,16 @@ invoke-static {v2, v13, v14}, Lcom/discord/widgets/chat/input/WidgetChatInputModel$Companion;->access$observePendingReplyState(Lcom/discord/widgets/chat/input/WidgetChatInputModel$Companion;J)Lrx/Observable; + move-result-object v2 + + invoke-virtual {v2}, Lrx/Observable;->q()Lrx/Observable; + move-result-object v13 + const-string v2, "observePendingReplyState\u2026 .distinctUntilChanged()" + + invoke-static {v13, v2}, Lc0/n/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + new-instance v14, Lcom/discord/widgets/chat/input/WidgetChatInputModel$Companion$get$1$2; move-object/from16 v2, p0 diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali index 22824aa9f9..4f47e0d684 100644 --- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali +++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali @@ -446,7 +446,7 @@ new-array v2, v0, [Ljava/lang/Object; - const-string v4, "46.0" + const-string v4, "46.1" aput-object v4, v2, v3 diff --git a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.smali b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.smali index 0c92e112ca..f9ac1829e2 100644 --- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.smali +++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.smali @@ -101,7 +101,7 @@ invoke-static {p2, v7}, Lc0/n/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V - const-string/jumbo v7, "stockGuildTemplate" + const-string v7, "stockGuildTemplate" invoke-static {v3, v7}, Lc0/n/c/j;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V diff --git a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali index 75b9488cb6..f3ed97998d 100644 --- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali +++ b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali @@ -1950,7 +1950,7 @@ invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v0, " - 46.0 (1301)" + const-string v0, " - 46.1 (1302)" invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; diff --git a/com.discord/smali/f/a/a/f$a.smali b/com.discord/smali_classes2/f/a/a/f$a.smali similarity index 100% rename from com.discord/smali/f/a/a/f$a.smali rename to com.discord/smali_classes2/f/a/a/f$a.smali diff --git a/com.discord/smali/f/b/a/a/a$a.smali b/com.discord/smali_classes2/f/b/a/a/a$a.smali similarity index 99% rename from com.discord/smali/f/b/a/a/a$a.smali rename to com.discord/smali_classes2/f/b/a/a/a$a.smali index 2fd6c43104..d38c6e07ec 100644 --- a/com.discord/smali/f/b/a/a/a$a.smali +++ b/com.discord/smali_classes2/f/b/a/a/a$a.smali @@ -194,9 +194,9 @@ if-eqz v8, :cond_d - const-string/jumbo v10, "text/*" + const-string v10, "text/*" - const-string/jumbo v11, "video/*" + const-string v11, "video/*" filled-new-array {v10, v6, v11}, [Ljava/lang/String; diff --git a/com.discord/smali/h.smali b/com.discord/smali_classes2/h.smali similarity index 100% rename from com.discord/smali/h.smali rename to com.discord/smali_classes2/h.smali diff --git a/com.discord/smali/i.smali b/com.discord/smali_classes2/i.smali similarity index 100% rename from com.discord/smali/i.smali rename to com.discord/smali_classes2/i.smali