From b3b8f792208a7682029ebdcf5f14e87fa0503993 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 11 Sep 2020 17:26:44 +0000 Subject: [PATCH] Changes of com.discord v1258 --- com.discord/apktool.yml | 6 +- com.discord/original/AndroidManifest.xml | Bin 39500 -> 39500 bytes .../res/layout/widget_auth_birthday.xml | 2 +- com.discord/res/values/ids.xml | 2 +- com.discord/res/values/public.xml | 2 +- com.discord/res/values/strings.xml | 2 +- .../smali/com/discord/BuildConfig.smali | 6 +- ...perimentsDto$experimentsByNameHash$2.smali | 133 ----------------- .../UnauthenticatedUserExperimentsDto.smali | 65 +++------ ...uthentication$getShouldShowAgeGate$1.smali | 21 +-- .../discord/stores/StoreAuthentication.smali | 22 +-- .../discord/stores/StoreClientVersion.smali | 2 +- ...riments$tryInitializeExperiments$2$1.smali | 59 +++++++- .../analytics/AnalyticSuperProperties.smali | 6 +- .../utilities/birthday/BirthdayHelper.smali | 14 +- .../rest/RestAPI$AppHeadersProvider.smali | 2 +- .../GuildChannelSideBarActionsView.smali | 18 ++- ...etAgeVerify$configureBirthdayInput$1.smali | 4 +- ...e$1$$special$$inlined$apply$lambda$1.smali | 2 +- ...AuthBirthday$onViewBoundOrOnResume$1.smali | 64 ++++++--- ...dgetAuthBirthday$validationManager$2.smali | 2 +- .../widgets/auth/WidgetAuthBirthday.smali | 100 ++++++------- .../widgets/auth/WidgetAuthRegister.smali | 2 +- .../WidgetChannelSidebarActions.smali | 22 ++- ...wModel$Factory$observeStoreState$1$1.smali | 63 ++++++-- ...iewModel$Factory$observeStoreState$1.smali | 48 ++++++- ...annelSidebarActionsViewModel$Factory.smali | 108 ++++++++++++-- ...onsViewModel$StoreState$ChannelFound.smali | 80 ++++++++--- ...ebarActionsViewModel$ViewState$Guild.smali | 135 ++++++++++++++---- ...WidgetChannelSidebarActionsViewModel.smali | 24 ++-- .../widgets/debugging/WidgetFatalCrash.smali | 2 +- .../WidgetHomeModel$Companion$get$1.smali | 56 ++------ .../home/WidgetHomeModel$Companion.smali | 26 +--- .../widgets/home/WidgetHomeModel.smali | 119 ++++----------- ...elNsfw$toggleContainerVisibility$1$1.smali | 2 +- .../widgets/home/WidgetHomePanelNsfw.smali | 32 ++--- .../widgets/settings/WidgetSettings.smali | 2 +- 37 files changed, 676 insertions(+), 579 deletions(-) delete mode 100644 com.discord/smali/com/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto$experimentsByNameHash$2.smali diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index 4b2d420017..b7d3408d11 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-1257.apk +apkFileName: com.discord-1258.apk compressionType: false doNotCompress: - resources.arsc @@ -3109,5 +3109,5 @@ usesFramework: tag: null version: 2.4.2-83a459-SNAPSHOT versionInfo: - versionCode: '1257' - versionName: '40.02' + versionCode: '1258' + versionName: '40.03' diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index a87b7b82d37985ac36077af748f749eb904e529a..21f882da2ee9fd0eacb1493db8bdc442a3c97079 100644 GIT binary patch delta 23 fcmX@Jh3U)|rVR;PjK-T2xzsHgUv2JmJ{$%Ba!m - + diff --git a/com.discord/res/values/ids.xml b/com.discord/res/values/ids.xml index 730d006032..d1407c334a 100644 --- a/com.discord/res/values/ids.xml +++ b/com.discord/res/values/ids.xml @@ -182,7 +182,7 @@ - + diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml index 0274e6a34a..5c7d21bde8 100644 --- a/com.discord/res/values/public.xml +++ b/com.discord/res/values/public.xml @@ -4482,7 +4482,7 @@ - + diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index 095d9e4f72..81e721861a 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -1149,7 +1149,7 @@ We’re here to make a good impression." Presets Select a color Transparency - f16909059bbb4537af200116b516fa3e + 3b9de323d48a4aca961790cd2928b5c4 Coming Soon Search Animated GIFs on the Web Displays text with emphasis. diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali index 92121df296..960228adab 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/1257" +.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1258" -.field public static final VERSION_CODE:I = 0x4e9 +.field public static final VERSION_CODE:I = 0x4ea -.field public static final VERSION_NAME:Ljava/lang/String; = "40.02" +.field public static final VERSION_NAME:Ljava/lang/String; = "40.03" # direct methods diff --git a/com.discord/smali/com/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto$experimentsByNameHash$2.smali b/com.discord/smali/com/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto$experimentsByNameHash$2.smali deleted file mode 100644 index 04d9395e0c..0000000000 --- a/com.discord/smali/com/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto$experimentsByNameHash$2.smali +++ /dev/null @@ -1,133 +0,0 @@ -.class public final Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto$experimentsByNameHash$2; -.super Lk0/n/c/j; -.source "UnauthenticatedUserExperimentsDto.kt" - -# interfaces -.implements Lkotlin/jvm/functions/Function0; - - -# annotations -.annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto;->(Ljava/lang/String;Ljava/util/List;)V -.end annotation - -.annotation system Ldalvik/annotation/InnerClass; - accessFlags = 0x19 - name = null -.end annotation - -.annotation system Ldalvik/annotation/Signature; - value = { - "Lk0/n/c/j;", - "Lkotlin/jvm/functions/Function0<", - "Ljava/util/Map<", - "Ljava/lang/Long;", - "+", - "Lcom/discord/models/experiments/dto/UserExperimentDto;", - ">;>;" - } -.end annotation - - -# instance fields -.field public final synthetic this$0:Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto; - - -# direct methods -.method public constructor (Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto;)V - .locals 0 - - iput-object p1, p0, Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto$experimentsByNameHash$2;->this$0:Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto; - - const/4 p1, 0x0 - - invoke-direct {p0, p1}, Lk0/n/c/j;->(I)V - - return-void -.end method - - -# virtual methods -.method public bridge synthetic invoke()Ljava/lang/Object; - .locals 1 - - invoke-virtual {p0}, Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto$experimentsByNameHash$2;->invoke()Ljava/util/Map; - - move-result-object v0 - - return-object v0 -.end method - -.method public final invoke()Ljava/util/Map; - .locals 5 - .annotation system Ldalvik/annotation/Signature; - value = { - "()", - "Ljava/util/Map<", - "Ljava/lang/Long;", - "Lcom/discord/models/experiments/dto/UserExperimentDto;", - ">;" - } - .end annotation - - iget-object v0, p0, Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto$experimentsByNameHash$2;->this$0:Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto; - - invoke-static {v0}, Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto;->access$getAssignments$p(Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto;)Ljava/util/List; - - move-result-object v0 - - const/16 v1, 0xa - - invoke-static {v0, v1}, Lf/h/a/f/e/n/f;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I - - move-result v1 - - invoke-static {v1}, Lf/h/a/f/e/n/f;->mapCapacity(I)I - - move-result v1 - - const/16 v2, 0x10 - - if-ge v1, v2, :cond_0 - - const/16 v1, 0x10 - - :cond_0 - new-instance v2, Ljava/util/LinkedHashMap; - - invoke-direct {v2, v1}, Ljava/util/LinkedHashMap;->(I)V - - invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; - - move-result-object v0 - - :goto_0 - invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z - - move-result v1 - - if-eqz v1, :cond_1 - - invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object; - - move-result-object v1 - - move-object v3, v1 - - check-cast v3, Lcom/discord/models/experiments/dto/UserExperimentDto; - - invoke-virtual {v3}, Lcom/discord/models/experiments/dto/UserExperimentDto;->getNameHash()J - - move-result-wide v3 - - invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - - move-result-object v3 - - invoke-interface {v2, v3, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; - - goto :goto_0 - - :cond_1 - return-object v2 -.end method diff --git a/com.discord/smali/com/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto.smali b/com.discord/smali/com/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto.smali index 5de3ac352e..dcaf5d24e7 100644 --- a/com.discord/smali/com/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto.smali +++ b/com.discord/smali/com/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto.smali @@ -14,8 +14,6 @@ .end annotation .end field -.field public final experimentsByNameHash$delegate:Lkotlin/Lazy; - .field public final fingerprint:Ljava/lang/String; @@ -46,43 +44,9 @@ iput-object p2, p0, Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto;->assignments:Ljava/util/List; - new-instance p1, Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto$experimentsByNameHash$2; - - invoke-direct {p1, p0}, Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto$experimentsByNameHash$2;->(Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto;)V - - invoke-static {p1}, Lf/h/a/f/e/n/f;->lazy(Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy; - - move-result-object p1 - - iput-object p1, p0, Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto;->experimentsByNameHash$delegate:Lkotlin/Lazy; - return-void .end method -.method public static final synthetic access$getAssignments$p(Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto;)Ljava/util/List; - .locals 0 - - iget-object p0, p0, Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto;->assignments:Ljava/util/List; - - return-object p0 -.end method - -.method private final component2()Ljava/util/List; - .locals 1 - .annotation system Ldalvik/annotation/Signature; - value = { - "()", - "Ljava/util/List<", - "Lcom/discord/models/experiments/dto/UserExperimentDto;", - ">;" - } - .end annotation - - iget-object v0, p0, Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto;->assignments:Ljava/util/List; - - return-object v0 -.end method - .method public static synthetic copy$default(Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto;Ljava/lang/String;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto; .locals 0 @@ -117,6 +81,22 @@ return-object v0 .end method +.method public final component2()Ljava/util/List; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Ljava/util/List<", + "Lcom/discord/models/experiments/dto/UserExperimentDto;", + ">;" + } + .end annotation + + iget-object v0, p0, Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto;->assignments:Ljava/util/List; + + return-object v0 +.end method + .method public final copy(Ljava/lang/String;Ljava/util/List;)Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto; .locals 1 .annotation system Ldalvik/annotation/Signature; @@ -190,25 +170,18 @@ return p1 .end method -.method public final getExperimentsByNameHash()Ljava/util/Map; +.method public final getAssignments()Ljava/util/List; .locals 1 .annotation system Ldalvik/annotation/Signature; value = { "()", - "Ljava/util/Map<", - "Ljava/lang/Long;", + "Ljava/util/List<", "Lcom/discord/models/experiments/dto/UserExperimentDto;", ">;" } .end annotation - iget-object v0, p0, Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto;->experimentsByNameHash$delegate:Lkotlin/Lazy; - - invoke-interface {v0}, Lkotlin/Lazy;->getValue()Ljava/lang/Object; - - move-result-object v0 - - check-cast v0, Ljava/util/Map; + iget-object v0, p0, Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto;->assignments:Ljava/util/List; return-object v0 .end method diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication$getShouldShowAgeGate$1.smali b/com.discord/smali/com/discord/stores/StoreAuthentication$getShouldShowAgeGate$1.smali index 48f3a8c70c..efbf263ca9 100644 --- a/com.discord/smali/com/discord/stores/StoreAuthentication$getShouldShowAgeGate$1.smali +++ b/com.discord/smali/com/discord/stores/StoreAuthentication$getShouldShowAgeGate$1.smali @@ -3,7 +3,7 @@ .source "StoreAuthentication.kt" # interfaces -.implements Lrx/functions/Func4; +.implements Lrx/functions/Func3; # annotations @@ -24,17 +24,14 @@ "Ljava/lang/Object;", "T3:", "Ljava/lang/Object;", - "T4:", - "Ljava/lang/Object;", "R:", "Ljava/lang/Object;", ">", "Ljava/lang/Object;", - "Lrx/functions/Func4<", + "Lrx/functions/Func3<", "Lcom/discord/models/domain/ModelUser$Me;", "Ljava/lang/String;", "Lcom/discord/models/domain/ModelChannel;", - "Lcom/discord/stores/StoreExperiments$Experiment;", "Lcom/discord/stores/StoreNavigation$AgeGate;", ">;" } @@ -68,7 +65,7 @@ # virtual methods -.method public final call(Lcom/discord/models/domain/ModelUser$Me;Ljava/lang/String;Lcom/discord/models/domain/ModelChannel;Lcom/discord/stores/StoreExperiments$Experiment;)Lcom/discord/stores/StoreNavigation$AgeGate; +.method public final call(Lcom/discord/models/domain/ModelUser$Me;Ljava/lang/String;Lcom/discord/models/domain/ModelChannel;)Lcom/discord/stores/StoreNavigation$AgeGate; .locals 1 const/4 v0, 0x0 @@ -88,12 +85,6 @@ goto :goto_0 :cond_0 - invoke-virtual {p4}, Lcom/discord/stores/StoreExperiments$Experiment;->getBucket()I - - move-result p1 - - if-ne p1, p2, :cond_1 - if-eqz p3, :cond_1 invoke-virtual {p3}, Lcom/discord/models/domain/ModelChannel;->isNsfw()Z @@ -109,7 +100,7 @@ return-object v0 .end method -.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; +.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .locals 0 check-cast p1, Lcom/discord/models/domain/ModelUser$Me; @@ -118,9 +109,7 @@ check-cast p3, Lcom/discord/models/domain/ModelChannel; - check-cast p4, Lcom/discord/stores/StoreExperiments$Experiment; - - invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/stores/StoreAuthentication$getShouldShowAgeGate$1;->call(Lcom/discord/models/domain/ModelUser$Me;Ljava/lang/String;Lcom/discord/models/domain/ModelChannel;Lcom/discord/stores/StoreExperiments$Experiment;)Lcom/discord/stores/StoreNavigation$AgeGate; + invoke-virtual {p0, p1, p2, p3}, Lcom/discord/stores/StoreAuthentication$getShouldShowAgeGate$1;->call(Lcom/discord/models/domain/ModelUser$Me;Ljava/lang/String;Lcom/discord/models/domain/ModelChannel;)Lcom/discord/stores/StoreNavigation$AgeGate; move-result-object p1 diff --git a/com.discord/smali/com/discord/stores/StoreAuthentication.smali b/com.discord/smali/com/discord/stores/StoreAuthentication.smali index b5c905682d..e75a532ab1 100644 --- a/com.discord/smali/com/discord/stores/StoreAuthentication.smali +++ b/com.discord/smali/com/discord/stores/StoreAuthentication.smali @@ -688,7 +688,7 @@ .end method .method public final getShouldShowAgeGate()Lrx/Observable; - .locals 7 + .locals 4 .annotation system Ldalvik/annotation/Signature; value = { "()", @@ -730,25 +730,9 @@ move-result-object v2 - iget-object v3, p0, Lcom/discord/stores/StoreAuthentication;->storeStream:Lcom/discord/stores/StoreStream; + sget-object v3, Lcom/discord/stores/StoreAuthentication$getShouldShowAgeGate$1;->INSTANCE:Lcom/discord/stores/StoreAuthentication$getShouldShowAgeGate$1; - invoke-virtual {v3}, Lcom/discord/stores/StoreStream;->getExperiments$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreExperiments; - - move-result-object v3 - - const-string v4, "2020-04_nsfw_channel_age_gate" - - const/4 v5, 0x0 - - const/4 v6, 0x2 - - invoke-static {v3, v4, v5, v6, v5}, Lcom/discord/stores/StoreExperiments;->getExperiment$default(Lcom/discord/stores/StoreExperiments;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lrx/Observable; - - move-result-object v3 - - sget-object v4, Lcom/discord/stores/StoreAuthentication$getShouldShowAgeGate$1;->INSTANCE:Lcom/discord/stores/StoreAuthentication$getShouldShowAgeGate$1; - - invoke-static {v0, v1, v2, v3, v4}, Lrx/Observable;->h(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func4;)Lrx/Observable; + invoke-static {v0, v1, v2, v3}, Lrx/Observable;->i(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func3;)Lrx/Observable; move-result-object v0 diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali index 07ae76ec9a..61750bba7c 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, 0x4e9 + const/16 v0, 0x4ea iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I diff --git a/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$2$1.smali b/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$2$1.smali index c44e1b1b1c..09b6205c27 100644 --- a/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$2$1.smali +++ b/com.discord/smali/com/discord/stores/StoreExperiments$tryInitializeExperiments$2$1.smali @@ -60,7 +60,7 @@ .end method .method public final invoke()V - .locals 3 + .locals 6 iget-object v0, p0, Lcom/discord/stores/StoreExperiments$tryInitializeExperiments$2$1;->this$0:Lcom/discord/stores/StoreExperiments$tryInitializeExperiments$2; @@ -86,11 +86,64 @@ iget-object v1, p0, Lcom/discord/stores/StoreExperiments$tryInitializeExperiments$2$1;->$it:Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto; - invoke-virtual {v1}, Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto;->getExperimentsByNameHash()Ljava/util/Map; + invoke-virtual {v1}, Lcom/discord/models/experiments/dto/UnauthenticatedUserExperimentsDto;->getAssignments()Ljava/util/List; move-result-object v1 - invoke-static {v0, v1}, Lcom/discord/stores/StoreExperiments;->access$handleLoadedExperiments(Lcom/discord/stores/StoreExperiments;Ljava/util/Map;)V + const/16 v2, 0xa + + invoke-static {v1, v2}, Lf/h/a/f/e/n/f;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I + + move-result v2 + + invoke-static {v2}, Lf/h/a/f/e/n/f;->mapCapacity(I)I + + move-result v2 + + const/16 v3, 0x10 + + if-ge v2, v3, :cond_0 + + const/16 v2, 0x10 + + :cond_0 + new-instance v3, Ljava/util/LinkedHashMap; + + invoke-direct {v3, v2}, Ljava/util/LinkedHashMap;->(I)V + + invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; + + move-result-object v1 + + :goto_0 + invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z + + move-result v2 + + if-eqz v2, :cond_1 + + invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object; + + move-result-object v2 + + move-object v4, v2 + + check-cast v4, Lcom/discord/models/experiments/dto/UserExperimentDto; + + invoke-virtual {v4}, Lcom/discord/models/experiments/dto/UserExperimentDto;->getNameHash()J + + move-result-wide v4 + + invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v4 + + invoke-interface {v3, v4, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + + goto :goto_0 + + :cond_1 + invoke-static {v0, v3}, Lcom/discord/stores/StoreExperiments;->access$handleLoadedExperiments(Lcom/discord/stores/StoreExperiments;Ljava/util/Map;)V iget-object v0, p0, Lcom/discord/stores/StoreExperiments$tryInitializeExperiments$2$1;->this$0:Lcom/discord/stores/StoreExperiments$tryInitializeExperiments$2; diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali index 94a55a7451..20ce7e07df 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/1257" + const-string v4, "Discord-Android/1258" 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, 0x4e9 + const/16 v2, 0x4ea invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -201,7 +201,7 @@ const-string v3, "client_version" - const-string v4, "40.02" + const-string v4, "40.03" invoke-direct {v2, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V diff --git a/com.discord/smali/com/discord/utilities/birthday/BirthdayHelper.smali b/com.discord/smali/com/discord/utilities/birthday/BirthdayHelper.smali index 430e5acbde..ee923fb794 100644 --- a/com.discord/smali/com/discord/utilities/birthday/BirthdayHelper.smali +++ b/com.discord/smali/com/discord/utilities/birthday/BirthdayHelper.smali @@ -6,8 +6,6 @@ # static fields .field public static final DATE_OF_BIRTH_KEY:Ljava/lang/String; = "date_of_birth" -.field public static final DEFAULT_USER_MIN_AGE:I = 0xd - .field public static final INSTANCE:Lcom/discord/utilities/birthday/BirthdayHelper; .field public static final USER_MIN_AGE_NSFW:I = 0x12 @@ -36,6 +34,18 @@ # virtual methods +.method public final defaultInputAge()J + .locals 2 + + const/16 v0, 0x12 + + invoke-virtual {p0, v0}, Lcom/discord/utilities/birthday/BirthdayHelper;->subtractYearsFromToday(I)J + + move-result-wide v0 + + return-wide v0 +.end method + .method public final getAge(J)I .locals 5 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 2f25b33c63..1163a3e786 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/1257" + const-string v0, "Discord-Android/1258" return-object v0 .end method diff --git a/com.discord/smali/com/discord/views/channelsidebar/GuildChannelSideBarActionsView.smali b/com.discord/smali/com/discord/views/channelsidebar/GuildChannelSideBarActionsView.smali index 01bc034c49..ab1e455288 100644 --- a/com.discord/smali/com/discord/views/channelsidebar/GuildChannelSideBarActionsView.smali +++ b/com.discord/smali/com/discord/views/channelsidebar/GuildChannelSideBarActionsView.smali @@ -87,7 +87,7 @@ .end method .method public constructor (Landroid/content/Context;Landroid/util/AttributeSet;)V - .locals 7 + .locals 8 const-string v0, "context" @@ -143,9 +143,11 @@ const/4 v6, 0x0 + const/4 v7, 0x0 + move-object v0, p0 - invoke-virtual/range {v0 .. v6}, Lcom/discord/views/channelsidebar/GuildChannelSideBarActionsView;->a(Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ZZ)V + invoke-virtual/range {v0 .. v7}, Lcom/discord/views/channelsidebar/GuildChannelSideBarActionsView;->a(Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ZZZ)V return-void .end method @@ -232,7 +234,7 @@ # virtual methods -.method public final a(Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ZZ)V +.method public final a(Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ZZZ)V .locals 4 .annotation system Ldalvik/annotation/Signature; value = { @@ -256,7 +258,7 @@ "-", "Landroid/view/View;", "Lkotlin/Unit;", - ">;ZZ)V" + ">;ZZZ)V" } .end annotation @@ -358,6 +360,14 @@ invoke-virtual {p1, p4}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V + invoke-direct {p0}, Lcom/discord/views/channelsidebar/GuildChannelSideBarActionsView;->getPinsButton()Lcom/google/android/material/button/MaterialButton; + + move-result-object p1 + + xor-int/lit8 p3, p7, 0x1 + + invoke-virtual {p1, p3}, Landroid/widget/Button;->setEnabled(Z)V + invoke-direct {p0}, Lcom/discord/views/channelsidebar/GuildChannelSideBarActionsView;->getNotificationsButtons()Lcom/google/android/material/button/MaterialButton; move-result-object p1 diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$configureBirthdayInput$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$configureBirthdayInput$1.smali index ca0120eaf1..f3cf6136ce 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$configureBirthdayInput$1.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAgeVerify$configureBirthdayInput$1.smali @@ -106,9 +106,7 @@ :cond_0 sget-object p1, Lcom/discord/utilities/birthday/BirthdayHelper;->INSTANCE:Lcom/discord/utilities/birthday/BirthdayHelper; - const/16 v0, 0x12 - - invoke-virtual {p1, v0}, Lcom/discord/utilities/birthday/BirthdayHelper;->subtractYearsFromToday(I)J + invoke-virtual {p1}, Lcom/discord/utilities/birthday/BirthdayHelper;->defaultInputAge()J move-result-wide v4 diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1$$special$$inlined$apply$lambda$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1$$special$$inlined$apply$lambda$1.smali index 8f8b220e15..e095c11dab 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1$$special$$inlined$apply$lambda$1.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1$$special$$inlined$apply$lambda$1.smali @@ -8,7 +8,7 @@ # annotations .annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1;->onClick(Landroid/view/View;)V + value = Lcom/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1;->invoke(Landroid/view/View;)V .end annotation .annotation system Ldalvik/annotation/InnerClass; diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1.smali index d57da3be21..a0fee21a96 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1.smali @@ -1,9 +1,9 @@ .class public final Lcom/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1; -.super Ljava/lang/Object; +.super Lk0/n/c/j; .source "WidgetAuthBirthday.kt" # interfaces -.implements Landroid/view/View$OnClickListener; +.implements Lkotlin/jvm/functions/Function1; # annotations @@ -16,6 +16,16 @@ name = null .end annotation +.annotation system Ldalvik/annotation/Signature; + value = { + "Lk0/n/c/j;", + "Lkotlin/jvm/functions/Function1<", + "Landroid/view/View;", + "Lkotlin/Unit;", + ">;" + } +.end annotation + # instance fields .field public final synthetic this$0:Lcom/discord/widgets/auth/WidgetAuthBirthday; @@ -27,39 +37,57 @@ iput-object p1, p0, Lcom/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/auth/WidgetAuthBirthday; - invoke-direct {p0}, Ljava/lang/Object;->()V + const/4 p1, 0x1 + + invoke-direct {p0, p1}, Lk0/n/c/j;->(I)V return-void .end method # virtual methods -.method public final onClick(Landroid/view/View;)V - .locals 7 +.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 - sget-object v0, Lf/a/a/i;->j:Lf/a/a/i$a; + check-cast p1, Landroid/view/View; + + invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1;->invoke(Landroid/view/View;)V + + sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit; + + return-object p1 +.end method + +.method public final invoke(Landroid/view/View;)V + .locals 8 + + const-string v0, "it" + + invoke-static {p1, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + + sget-object v1, Lf/a/a/i;->j:Lf/a/a/i$a; iget-object p1, p0, Lcom/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/auth/WidgetAuthBirthday; invoke-virtual {p1}, Landroidx/fragment/app/Fragment;->getParentFragmentManager()Landroidx/fragment/app/FragmentManager; - move-result-object v1 + move-result-object v2 const-string p1, "parentFragmentManager" - invoke-static {v1, p1}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v2, p1}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V iget-object p1, p0, Lcom/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/auth/WidgetAuthBirthday; - const v2, 0x7f1200c2 + const v0, 0x7f1200c2 - invoke-virtual {p1, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String; + invoke-virtual {p1, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String; - move-result-object v2 + move-result-object v3 const-string p1, "getString(R.string.age_gate_date_of_birth)" - invoke-static {v2, p1}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v3, p1}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V iget-object p1, p0, Lcom/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/auth/WidgetAuthBirthday; @@ -71,27 +99,25 @@ invoke-virtual {p1}, Ljava/lang/Long;->longValue()J - move-result-wide v3 + move-result-wide v4 goto :goto_0 :cond_0 sget-object p1, Lcom/discord/utilities/birthday/BirthdayHelper;->INSTANCE:Lcom/discord/utilities/birthday/BirthdayHelper; - const/16 v3, 0x12 + invoke-virtual {p1}, Lcom/discord/utilities/birthday/BirthdayHelper;->defaultInputAge()J - invoke-virtual {p1, v3}, Lcom/discord/utilities/birthday/BirthdayHelper;->subtractYearsFromToday(I)J - - move-result-wide v3 + move-result-wide v4 :goto_0 sget-object p1, Lcom/discord/utilities/birthday/BirthdayHelper;->INSTANCE:Lcom/discord/utilities/birthday/BirthdayHelper; invoke-virtual {p1}, Lcom/discord/utilities/birthday/BirthdayHelper;->getMaxDateOfBirth()J - move-result-wide v5 + move-result-wide v6 - invoke-virtual/range {v0 .. v6}, Lf/a/a/i$a;->a(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;JJ)Lf/a/a/i; + invoke-virtual/range {v1 .. v7}, Lf/a/a/i$a;->a(Landroidx/fragment/app/FragmentManager;Ljava/lang/String;JJ)Lf/a/a/i; move-result-object p1 diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2.smali index 95c5ec00bb..59e7bc14aa 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2.smali @@ -58,7 +58,7 @@ iget-object v3, p0, Lcom/discord/widgets/auth/WidgetAuthBirthday$validationManager$2;->this$0:Lcom/discord/widgets/auth/WidgetAuthBirthday; - invoke-static {v3}, Lcom/discord/widgets/auth/WidgetAuthBirthday;->access$getInputWrap$p(Lcom/discord/widgets/auth/WidgetAuthBirthday;)Lcom/google/android/material/textfield/TextInputLayout; + invoke-static {v3}, Lcom/discord/widgets/auth/WidgetAuthBirthday;->access$getInput$p(Lcom/discord/widgets/auth/WidgetAuthBirthday;)Lcom/google/android/material/textfield/TextInputLayout; move-result-object v3 diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday.smali index 725967da99..637d1424d3 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday.smali @@ -34,8 +34,6 @@ .field public final input$delegate:Lkotlin/properties/ReadOnlyProperty; -.field public final inputWrap$delegate:Lkotlin/properties/ReadOnlyProperty; - .field public isConsentRequired:Z .field public password:Ljava/lang/String; @@ -55,7 +53,7 @@ .method public static constructor ()V .locals 5 - const/4 v0, 0x5 + const/4 v0, 0x4 new-array v0, v0, [Lkotlin/reflect/KProperty; @@ -75,20 +73,6 @@ const-class v1, Lcom/discord/widgets/auth/WidgetAuthBirthday; - const-string v2, "inputWrap" - - const-string v3, "getInputWrap()Lcom/google/android/material/textfield/TextInputLayout;" - - invoke-static {v1, v2, v3, v4}, Lf/e/b/a/a;->L(Ljava/lang/Class;Ljava/lang/String;Ljava/lang/String;I)Lk0/n/c/r; - - move-result-object v1 - - const/4 v2, 0x1 - - aput-object v1, v0, v2 - - const-class v1, Lcom/discord/widgets/auth/WidgetAuthBirthday; - const-string v2, "tosOptIn" const-string v3, "getTosOptIn()Landroid/widget/CheckBox;" @@ -97,7 +81,7 @@ move-result-object v1 - const/4 v2, 0x2 + const/4 v2, 0x1 aput-object v1, v0, v2 @@ -111,7 +95,7 @@ move-result-object v1 - const/4 v2, 0x3 + const/4 v2, 0x2 aput-object v1, v0, v2 @@ -125,7 +109,7 @@ move-result-object v1 - const/4 v2, 0x4 + const/4 v2, 0x3 aput-object v1, v0, v2 @@ -143,7 +127,7 @@ .end method .method public constructor ()V - .locals 2 + .locals 1 invoke-direct {p0}, Lcom/discord/app/AppFragment;->()V @@ -151,15 +135,9 @@ invoke-static {p0, v0}, Lk0/j/a;->i(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty; - move-result-object v1 - - iput-object v1, p0, Lcom/discord/widgets/auth/WidgetAuthBirthday;->input$delegate:Lkotlin/properties/ReadOnlyProperty; - - invoke-static {p0, v0}, Lk0/j/a;->i(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty; - move-result-object v0 - iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthBirthday;->inputWrap$delegate:Lkotlin/properties/ReadOnlyProperty; + iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthBirthday;->input$delegate:Lkotlin/properties/ReadOnlyProperty; const v0, 0x7f0a00dc @@ -220,10 +198,10 @@ return-object p0 .end method -.method public static final synthetic access$getInputWrap$p(Lcom/discord/widgets/auth/WidgetAuthBirthday;)Lcom/google/android/material/textfield/TextInputLayout; +.method public static final synthetic access$getInput$p(Lcom/discord/widgets/auth/WidgetAuthBirthday;)Lcom/google/android/material/textfield/TextInputLayout; .locals 0 - invoke-direct {p0}, Lcom/discord/widgets/auth/WidgetAuthBirthday;->getInputWrap()Lcom/google/android/material/textfield/TextInputLayout; + invoke-direct {p0}, Lcom/discord/widgets/auth/WidgetAuthBirthday;->getInput()Lcom/google/android/material/textfield/TextInputLayout; move-result-object p0 @@ -383,26 +361,6 @@ return-object v0 .end method -.method private final getInputWrap()Lcom/google/android/material/textfield/TextInputLayout; - .locals 3 - - iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthBirthday;->inputWrap$delegate:Lkotlin/properties/ReadOnlyProperty; - - sget-object v1, Lcom/discord/widgets/auth/WidgetAuthBirthday;->$$delegatedProperties:[Lkotlin/reflect/KProperty; - - const/4 v2, 0x1 - - aget-object v1, v1, v2 - - invoke-interface {v0, p0, v1}, Lkotlin/properties/ReadOnlyProperty;->getValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object; - - move-result-object v0 - - check-cast v0, Lcom/google/android/material/textfield/TextInputLayout; - - return-object v0 -.end method - .method private final getPolicyLinks()Landroid/widget/TextView; .locals 3 @@ -410,7 +368,7 @@ sget-object v1, Lcom/discord/widgets/auth/WidgetAuthBirthday;->$$delegatedProperties:[Lkotlin/reflect/KProperty; - const/4 v2, 0x3 + const/4 v2, 0x2 aget-object v1, v1, v2 @@ -430,7 +388,7 @@ sget-object v1, Lcom/discord/widgets/auth/WidgetAuthBirthday;->$$delegatedProperties:[Lkotlin/reflect/KProperty; - const/4 v2, 0x4 + const/4 v2, 0x3 aget-object v1, v1, v2 @@ -450,7 +408,7 @@ sget-object v1, Lcom/discord/widgets/auth/WidgetAuthBirthday;->$$delegatedProperties:[Lkotlin/reflect/KProperty; - const/4 v2, 0x2 + const/4 v2, 0x1 aget-object v1, v1, v2 @@ -597,6 +555,36 @@ return-void :cond_1 + invoke-virtual {p1}, Lcom/discord/utilities/error/Error;->getType()Lcom/discord/utilities/error/Error$Type; + + move-result-object v0 + + sget-object v3, Lcom/discord/utilities/error/Error$Type;->RATE_LIMITED:Lcom/discord/utilities/error/Error$Type; + + if-ne v0, v3, :cond_2 + + invoke-virtual {p1, v4}, Lcom/discord/utilities/error/Error;->setShowErrorToasts(Z)V + + :cond_2 + invoke-virtual {p1}, Lcom/discord/utilities/error/Error;->getResponse()Lcom/discord/utilities/error/Error$Response; + + move-result-object v0 + + invoke-static {v0, v1}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v0}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map; + + move-result-object v0 + + invoke-interface {v0}, Ljava/util/Map;->isEmpty()Z + + move-result v0 + + if-eqz v0, :cond_3 + + return-void + + :cond_3 invoke-direct {p0}, Lcom/discord/widgets/auth/WidgetAuthBirthday;->getValidationManager()Lcom/discord/utilities/view/validators/ValidationManager; move-result-object v0 @@ -623,13 +611,13 @@ move-result v1 - if-eqz v1, :cond_2 + if-eqz v1, :cond_4 sget-object v1, Lcom/discord/widgets/auth/WidgetAuthCaptcha;->Companion:Lcom/discord/widgets/auth/WidgetAuthCaptcha$Companion; invoke-virtual {v1, p0}, Lcom/discord/widgets/auth/WidgetAuthCaptcha$Companion;->launch(Lcom/discord/app/AppFragment;)V - :cond_2 + :cond_4 invoke-interface {v0}, Ljava/util/Collection;->isEmpty()Z move-result v0 @@ -896,7 +884,7 @@ invoke-direct {v1, p0}, Lcom/discord/widgets/auth/WidgetAuthBirthday$onViewBoundOrOnResume$1;->(Lcom/discord/widgets/auth/WidgetAuthBirthday;)V - invoke-virtual {v0, v1}, Landroid/widget/LinearLayout;->setOnClickListener(Landroid/view/View$OnClickListener;)V + invoke-static {v0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setOnEditTextClickListener(Lcom/google/android/material/textfield/TextInputLayout;Lkotlin/jvm/functions/Function1;)Lkotlin/Unit; invoke-direct {p0}, Lcom/discord/widgets/auth/WidgetAuthBirthday;->getRegisterButton()Landroid/widget/Button; diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali index 673ff456fd..c3e9701b6a 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali @@ -944,7 +944,7 @@ move-result-object p1 - const-string v0, "2020-04_new_user_age_gate" + const-string v0, "2020-09_new_user_age_gate_android" const/4 v1, 0x0 diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions.smali index 4d6d64b985..9a7050e1e1 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions.smali @@ -97,7 +97,7 @@ .end method .method private final configureUI(Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState;)V - .locals 17 + .locals 18 move-object/from16 v0, p0 @@ -244,7 +244,11 @@ move-result v15 - invoke-virtual/range {v10 .. v16}, Lcom/discord/views/channelsidebar/GuildChannelSideBarActionsView;->a(Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ZZ)V + invoke-virtual {v2}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->getDisablePins()Z + + move-result v17 + + invoke-virtual/range {v10 .. v17}, Lcom/discord/views/channelsidebar/GuildChannelSideBarActionsView;->a(Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ZZZ)V invoke-virtual/range {p0 .. p0}, Landroidx/fragment/app/Fragment;->getView()Landroid/view/View; @@ -365,7 +369,7 @@ new-instance v0, Landroidx/lifecycle/ViewModelProvider; - new-instance v7, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory; + new-instance v9, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory; const/4 v2, 0x0 @@ -373,15 +377,19 @@ const/4 v4, 0x0 - const/4 v5, 0x7 + const/4 v5, 0x0 const/4 v6, 0x0 - move-object v1, v7 + const/16 v7, 0x1f - invoke-direct/range {v1 .. v6}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory;->(Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreUserGuildSettings;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + const/4 v8, 0x0 - invoke-direct {v0, p0, v7}, Landroidx/lifecycle/ViewModelProvider;->(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V + move-object v1, v9 + + invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory;->(Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreUserGuildSettings;Lcom/discord/stores/StoreGuildsNsfw;Lcom/discord/stores/StoreUser;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + + invoke-direct {v0, p0, v9}, Landroidx/lifecycle/ViewModelProvider;->(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V const-class v1, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel; diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1$1.smali index 3381d01ba8..eac5a9ba39 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1$1.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1$1.smali @@ -3,7 +3,7 @@ .source "WidgetChannelSidebarActionsViewModel.kt" # interfaces -.implements Lt0/k/b; +.implements Lrx/functions/Func3; # annotations @@ -18,18 +18,24 @@ .annotation system Ldalvik/annotation/Signature; value = { - "", "Ljava/lang/Object;", - "Lt0/k/b<", + "Lrx/functions/Func3<", "Ljava/util/Map<", "Ljava/lang/Long;", "+", "Lcom/discord/models/domain/ModelNotificationSettings;", ">;", + "Ljava/lang/Boolean;", + "Lcom/discord/models/domain/ModelUser;", "Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;", ">;" } @@ -53,7 +59,7 @@ # virtual methods -.method public final call(Ljava/util/Map;)Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound; +.method public final call(Ljava/util/Map;ZLcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound; .locals 3 .annotation system Ldalvik/annotation/Signature; value = { @@ -62,7 +68,9 @@ "Ljava/lang/Long;", "+", "Lcom/discord/models/domain/ModelNotificationSettings;", - ">;)", + ">;Z", + "Lcom/discord/models/domain/ModelUser;", + ")", "Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;" } .end annotation @@ -71,6 +79,10 @@ invoke-static {p1, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + const-string/jumbo v0, "user" + + invoke-static {p3, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + new-instance v0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound; iget-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1$1;->$channel:Lcom/discord/models/domain/ModelChannel; @@ -85,17 +97,52 @@ check-cast p1, Lcom/discord/models/domain/ModelNotificationSettings; - invoke-direct {v0, v1, p1}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;->(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelNotificationSettings;)V + iget-object v2, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1$1;->$channel:Lcom/discord/models/domain/ModelChannel; + + invoke-virtual {v2}, Lcom/discord/models/domain/ModelChannel;->isNsfw()Z + + move-result v2 + + if-eqz v2, :cond_1 + + if-eqz p2, :cond_0 + + invoke-virtual {p3}, Lcom/discord/models/domain/ModelUser;->getNsfwAllowed()Lcom/discord/models/domain/ModelUser$NsfwAllowance; + + move-result-object p2 + + sget-object p3, Lcom/discord/models/domain/ModelUser$NsfwAllowance;->DISALLOWED:Lcom/discord/models/domain/ModelUser$NsfwAllowance; + + if-ne p2, p3, :cond_1 + + :cond_0 + const/4 p2, 0x1 + + goto :goto_0 + + :cond_1 + const/4 p2, 0x0 + + :goto_0 + invoke-direct {v0, v1, p1, p2}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;->(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelNotificationSettings;Z)V return-object v0 .end method -.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;)Ljava/lang/Object; .locals 0 check-cast p1, Ljava/util/Map; - invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1$1;->call(Ljava/util/Map;)Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound; + check-cast p2, Ljava/lang/Boolean; + + invoke-virtual {p2}, Ljava/lang/Boolean;->booleanValue()Z + + move-result p2 + + check-cast p3, Lcom/discord/models/domain/ModelUser; + + invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1$1;->call(Ljava/util/Map;ZLcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound; move-result-object p1 diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1.smali index fe9863f1bc..f221bf2c0f 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1.smali @@ -64,7 +64,7 @@ .end method .method public final call(Lcom/discord/models/domain/ModelChannel;)Lrx/Observable; - .locals 2 + .locals 4 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -98,11 +98,51 @@ move-result-object v0 - new-instance v1, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1$1; + iget-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1;->this$0:Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory; - invoke-direct {v1, p1}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1$1;->(Lcom/discord/models/domain/ModelChannel;)V + invoke-static {v1}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory;->access$getStoreGuildNSFW$p(Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory;)Lcom/discord/stores/StoreGuildsNsfw; - invoke-virtual {v0, v1}, Lrx/Observable;->E(Lt0/k/b;)Lrx/Observable; + move-result-object v1 + + invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long; + + move-result-object v2 + + const-string v3, "channel.guildId" + + invoke-static {v2, v3}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v2}, Ljava/lang/Long;->longValue()J + + move-result-wide v2 + + invoke-virtual {v1, v2, v3}, Lcom/discord/stores/StoreGuildsNsfw;->isGuildNsfwGateAgreed(J)Z + + move-result v1 + + invoke-static {v1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean; + + move-result-object v1 + + new-instance v2, Lt0/l/e/j; + + invoke-direct {v2, v1}, Lt0/l/e/j;->(Ljava/lang/Object;)V + + iget-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1;->this$0:Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory; + + invoke-static {v1}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory;->access$getStoreUser$p(Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory;)Lcom/discord/stores/StoreUser; + + move-result-object v1 + + invoke-virtual {v1}, Lcom/discord/stores/StoreUser;->observeMe()Lrx/Observable; + + move-result-object v1 + + new-instance v3, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1$1; + + invoke-direct {v3, p1}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory$observeStoreState$1$1;->(Lcom/discord/models/domain/ModelChannel;)V + + invoke-static {v0, v2, v1, v3}, Lrx/Observable;->i(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func3;)Lrx/Observable; move-result-object v0 diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory.smali index f60689471b..71f538548b 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory.smali @@ -20,14 +20,18 @@ # instance fields .field public final storeChannelsSelected:Lcom/discord/stores/StoreChannelsSelected; +.field public final storeGuildNSFW:Lcom/discord/stores/StoreGuildsNsfw; + .field public final storeNavigation:Lcom/discord/stores/StoreNavigation; +.field public final storeUser:Lcom/discord/stores/StoreUser; + .field public final storeUserGuildSettings:Lcom/discord/stores/StoreUserGuildSettings; # direct methods .method public constructor ()V - .locals 6 + .locals 8 const/4 v1, 0x0 @@ -35,18 +39,22 @@ const/4 v3, 0x0 - const/4 v4, 0x7 + const/4 v4, 0x0 const/4 v5, 0x0 + const/16 v6, 0x1f + + const/4 v7, 0x0 + move-object v0, p0 - invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory;->(Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreUserGuildSettings;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + invoke-direct/range {v0 .. v7}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory;->(Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreUserGuildSettings;Lcom/discord/stores/StoreGuildsNsfw;Lcom/discord/stores/StoreUser;ILkotlin/jvm/internal/DefaultConstructorMarker;)V return-void .end method -.method public constructor (Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreUserGuildSettings;)V +.method public constructor (Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreUserGuildSettings;Lcom/discord/stores/StoreGuildsNsfw;Lcom/discord/stores/StoreUser;)V .locals 1 const-string v0, "storeChannelsSelected" @@ -61,6 +69,14 @@ invoke-static {p3, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + const-string v0, "storeGuildNSFW" + + invoke-static {p4, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + + const-string v0, "storeUser" + + invoke-static {p5, v0}, Lk0/n/c/i;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V + invoke-direct {p0}, Ljava/lang/Object;->()V iput-object p1, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory;->storeChannelsSelected:Lcom/discord/stores/StoreChannelsSelected; @@ -69,15 +85,19 @@ iput-object p3, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory;->storeUserGuildSettings:Lcom/discord/stores/StoreUserGuildSettings; + iput-object p4, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory;->storeGuildNSFW:Lcom/discord/stores/StoreGuildsNsfw; + + iput-object p5, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory;->storeUser:Lcom/discord/stores/StoreUser; + return-void .end method -.method public synthetic constructor (Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreUserGuildSettings;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - .locals 0 +.method public synthetic constructor (Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreUserGuildSettings;Lcom/discord/stores/StoreGuildsNsfw;Lcom/discord/stores/StoreUser;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + .locals 3 - and-int/lit8 p5, p4, 0x1 + and-int/lit8 p7, p6, 0x1 - if-eqz p5, :cond_0 + if-eqz p7, :cond_0 sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; @@ -86,9 +106,9 @@ move-result-object p1 :cond_0 - and-int/lit8 p5, p4, 0x2 + and-int/lit8 p7, p6, 0x2 - if-eqz p5, :cond_1 + if-eqz p7, :cond_1 sget-object p2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; @@ -97,22 +117,80 @@ move-result-object p2 :cond_1 - and-int/lit8 p4, p4, 0x4 + move-object p7, p2 - if-eqz p4, :cond_2 + and-int/lit8 p2, p6, 0x4 - sget-object p3, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; + if-eqz p2, :cond_2 - invoke-virtual {p3}, Lcom/discord/stores/StoreStream$Companion;->getUserGuildSettings()Lcom/discord/stores/StoreUserGuildSettings; + sget-object p2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; + + invoke-virtual {p2}, Lcom/discord/stores/StoreStream$Companion;->getUserGuildSettings()Lcom/discord/stores/StoreUserGuildSettings; move-result-object p3 :cond_2 - invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory;->(Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreUserGuildSettings;)V + move-object v0, p3 + + and-int/lit8 p2, p6, 0x8 + + if-eqz p2, :cond_3 + + sget-object p2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; + + invoke-virtual {p2}, Lcom/discord/stores/StoreStream$Companion;->getGuildsNsfw()Lcom/discord/stores/StoreGuildsNsfw; + + move-result-object p4 + + :cond_3 + move-object v1, p4 + + and-int/lit8 p2, p6, 0x10 + + if-eqz p2, :cond_4 + + sget-object p2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; + + invoke-virtual {p2}, Lcom/discord/stores/StoreStream$Companion;->getUsers()Lcom/discord/stores/StoreUser; + + move-result-object p5 + + :cond_4 + move-object v2, p5 + + move-object p2, p0 + + move-object p3, p1 + + move-object p4, p7 + + move-object p5, v0 + + move-object p6, v1 + + move-object p7, v2 + + invoke-direct/range {p2 .. p7}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory;->(Lcom/discord/stores/StoreChannelsSelected;Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreUserGuildSettings;Lcom/discord/stores/StoreGuildsNsfw;Lcom/discord/stores/StoreUser;)V return-void .end method +.method public static final synthetic access$getStoreGuildNSFW$p(Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory;)Lcom/discord/stores/StoreGuildsNsfw; + .locals 0 + + iget-object p0, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory;->storeGuildNSFW:Lcom/discord/stores/StoreGuildsNsfw; + + return-object p0 +.end method + +.method public static final synthetic access$getStoreUser$p(Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory;)Lcom/discord/stores/StoreUser; + .locals 0 + + iget-object p0, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory;->storeUser:Lcom/discord/stores/StoreUser; + + return-object p0 +.end method + .method public static final synthetic access$getStoreUserGuildSettings$p(Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$Factory;)Lcom/discord/stores/StoreUserGuildSettings; .locals 0 diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound.smali index ac213d967a..b56f651f6f 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound.smali @@ -17,11 +17,13 @@ # instance fields .field public final channel:Lcom/discord/models/domain/ModelChannel; +.field public final disablePins:Z + .field public final guildNotificationSettings:Lcom/discord/models/domain/ModelNotificationSettings; # direct methods -.method public constructor (Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelNotificationSettings;)V +.method public constructor (Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelNotificationSettings;Z)V .locals 1 const-string v0, "channel" @@ -36,27 +38,36 @@ iput-object p2, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;->guildNotificationSettings:Lcom/discord/models/domain/ModelNotificationSettings; + iput-boolean p3, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;->disablePins:Z + return-void .end method -.method public static synthetic copy$default(Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelNotificationSettings;ILjava/lang/Object;)Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound; +.method public static synthetic copy$default(Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelNotificationSettings;ZILjava/lang/Object;)Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound; .locals 0 - and-int/lit8 p4, p3, 0x1 + and-int/lit8 p5, p4, 0x1 - if-eqz p4, :cond_0 + if-eqz p5, :cond_0 iget-object p1, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;->channel:Lcom/discord/models/domain/ModelChannel; :cond_0 - and-int/lit8 p3, p3, 0x2 + and-int/lit8 p5, p4, 0x2 - if-eqz p3, :cond_1 + if-eqz p5, :cond_1 iget-object p2, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;->guildNotificationSettings:Lcom/discord/models/domain/ModelNotificationSettings; :cond_1 - invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;->copy(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelNotificationSettings;)Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound; + and-int/lit8 p4, p4, 0x4 + + if-eqz p4, :cond_2 + + iget-boolean p3, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;->disablePins:Z + + :cond_2 + invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;->copy(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelNotificationSettings;Z)Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound; move-result-object p0 @@ -81,7 +92,15 @@ return-object v0 .end method -.method public final copy(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelNotificationSettings;)Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound; +.method public final component3()Z + .locals 1 + + iget-boolean v0, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;->disablePins:Z + + return v0 +.end method + +.method public final copy(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelNotificationSettings;Z)Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound; .locals 1 const-string v0, "channel" @@ -90,7 +109,7 @@ new-instance v0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound; - invoke-direct {v0, p1, p2}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;->(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelNotificationSettings;)V + invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;->(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelNotificationSettings;Z)V return-object v0 .end method @@ -118,13 +137,19 @@ iget-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;->guildNotificationSettings:Lcom/discord/models/domain/ModelNotificationSettings; - iget-object p1, p1, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;->guildNotificationSettings:Lcom/discord/models/domain/ModelNotificationSettings; + iget-object v1, p1, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;->guildNotificationSettings:Lcom/discord/models/domain/ModelNotificationSettings; - invoke-static {v0, p1}, Lk0/n/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z + invoke-static {v0, v1}, Lk0/n/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z - move-result p1 + move-result v0 - if-eqz p1, :cond_0 + if-eqz v0, :cond_0 + + iget-boolean v0, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;->disablePins:Z + + iget-boolean p1, p1, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;->disablePins:Z + + if-ne v0, p1, :cond_0 goto :goto_0 @@ -148,6 +173,14 @@ return-object v0 .end method +.method public final getDisablePins()Z + .locals 1 + + iget-boolean v0, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;->disablePins:Z + + return v0 +.end method + .method public final getGuildNotificationSettings()Lcom/discord/models/domain/ModelNotificationSettings; .locals 1 @@ -188,11 +221,22 @@ :cond_1 add-int/2addr v0, v1 + mul-int/lit8 v0, v0, 0x1f + + iget-boolean v1, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;->disablePins:Z + + if-eqz v1, :cond_2 + + const/4 v1, 0x1 + + :cond_2 + add-int/2addr v0, v1 + return v0 .end method .method public toString()Ljava/lang/String; - .locals 2 + .locals 3 const-string v0, "ChannelFound(channel=" @@ -212,11 +256,15 @@ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - const-string v1, ")" + const-string v1, ", disablePins=" invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + iget-boolean v1, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;->disablePins:Z + + const-string v2, ")" + + invoke-static {v0, v1, v2}, Lf/e/b/a/a;->A(Ljava/lang/StringBuilder;ZLjava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild.smali index 300261286e..49f8713920 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild.smali @@ -17,6 +17,8 @@ # instance fields .field public final channelId:J +.field public final disablePins:Z + .field public final guildId:J .field public final hasUnreadPins:Z @@ -25,7 +27,7 @@ # direct methods -.method public constructor (JJZZ)V +.method public constructor (JJZZZ)V .locals 1 const/4 v0, 0x0 @@ -40,55 +42,91 @@ iput-boolean p6, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->hasUnreadPins:Z + iput-boolean p7, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->disablePins:Z + return-void .end method -.method public static synthetic copy$default(Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;JJZZILjava/lang/Object;)Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild; - .locals 7 +.method public static synthetic copy$default(Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;JJZZZILjava/lang/Object;)Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild; + .locals 8 - and-int/lit8 p8, p7, 0x1 + move-object v0, p0 - if-eqz p8, :cond_0 + and-int/lit8 v1, p8, 0x1 - iget-wide p1, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->channelId:J + if-eqz v1, :cond_0 + + iget-wide v1, v0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->channelId:J + + goto :goto_0 :cond_0 move-wide v1, p1 - and-int/lit8 p1, p7, 0x2 + :goto_0 + and-int/lit8 v3, p8, 0x2 - if-eqz p1, :cond_1 + if-eqz v3, :cond_1 - iget-wide p3, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->guildId:J + iget-wide v3, v0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->guildId:J + + goto :goto_1 :cond_1 move-wide v3, p3 - and-int/lit8 p1, p7, 0x4 + :goto_1 + and-int/lit8 v5, p8, 0x4 - if-eqz p1, :cond_2 + if-eqz v5, :cond_2 - iget-boolean p5, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->isMuted:Z + iget-boolean v5, v0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->isMuted:Z + + goto :goto_2 :cond_2 move v5, p5 - and-int/lit8 p1, p7, 0x8 + :goto_2 + and-int/lit8 v6, p8, 0x8 - if-eqz p1, :cond_3 + if-eqz v6, :cond_3 - iget-boolean p6, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->hasUnreadPins:Z + iget-boolean v6, v0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->hasUnreadPins:Z + + goto :goto_3 :cond_3 move v6, p6 - move-object v0, p0 + :goto_3 + and-int/lit8 v7, p8, 0x10 - invoke-virtual/range {v0 .. v6}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->copy(JJZZ)Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild; + if-eqz v7, :cond_4 - move-result-object p0 + iget-boolean v7, v0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->disablePins:Z - return-object p0 + goto :goto_4 + + :cond_4 + move v7, p7 + + :goto_4 + move-wide p1, v1 + + move-wide p3, v3 + + move p5, v5 + + move p6, v6 + + move p7, v7 + + invoke-virtual/range {p0 .. p7}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->copy(JJZZZ)Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild; + + move-result-object v0 + + return-object v0 .end method @@ -125,12 +163,20 @@ return v0 .end method -.method public final copy(JJZZ)Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild; - .locals 8 +.method public final component5()Z + .locals 1 - new-instance v7, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild; + iget-boolean v0, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->disablePins:Z - move-object v0, v7 + return v0 +.end method + +.method public final copy(JJZZZ)Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild; + .locals 9 + + new-instance v8, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild; + + move-object v0, v8 move-wide v1, p1 @@ -140,9 +186,11 @@ move v6, p6 - invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->(JJZZ)V + move/from16 v7, p7 - return-object v7 + invoke-direct/range {v0 .. v7}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->(JJZZZ)V + + return-object v8 .end method .method public equals(Ljava/lang/Object;)Z @@ -180,7 +228,13 @@ iget-boolean v0, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->hasUnreadPins:Z - iget-boolean p1, p1, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->hasUnreadPins:Z + iget-boolean v1, p1, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->hasUnreadPins:Z + + if-ne v0, v1, :cond_0 + + iget-boolean v0, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->disablePins:Z + + iget-boolean p1, p1, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->disablePins:Z if-ne v0, p1, :cond_0 @@ -206,6 +260,14 @@ return-wide v0 .end method +.method public final getDisablePins()Z + .locals 1 + + iget-boolean v0, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->disablePins:Z + + return v0 +.end method + .method public final getGuildId()J .locals 2 @@ -260,9 +322,20 @@ if-eqz v1, :cond_1 - goto :goto_0 + const/4 v1, 0x1 :cond_1 + add-int/2addr v0, v1 + + mul-int/lit8 v0, v0, 0x1f + + iget-boolean v1, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->disablePins:Z + + if-eqz v1, :cond_2 + + goto :goto_0 + + :cond_2 move v2, v1 :goto_0 @@ -314,6 +387,14 @@ iget-boolean v1, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->hasUnreadPins:Z + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder; + + const-string v1, ", disablePins=" + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + iget-boolean v1, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->disablePins:Z + const-string v2, ")" invoke-static {v0, v1, v2}, Lf/e/b/a/a;->A(Ljava/lang/StringBuilder;ZLjava/lang/String;)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel.smali index 4061761d68..c5e14fa9fc 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActionsViewModel.smali @@ -81,7 +81,7 @@ .end method .method private final handleStoreState(Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState;)V - .locals 10 + .locals 11 sget-object v0, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelNotFound;->INSTANCE:Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelNotFound; @@ -241,21 +241,21 @@ invoke-virtual {p1}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;->getGuildNotificationSettings()Lcom/discord/models/domain/ModelNotificationSettings; - move-result-object p1 + move-result-object v0 - if-eqz p1, :cond_6 + if-eqz v0, :cond_6 - invoke-virtual {p1, v4, v5}, Lcom/discord/models/domain/ModelNotificationSettings;->getChannelOverride(J)Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride; + invoke-virtual {v0, v4, v5}, Lcom/discord/models/domain/ModelNotificationSettings;->getChannelOverride(J)Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride; - move-result-object p1 + move-result-object v0 - if-eqz p1, :cond_6 + if-eqz v0, :cond_6 - invoke-virtual {p1}, Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;->isMuted()Z + invoke-virtual {v0}, Lcom/discord/models/domain/ModelNotificationSettings$ChannelOverride;->isMuted()Z - move-result p1 + move-result v0 - if-ne p1, v2, :cond_6 + if-ne v0, v2, :cond_6 const/4 v8, 0x1 @@ -265,13 +265,17 @@ const/4 v8, 0x0 :goto_2 + invoke-virtual {p1}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$StoreState$ChannelFound;->getDisablePins()Z + + move-result v10 + new-instance p1, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild; const/4 v9, 0x0 move-object v3, p1 - invoke-direct/range {v3 .. v9}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->(JJZZ)V + invoke-direct/range {v3 .. v10}, Lcom/discord/widgets/channels/WidgetChannelSidebarActionsViewModel$ViewState$Guild;->(JJZZZ)V invoke-virtual {p0, p1}, Lf/a/b/q0;->updateViewState(Ljava/lang/Object;)V diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali index 87a57b63fb..cb87f10469 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, "40.02" + const-string v4, "40.03" aput-object v4, v2, v3 diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHomeModel$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/home/WidgetHomeModel$Companion$get$1.smali index ab1652dd2a..84591f2b22 100644 --- a/com.discord/smali/com/discord/widgets/home/WidgetHomeModel$Companion$get$1.smali +++ b/com.discord/smali/com/discord/widgets/home/WidgetHomeModel$Companion$get$1.smali @@ -3,7 +3,7 @@ .source "WidgetHomeModel.kt" # interfaces -.implements Lrx/functions/Func8; +.implements Lrx/functions/Func7; # annotations @@ -32,13 +32,11 @@ "Ljava/lang/Object;", "T7:", "Ljava/lang/Object;", - "T8:", - "Ljava/lang/Object;", "R:", "Ljava/lang/Object;", ">", "Ljava/lang/Object;", - "Lrx/functions/Func8<", + "Lrx/functions/Func7<", "Lcom/discord/models/domain/ModelUser;", "Lcom/discord/models/domain/ModelChannel;", "Ljava/util/Map<", @@ -54,7 +52,6 @@ "Ljava/lang/Integer;", ">;", "Ljava/lang/Boolean;", - "Lcom/discord/stores/StoreExperiments$Experiment;", "Lcom/discord/widgets/home/WidgetHomeModel;", ">;" } @@ -88,8 +85,8 @@ # virtual methods -.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/lang/Long;Ljava/lang/Integer;Ljava/util/Map;Ljava/lang/Boolean;Lcom/discord/stores/StoreExperiments$Experiment;)Lcom/discord/widgets/home/WidgetHomeModel; - .locals 12 +.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/lang/Long;Ljava/lang/Integer;Ljava/util/Map;Ljava/lang/Boolean;)Lcom/discord/widgets/home/WidgetHomeModel; + .locals 11 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -106,7 +103,6 @@ "Ljava/lang/Integer;", ">;", "Ljava/lang/Boolean;", - "Lcom/discord/stores/StoreExperiments$Experiment;", ")", "Lcom/discord/widgets/home/WidgetHomeModel;" } @@ -150,17 +146,17 @@ move-result-object v2 - move-object/from16 v4, p4 + move-object v4, p4 goto :goto_1 :cond_1 - move-object/from16 v4, p4 + move-object v4, p4 move-object v2, v3 :goto_1 - invoke-static {v4, v2}, Lk0/n/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z + invoke-static {p4, v2}, Lk0/n/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z move-result v2 @@ -260,9 +256,9 @@ const-string v0, "isVideoSupported" - move-object/from16 v8, p7 + move-object/from16 v1, p7 - invoke-static {v8, v0}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v1, v0}, Lk0/n/c/i;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V invoke-virtual/range {p7 .. p7}, Ljava/lang/Boolean;->booleanValue()Z @@ -282,27 +278,9 @@ move-object v9, v3 :goto_6 - invoke-virtual/range {p8 .. p8}, Lcom/discord/stores/StoreExperiments$Experiment;->getBucket()I + new-instance v10, Lcom/discord/widgets/home/WidgetHomeModel; - move-result v0 - - if-ne v0, v1, :cond_7 - - const/4 v0, 0x1 - - const/4 v10, 0x1 - - goto :goto_7 - - :cond_7 - const/4 v0, 0x0 - - const/4 v10, 0x0 - - :goto_7 - new-instance v11, Lcom/discord/widgets/home/WidgetHomeModel; - - move-object v0, v11 + move-object v0, v10 move v1, v2 @@ -318,14 +296,12 @@ move-object v8, v9 - move v9, v10 + invoke-direct/range {v0 .. v8}, Lcom/discord/widgets/home/WidgetHomeModel;->(ILcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelPresence;IZZZLcom/discord/models/domain/ModelUser$NsfwAllowance;)V - invoke-direct/range {v0 .. v9}, Lcom/discord/widgets/home/WidgetHomeModel;->(ILcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelPresence;IZZZLcom/discord/models/domain/ModelUser$NsfwAllowance;Z)V - - return-object v11 + return-object v10 .end method -.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; +.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .locals 0 check-cast p1, Lcom/discord/models/domain/ModelUser; @@ -342,9 +318,7 @@ check-cast p7, Ljava/lang/Boolean; - check-cast p8, Lcom/discord/stores/StoreExperiments$Experiment; - - invoke-virtual/range {p0 .. p8}, Lcom/discord/widgets/home/WidgetHomeModel$Companion$get$1;->call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/lang/Long;Ljava/lang/Integer;Ljava/util/Map;Ljava/lang/Boolean;Lcom/discord/stores/StoreExperiments$Experiment;)Lcom/discord/widgets/home/WidgetHomeModel; + invoke-virtual/range {p0 .. p7}, Lcom/discord/widgets/home/WidgetHomeModel$Companion$get$1;->call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/lang/Long;Ljava/lang/Integer;Ljava/util/Map;Ljava/lang/Boolean;)Lcom/discord/widgets/home/WidgetHomeModel; move-result-object p1 diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHomeModel$Companion.smali b/com.discord/smali/com/discord/widgets/home/WidgetHomeModel$Companion.smali index 8b10bcb354..97a894aba7 100644 --- a/com.discord/smali/com/discord/widgets/home/WidgetHomeModel$Companion.smali +++ b/com.discord/smali/com/discord/widgets/home/WidgetHomeModel$Companion.smali @@ -34,7 +34,7 @@ # virtual methods .method public final get()Lrx/Observable; - .locals 13 + .locals 12 .annotation system Ldalvik/annotation/Signature; value = { "()", @@ -114,29 +114,13 @@ move-result-object v7 - sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; + sget-object v8, Lcom/discord/widgets/home/WidgetHomeModel$Companion$get$1;->INSTANCE:Lcom/discord/widgets/home/WidgetHomeModel$Companion$get$1; - invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getExperiments()Lcom/discord/stores/StoreExperiments; + sget-object v11, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit; - move-result-object v0 + const-wide/16 v9, 0x15e - const-string v8, "2020-04_nsfw_channel_age_gate" - - const/4 v9, 0x0 - - const/4 v10, 0x2 - - invoke-static {v0, v8, v9, v10, v9}, Lcom/discord/stores/StoreExperiments;->getExperiment$default(Lcom/discord/stores/StoreExperiments;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lrx/Observable; - - move-result-object v8 - - sget-object v9, Lcom/discord/widgets/home/WidgetHomeModel$Companion$get$1;->INSTANCE:Lcom/discord/widgets/home/WidgetHomeModel$Companion$get$1; - - sget-object v12, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit; - - const-wide/16 v10, 0x15e - - invoke-static/range {v1 .. v12}, Lcom/discord/utilities/rx/ObservableWithLeadingEdgeThrottle;->combineLatest(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func8;JLjava/util/concurrent/TimeUnit;)Lrx/Observable; + invoke-static/range {v1 .. v11}, Lcom/discord/utilities/rx/ObservableWithLeadingEdgeThrottle;->combineLatest(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func7;JLjava/util/concurrent/TimeUnit;)Lrx/Observable; move-result-object v0 diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHomeModel.smali b/com.discord/smali/com/discord/widgets/home/WidgetHomeModel.smali index 0532b913ba..65a33912d9 100644 --- a/com.discord/smali/com/discord/widgets/home/WidgetHomeModel.smali +++ b/com.discord/smali/com/discord/widgets/home/WidgetHomeModel.smali @@ -26,8 +26,6 @@ .field public final isFriend:Z -.field public final isInNSFWAgeGateExperiment:Z - .field public final isVideoSupported:Z .field public final nsfwAllowed:Lcom/discord/models/domain/ModelUser$NsfwAllowance; @@ -52,7 +50,7 @@ return-void .end method -.method public constructor (ILcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelPresence;IZZZLcom/discord/models/domain/ModelUser$NsfwAllowance;Z)V +.method public constructor (ILcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelPresence;IZZZLcom/discord/models/domain/ModelUser$NsfwAllowance;)V .locals 0 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -73,17 +71,15 @@ iput-object p8, p0, Lcom/discord/widgets/home/WidgetHomeModel;->nsfwAllowed:Lcom/discord/models/domain/ModelUser$NsfwAllowance; - iput-boolean p9, p0, Lcom/discord/widgets/home/WidgetHomeModel;->isInNSFWAgeGateExperiment:Z - return-void .end method -.method public static synthetic copy$default(Lcom/discord/widgets/home/WidgetHomeModel;ILcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelPresence;IZZZLcom/discord/models/domain/ModelUser$NsfwAllowance;ZILjava/lang/Object;)Lcom/discord/widgets/home/WidgetHomeModel; - .locals 10 +.method public static synthetic copy$default(Lcom/discord/widgets/home/WidgetHomeModel;ILcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelPresence;IZZZLcom/discord/models/domain/ModelUser$NsfwAllowance;ILjava/lang/Object;)Lcom/discord/widgets/home/WidgetHomeModel; + .locals 9 move-object v0, p0 - move/from16 v1, p10 + move/from16 v1, p9 and-int/lit8 v2, v1, 0x1 @@ -154,7 +150,7 @@ goto :goto_5 :cond_5 - move/from16 v7, p6 + move v7, p6 :goto_5 and-int/lit8 v8, v1, 0x40 @@ -169,30 +165,18 @@ move/from16 v8, p7 :goto_6 - and-int/lit16 v9, v1, 0x80 + and-int/lit16 v1, v1, 0x80 - if-eqz v9, :cond_7 + if-eqz v1, :cond_7 - iget-object v9, v0, Lcom/discord/widgets/home/WidgetHomeModel;->nsfwAllowed:Lcom/discord/models/domain/ModelUser$NsfwAllowance; + iget-object v1, v0, Lcom/discord/widgets/home/WidgetHomeModel;->nsfwAllowed:Lcom/discord/models/domain/ModelUser$NsfwAllowance; goto :goto_7 :cond_7 - move-object/from16 v9, p8 + move-object/from16 v1, p8 :goto_7 - and-int/lit16 v1, v1, 0x100 - - if-eqz v1, :cond_8 - - iget-boolean v1, v0, Lcom/discord/widgets/home/WidgetHomeModel;->isInNSFWAgeGateExperiment:Z - - goto :goto_8 - - :cond_8 - move/from16 v1, p9 - - :goto_8 move p1, v2 move-object p2, v3 @@ -203,15 +187,13 @@ move p5, v6 - move/from16 p6, v7 + move p6, v7 move/from16 p7, v8 - move-object/from16 p8, v9 + move-object/from16 p8, v1 - move/from16 p9, v1 - - invoke-virtual/range {p0 .. p9}, Lcom/discord/widgets/home/WidgetHomeModel;->copy(ILcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelPresence;IZZZLcom/discord/models/domain/ModelUser$NsfwAllowance;Z)Lcom/discord/widgets/home/WidgetHomeModel; + invoke-virtual/range {p0 .. p8}, Lcom/discord/widgets/home/WidgetHomeModel;->copy(ILcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelPresence;IZZZLcom/discord/models/domain/ModelUser$NsfwAllowance;)Lcom/discord/widgets/home/WidgetHomeModel; move-result-object v0 @@ -284,20 +266,12 @@ return-object v0 .end method -.method public final component9()Z - .locals 1 +.method public final copy(ILcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelPresence;IZZZLcom/discord/models/domain/ModelUser$NsfwAllowance;)Lcom/discord/widgets/home/WidgetHomeModel; + .locals 10 - iget-boolean v0, p0, Lcom/discord/widgets/home/WidgetHomeModel;->isInNSFWAgeGateExperiment:Z + new-instance v9, Lcom/discord/widgets/home/WidgetHomeModel; - return v0 -.end method - -.method public final copy(ILcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelPresence;IZZZLcom/discord/models/domain/ModelUser$NsfwAllowance;Z)Lcom/discord/widgets/home/WidgetHomeModel; - .locals 11 - - new-instance v10, Lcom/discord/widgets/home/WidgetHomeModel; - - move-object v0, v10 + move-object v0, v9 move v1, p1 @@ -307,7 +281,7 @@ move v4, p4 - move/from16 v5, p5 + move v5, p5 move/from16 v6, p6 @@ -315,11 +289,9 @@ move-object/from16 v8, p8 - move/from16 v9, p9 + invoke-direct/range {v0 .. v8}, Lcom/discord/widgets/home/WidgetHomeModel;->(ILcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelPresence;IZZZLcom/discord/models/domain/ModelUser$NsfwAllowance;)V - invoke-direct/range {v0 .. v9}, Lcom/discord/widgets/home/WidgetHomeModel;->(ILcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelPresence;IZZZLcom/discord/models/domain/ModelUser$NsfwAllowance;Z)V - - return-object v10 + return-object v9 .end method .method public equals(Ljava/lang/Object;)Z @@ -385,19 +357,13 @@ iget-object v0, p0, Lcom/discord/widgets/home/WidgetHomeModel;->nsfwAllowed:Lcom/discord/models/domain/ModelUser$NsfwAllowance; - iget-object v1, p1, Lcom/discord/widgets/home/WidgetHomeModel;->nsfwAllowed:Lcom/discord/models/domain/ModelUser$NsfwAllowance; + iget-object p1, p1, Lcom/discord/widgets/home/WidgetHomeModel;->nsfwAllowed:Lcom/discord/models/domain/ModelUser$NsfwAllowance; - invoke-static {v0, v1}, Lk0/n/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z + invoke-static {v0, p1}, Lk0/n/c/i;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z - move-result v0 + move-result p1 - if-eqz v0, :cond_0 - - iget-boolean v0, p0, Lcom/discord/widgets/home/WidgetHomeModel;->isInNSFWAgeGateExperiment:Z - - iget-boolean p1, p1, Lcom/discord/widgets/home/WidgetHomeModel;->isInNSFWAgeGateExperiment:Z - - if-ne v0, p1, :cond_0 + if-eqz p1, :cond_0 goto :goto_0 @@ -552,10 +518,13 @@ if-eqz v1, :cond_4 - const/4 v1, 0x1 + goto :goto_2 :cond_4 - add-int/2addr v0, v1 + move v3, v1 + + :goto_2 + add-int/2addr v0, v3 mul-int/lit8 v0, v0, 0x1f @@ -570,20 +539,6 @@ :cond_5 add-int/2addr v0, v2 - mul-int/lit8 v0, v0, 0x1f - - iget-boolean v1, p0, Lcom/discord/widgets/home/WidgetHomeModel;->isInNSFWAgeGateExperiment:Z - - if-eqz v1, :cond_6 - - goto :goto_2 - - :cond_6 - move v3, v1 - - :goto_2 - add-int/2addr v0, v3 - return v0 .end method @@ -627,14 +582,6 @@ return v0 .end method -.method public final isInNSFWAgeGateExperiment()Z - .locals 1 - - iget-boolean v0, p0, Lcom/discord/widgets/home/WidgetHomeModel;->isInNSFWAgeGateExperiment:Z - - return v0 -.end method - .method public final isNsfwUnConsented()Z .locals 3 @@ -688,7 +635,7 @@ .end method .method public toString()Ljava/lang/String; - .locals 3 + .locals 2 const-string v0, "WidgetHomeModel(type=" @@ -756,15 +703,11 @@ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - const-string v1, ", isInNSFWAgeGateExperiment=" + const-string v1, ")" invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - iget-boolean v1, p0, Lcom/discord/widgets/home/WidgetHomeModel;->isInNSFWAgeGateExperiment:Z - - const-string v2, ")" - - invoke-static {v0, v1, v2}, Lf/e/b/a/a;->A(Ljava/lang/StringBuilder;ZLjava/lang/String;)Ljava/lang/String; + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object v0 diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHomePanelNsfw$toggleContainerVisibility$1$1.smali b/com.discord/smali/com/discord/widgets/home/WidgetHomePanelNsfw$toggleContainerVisibility$1$1.smali index 0ae341c143..86ec745e1a 100644 --- a/com.discord/smali/com/discord/widgets/home/WidgetHomePanelNsfw$toggleContainerVisibility$1$1.smali +++ b/com.discord/smali/com/discord/widgets/home/WidgetHomePanelNsfw$toggleContainerVisibility$1$1.smali @@ -8,7 +8,7 @@ # annotations .annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/widgets/home/WidgetHomePanelNsfw;->toggleContainerVisibility(ZZLcom/discord/models/domain/ModelUser$NsfwAllowance;Z)V + value = Lcom/discord/widgets/home/WidgetHomePanelNsfw;->toggleContainerVisibility(ZZLcom/discord/models/domain/ModelUser$NsfwAllowance;)V .end annotation .annotation system Ldalvik/annotation/InnerClass; diff --git a/com.discord/smali/com/discord/widgets/home/WidgetHomePanelNsfw.smali b/com.discord/smali/com/discord/widgets/home/WidgetHomePanelNsfw.smali index d4d079b183..bcbdfa9756 100644 --- a/com.discord/smali/com/discord/widgets/home/WidgetHomePanelNsfw.smali +++ b/com.discord/smali/com/discord/widgets/home/WidgetHomePanelNsfw.smali @@ -246,7 +246,7 @@ return-void .end method -.method private final toggleContainerVisibility(ZZLcom/discord/models/domain/ModelUser$NsfwAllowance;Z)V +.method private final toggleContainerVisibility(ZZLcom/discord/models/domain/ModelUser$NsfwAllowance;)V .locals 10 sget-object v0, Lcom/discord/models/domain/ModelUser$NsfwAllowance;->DISALLOWED:Lcom/discord/models/domain/ModelUser$NsfwAllowance; @@ -257,8 +257,6 @@ if-ne p3, v0, :cond_0 - if-eqz p4, :cond_0 - const/4 p3, 0x1 goto :goto_0 @@ -409,21 +407,21 @@ const p3, 0x7f1200ce - new-array p4, v1, [Ljava/lang/Object; + new-array v0, v1, [Ljava/lang/Object; - sget-object v0, Lf/a/b/g;->a:Lf/a/b/g; + sget-object v1, Lf/a/b/g;->a:Lf/a/b/g; const-wide v4, 0x1ac68a0653L - const-string v1, "h_5206f3f2-0ee4-4380-b50a-25319e45bc7c" + const-string v6, "h_5206f3f2-0ee4-4380-b50a-25319e45bc7c" - invoke-virtual {v0, v4, v5, v1}, Lf/a/b/g;->a(JLjava/lang/String;)Ljava/lang/String; + invoke-virtual {v1, v4, v5, v6}, Lf/a/b/g;->a(JLjava/lang/String;)Ljava/lang/String; - move-result-object v0 + move-result-object v1 - aput-object v0, p4, v2 + aput-object v1, v0, v2 - invoke-static {p1, p3, p4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String; + invoke-static {p1, p3, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String; move-result-object v4 @@ -446,8 +444,6 @@ goto :goto_1 :cond_7 - if-eqz p4, :cond_9 - iget-object p1, p0, Lcom/discord/widgets/home/WidgetHomePanelNsfw;->guildsNsfwDescriptionView:Landroid/widget/TextView; if-eqz p1, :cond_9 @@ -476,9 +472,9 @@ iget-object p2, p0, Lcom/discord/widgets/home/WidgetHomePanelNsfw;->guildsNsfwHideRunnable:Ljava/lang/Runnable; - const-wide/16 p3, 0x1f4 + const-wide/16 v0, 0x1f4 - invoke-virtual {p1, p2, p3, p4}, Landroid/os/Handler;->postDelayed(Ljava/lang/Runnable;J)Z + invoke-virtual {p1, p2, v0, v1}, Landroid/os/Handler;->postDelayed(Ljava/lang/Runnable;J)Z :goto_2 return-void @@ -487,7 +483,7 @@ # virtual methods .method public final configureUI(Lcom/discord/widgets/home/WidgetHomeModel;)V - .locals 4 + .locals 3 .annotation build Landroidx/annotation/UiThread; .end annotation @@ -513,11 +509,7 @@ move-result-object v2 - invoke-virtual {p1}, Lcom/discord/widgets/home/WidgetHomeModel;->isInNSFWAgeGateExperiment()Z - - move-result v3 - - invoke-direct {p0, v0, v1, v2, v3}, Lcom/discord/widgets/home/WidgetHomePanelNsfw;->toggleContainerVisibility(ZZLcom/discord/models/domain/ModelUser$NsfwAllowance;Z)V + invoke-direct {p0, v0, v1, v2}, Lcom/discord/widgets/home/WidgetHomePanelNsfw;->toggleContainerVisibility(ZZLcom/discord/models/domain/ModelUser$NsfwAllowance;)V iget-object v0, p0, Lcom/discord/widgets/home/WidgetHomePanelNsfw;->guildsNsfwRejectView:Landroid/widget/Button; 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 f62647b04d..a8df0faea9 100644 --- a/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali +++ b/com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali @@ -1902,7 +1902,7 @@ invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v0, " - 40.02 (1257)" + const-string v0, " - 40.03 (1258)" invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;