From cf781bb890fc83968b55862b419fc38a2c13ec65 Mon Sep 17 00:00:00 2001 From: Juby210 Date: Sat, 13 Nov 2021 08:27:05 +0100 Subject: [PATCH] 102.5 - Alpha (102205) --- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 2 +- .../events/TrackGuildMemberUpdated.java | 25 +- .../TrackGuildScheduledEventReported.java | 71 + ...ckGuildScheduledEventReportedReceiver.java | 6 + .../events/TrackMessageReported.java | 15 +- .../generated/events/TrackOpenPopout.java | 30 +- .../events/TrackSettingsPaneViewed.java | 5 +- .../traits/TrackEntitlementMetadata.java | 15 +- .../com/discord/api/channel/ChannelUtils.java | 4 +- .../java/com/discord/api/guild/Guild.java | 25 +- .../com/discord/api/role/GuildRoleTags.java | 21 +- ...rSettingsInstantInviteListItemBinding.java | 6 +- .../stores/StoreEmbeddedActivities.java | 7 +- .../channel/GuildChannelIconType.java | 9 + .../channel/GuildChannelIconUtilsKt.java | 6 + .../discord/utilities/guilds/RoleUtils.java | 6 + ...ListBuilder$$inlined$forEach$lambda$2.java | 14 +- .../WidgetChannelsList$onViewBound$4.java | 2 +- .../WidgetChannelsList$onViewBound$9.java | 2 +- .../widgets/chat/list/InlineMediaView.java | 8 +- .../WidgetChatListAdapterItemStart.java | 20 +- .../chat/list/entries/StartOfChatEntry.java | 46 +- ...tModelTop$Companion$getWelcomeEntry$2.java | 3 +- ...ldRoleSubscriptionEntryPointViewModel.java | 2 +- ...dRoleSubscriptionPlanDetailsViewModel.java | 2 +- .../guilds/create/WidgetGuildClone.java | 16 +- .../guilds/create/WidgetGuildCreate.java | 2 +- ...em$onConfigure$$inlined$doOnPreDraw$1.java | 18 + ...tServerSettingsInstantInvitesListItem.java | 66 +- .../widgets/settings/WidgetSettings.java | 2 +- ...et_guild_role_subscription_plan_format.xml | 4 +- ...settings_empty_guild_role_subscription.xml | 2 +- .../main/res/layout-v22/widget_user_sheet.xml | 2 +- .../widget_chat_list_adapter_item_start.xml | 2 +- ...et_guild_role_subscription_plan_format.xml | 4 +- .../res/layout/widget_server_settings.xml | 2 +- ...settings_empty_guild_role_subscription.xml | 2 +- ...rver_settings_instant_invite_list_item.xml | 30 +- app/src/main/res/layout/widget_user_sheet.xml | 2 +- app/src/main/res/values-ar-rXB/strings.xml | 27 +- app/src/main/res/values-bg/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 1 - app/src/main/res/values-da/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-el/strings.xml | 1 - app/src/main/res/values-en-rXA/strings.xml | 27 +- app/src/main/res/values-es-rES/strings.xml | 1 - app/src/main/res/values-fi/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-hi/strings.xml | 1 - app/src/main/res/values-hr/strings.xml | 1 - app/src/main/res/values-hu/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-ja/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-lt/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 1 - app/src/main/res/values-no/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-pt-rBR/strings.xml | 1 - app/src/main/res/values-ro/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-sv-rSE/strings.xml | 1 - app/src/main/res/values-th/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 1 - app/src/main/res/values-uk/strings.xml | 1 - app/src/main/res/values-vi/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 1 - app/src/main/res/values/public.xml | 18327 ++++++++-------- app/src/main/res/values/strings.xml | 29 +- 72 files changed, 9603 insertions(+), 9345 deletions(-) create mode 100644 app/src/main/java/com/discord/analytics/generated/events/TrackGuildScheduledEventReported.java create mode 100644 app/src/main/java/com/discord/analytics/generated/events/TrackGuildScheduledEventReportedReceiver.java create mode 100644 app/src/main/java/com/discord/widgets/servers/settings/invites/WidgetServerSettingsInstantInvitesListItem$onConfigure$$inlined$doOnPreDraw$1.java diff --git a/app/build.gradle b/app/build.gradle index 98d2d55974..a82123c4ac 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 30 - versionCode 102204 - versionName "102.4 - Alpha" + versionCode 102205 + versionName "102.5 - Alpha" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8d72f773c9..6ca2cd2576 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackGuildMemberUpdated.java b/app/src/main/java/com/discord/analytics/generated/events/TrackGuildMemberUpdated.java index c2292a32d9..9013eab003 100644 --- a/app/src/main/java/com/discord/analytics/generated/events/TrackGuildMemberUpdated.java +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackGuildMemberUpdated.java @@ -10,6 +10,8 @@ import java.util.List; public final class TrackGuildMemberUpdated implements AnalyticsSchema, TrackBaseReceiver { private final transient String analyticsSchemaTypeName = "guild_member_updated"; private final CharSequence avatarUpdateType = null; + private final CharSequence bannerUpdateType = null; + private final CharSequence bioUpdateType = null; private final Boolean deaf = null; private final Long deleteMessageDays = null; private final List fieldsUpdated = null; @@ -18,6 +20,7 @@ public final class TrackGuildMemberUpdated implements AnalyticsSchema, TrackBase private final Boolean mute = null; private final CharSequence newNickname = null; private final List newRoles = null; + private final CharSequence nicknameUpdateType = null; private final CharSequence oldNickname = null; private final List oldRoles = null; private final CharSequence reason = null; @@ -39,7 +42,7 @@ public final class TrackGuildMemberUpdated implements AnalyticsSchema, TrackBase return false; } TrackGuildMemberUpdated trackGuildMemberUpdated = (TrackGuildMemberUpdated) obj; - return m.areEqual(this.guildId, trackGuildMemberUpdated.guildId) && m.areEqual(this.guildName, trackGuildMemberUpdated.guildName) && m.areEqual(this.targetUserId, trackGuildMemberUpdated.targetUserId) && m.areEqual(this.updateType, trackGuildMemberUpdated.updateType) && m.areEqual(this.fieldsUpdated, trackGuildMemberUpdated.fieldsUpdated) && m.areEqual(this.oldNickname, trackGuildMemberUpdated.oldNickname) && m.areEqual(this.newNickname, trackGuildMemberUpdated.newNickname) && m.areEqual(this.mute, trackGuildMemberUpdated.mute) && m.areEqual(this.deaf, trackGuildMemberUpdated.deaf) && m.areEqual(this.oldRoles, trackGuildMemberUpdated.oldRoles) && m.areEqual(this.newRoles, trackGuildMemberUpdated.newRoles) && m.areEqual(this.reason, trackGuildMemberUpdated.reason) && m.areEqual(this.deleteMessageDays, trackGuildMemberUpdated.deleteMessageDays) && m.areEqual(this.avatarUpdateType, trackGuildMemberUpdated.avatarUpdateType) && m.areEqual(this.userPremiumTier, trackGuildMemberUpdated.userPremiumTier); + return m.areEqual(this.guildId, trackGuildMemberUpdated.guildId) && m.areEqual(this.guildName, trackGuildMemberUpdated.guildName) && m.areEqual(this.targetUserId, trackGuildMemberUpdated.targetUserId) && m.areEqual(this.updateType, trackGuildMemberUpdated.updateType) && m.areEqual(this.fieldsUpdated, trackGuildMemberUpdated.fieldsUpdated) && m.areEqual(this.oldNickname, trackGuildMemberUpdated.oldNickname) && m.areEqual(this.newNickname, trackGuildMemberUpdated.newNickname) && m.areEqual(this.mute, trackGuildMemberUpdated.mute) && m.areEqual(this.deaf, trackGuildMemberUpdated.deaf) && m.areEqual(this.oldRoles, trackGuildMemberUpdated.oldRoles) && m.areEqual(this.newRoles, trackGuildMemberUpdated.newRoles) && m.areEqual(this.reason, trackGuildMemberUpdated.reason) && m.areEqual(this.deleteMessageDays, trackGuildMemberUpdated.deleteMessageDays) && m.areEqual(this.avatarUpdateType, trackGuildMemberUpdated.avatarUpdateType) && m.areEqual(this.userPremiumTier, trackGuildMemberUpdated.userPremiumTier) && m.areEqual(this.nicknameUpdateType, trackGuildMemberUpdated.nicknameUpdateType) && m.areEqual(this.bannerUpdateType, trackGuildMemberUpdated.bannerUpdateType) && m.areEqual(this.bioUpdateType, trackGuildMemberUpdated.bioUpdateType); } public int hashCode() { @@ -73,10 +76,16 @@ public final class TrackGuildMemberUpdated implements AnalyticsSchema, TrackBase CharSequence charSequence6 = this.avatarUpdateType; int hashCode14 = (hashCode13 + (charSequence6 != null ? charSequence6.hashCode() : 0)) * 31; Long l4 = this.userPremiumTier; - if (l4 != null) { - i = l4.hashCode(); + int hashCode15 = (hashCode14 + (l4 != null ? l4.hashCode() : 0)) * 31; + CharSequence charSequence7 = this.nicknameUpdateType; + int hashCode16 = (hashCode15 + (charSequence7 != null ? charSequence7.hashCode() : 0)) * 31; + CharSequence charSequence8 = this.bannerUpdateType; + int hashCode17 = (hashCode16 + (charSequence8 != null ? charSequence8.hashCode() : 0)) * 31; + CharSequence charSequence9 = this.bioUpdateType; + if (charSequence9 != null) { + i = charSequence9.hashCode(); } - return hashCode14 + i; + return hashCode17 + i; } public String toString() { @@ -109,6 +118,12 @@ public final class TrackGuildMemberUpdated implements AnalyticsSchema, TrackBase R.append(", avatarUpdateType="); R.append(this.avatarUpdateType); R.append(", userPremiumTier="); - return a.F(R, this.userPremiumTier, ")"); + R.append(this.userPremiumTier); + R.append(", nicknameUpdateType="); + R.append(this.nicknameUpdateType); + R.append(", bannerUpdateType="); + R.append(this.bannerUpdateType); + R.append(", bioUpdateType="); + return a.D(R, this.bioUpdateType, ")"); } } diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackGuildScheduledEventReported.java b/app/src/main/java/com/discord/analytics/generated/events/TrackGuildScheduledEventReported.java new file mode 100644 index 0000000000..1bb7852469 --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackGuildScheduledEventReported.java @@ -0,0 +1,71 @@ +package com.discord.analytics.generated.events; + +import c.d.b.a.a; +import com.discord.analytics.generated.traits.TrackBase; +import com.discord.analytics.generated.traits.TrackBaseReceiver; +import com.discord.analytics.generated.traits.TrackGuild; +import com.discord.analytics.generated.traits.TrackGuildReceiver; +import com.discord.api.science.AnalyticsSchema; +import d0.z.d.m; +/* compiled from: TrackGuildScheduledEventReported.kt */ +public final class TrackGuildScheduledEventReported implements AnalyticsSchema, TrackBaseReceiver, TrackGuildReceiver { + private final transient String analyticsSchemaTypeName = "guild_scheduled_event_reported"; + private final CharSequence description = null; + private final Long guildScheduledEventId = null; + private final Long reasonEnum = null; + private final CharSequence reportSubType = null; + private final CharSequence reportType = null; + private final CharSequence subject = null; + private TrackBase trackBase; + private TrackGuild trackGuild; + + @Override // com.discord.api.science.AnalyticsSchema + public String b() { + return this.analyticsSchemaTypeName; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof TrackGuildScheduledEventReported)) { + return false; + } + TrackGuildScheduledEventReported trackGuildScheduledEventReported = (TrackGuildScheduledEventReported) obj; + return m.areEqual(this.reportType, trackGuildScheduledEventReported.reportType) && m.areEqual(this.reportSubType, trackGuildScheduledEventReported.reportSubType) && m.areEqual(this.subject, trackGuildScheduledEventReported.subject) && m.areEqual(this.description, trackGuildScheduledEventReported.description) && m.areEqual(this.reasonEnum, trackGuildScheduledEventReported.reasonEnum) && m.areEqual(this.guildScheduledEventId, trackGuildScheduledEventReported.guildScheduledEventId); + } + + public int hashCode() { + CharSequence charSequence = this.reportType; + int i = 0; + int hashCode = (charSequence != null ? charSequence.hashCode() : 0) * 31; + CharSequence charSequence2 = this.reportSubType; + int hashCode2 = (hashCode + (charSequence2 != null ? charSequence2.hashCode() : 0)) * 31; + CharSequence charSequence3 = this.subject; + int hashCode3 = (hashCode2 + (charSequence3 != null ? charSequence3.hashCode() : 0)) * 31; + CharSequence charSequence4 = this.description; + int hashCode4 = (hashCode3 + (charSequence4 != null ? charSequence4.hashCode() : 0)) * 31; + Long l = this.reasonEnum; + int hashCode5 = (hashCode4 + (l != null ? l.hashCode() : 0)) * 31; + Long l2 = this.guildScheduledEventId; + if (l2 != null) { + i = l2.hashCode(); + } + return hashCode5 + i; + } + + public String toString() { + StringBuilder R = a.R("TrackGuildScheduledEventReported(reportType="); + R.append(this.reportType); + R.append(", reportSubType="); + R.append(this.reportSubType); + R.append(", subject="); + R.append(this.subject); + R.append(", description="); + R.append(this.description); + R.append(", reasonEnum="); + R.append(this.reasonEnum); + R.append(", guildScheduledEventId="); + return a.F(R, this.guildScheduledEventId, ")"); + } +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackGuildScheduledEventReportedReceiver.java b/app/src/main/java/com/discord/analytics/generated/events/TrackGuildScheduledEventReportedReceiver.java new file mode 100644 index 0000000000..9ca64b0581 --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackGuildScheduledEventReportedReceiver.java @@ -0,0 +1,6 @@ +package com.discord.analytics.generated.events; + +import com.discord.api.science.AnalyticsSchema; +/* compiled from: TrackGuildScheduledEventReported.kt */ +public interface TrackGuildScheduledEventReportedReceiver extends AnalyticsSchema { +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackMessageReported.java b/app/src/main/java/com/discord/analytics/generated/events/TrackMessageReported.java index 11500cc52a..158bac26c2 100644 --- a/app/src/main/java/com/discord/analytics/generated/events/TrackMessageReported.java +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackMessageReported.java @@ -22,6 +22,7 @@ public final class TrackMessageReported implements AnalyticsSchema, TrackBaseRec private final Long reportId = null; private final CharSequence reportSubType = null; private final CharSequence reportType = null; + private final Long reportedMessageAuthorId = null; private final CharSequence subject = null; private TrackBase trackBase; private TrackChannel trackChannel; @@ -41,7 +42,7 @@ public final class TrackMessageReported implements AnalyticsSchema, TrackBaseRec return false; } TrackMessageReported trackMessageReported = (TrackMessageReported) obj; - return m.areEqual(this.reportType, trackMessageReported.reportType) && m.areEqual(this.reportSubType, trackMessageReported.reportSubType) && m.areEqual(this.subject, trackMessageReported.subject) && m.areEqual(this.description, trackMessageReported.description) && m.areEqual(this.reasonEnum, trackMessageReported.reasonEnum) && m.areEqual(this.messageId, trackMessageReported.messageId) && m.areEqual(this.reportId, trackMessageReported.reportId) && m.areEqual(this.mutualGuildIds, trackMessageReported.mutualGuildIds); + return m.areEqual(this.reportType, trackMessageReported.reportType) && m.areEqual(this.reportSubType, trackMessageReported.reportSubType) && m.areEqual(this.subject, trackMessageReported.subject) && m.areEqual(this.description, trackMessageReported.description) && m.areEqual(this.reasonEnum, trackMessageReported.reasonEnum) && m.areEqual(this.messageId, trackMessageReported.messageId) && m.areEqual(this.reportId, trackMessageReported.reportId) && m.areEqual(this.mutualGuildIds, trackMessageReported.mutualGuildIds) && m.areEqual(this.reportedMessageAuthorId, trackMessageReported.reportedMessageAuthorId); } public int hashCode() { @@ -61,10 +62,12 @@ public final class TrackMessageReported implements AnalyticsSchema, TrackBaseRec Long l3 = this.reportId; int hashCode7 = (hashCode6 + (l3 != null ? l3.hashCode() : 0)) * 31; List list = this.mutualGuildIds; - if (list != null) { - i = list.hashCode(); + int hashCode8 = (hashCode7 + (list != null ? list.hashCode() : 0)) * 31; + Long l4 = this.reportedMessageAuthorId; + if (l4 != null) { + i = l4.hashCode(); } - return hashCode7 + i; + return hashCode8 + i; } public String toString() { @@ -83,6 +86,8 @@ public final class TrackMessageReported implements AnalyticsSchema, TrackBaseRec R.append(", reportId="); R.append(this.reportId); R.append(", mutualGuildIds="); - return a.J(R, this.mutualGuildIds, ")"); + R.append(this.mutualGuildIds); + R.append(", reportedMessageAuthorId="); + return a.F(R, this.reportedMessageAuthorId, ")"); } } diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackOpenPopout.java b/app/src/main/java/com/discord/analytics/generated/events/TrackOpenPopout.java index 56054a2e37..28c384abe9 100644 --- a/app/src/main/java/com/discord/analytics/generated/events/TrackOpenPopout.java +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackOpenPopout.java @@ -22,7 +22,11 @@ public final class TrackOpenPopout implements AnalyticsSchema, TrackBaseReceiver private final CharSequence gamePlatform = null; private final Long guildId = null; private final Boolean hasCustomStatus = null; + private final Boolean hasGuildMemberAvatar = null; + private final Boolean hasGuildMemberBanner = null; + private final Boolean hasGuildMemberBio = null; private final Boolean hasImages = null; + private final Boolean hasNickname = null; private final Boolean isFriend = null; private final Boolean isStreaming = null; private final Long otherUserId = null; @@ -54,7 +58,7 @@ public final class TrackOpenPopout implements AnalyticsSchema, TrackBaseReceiver return false; } TrackOpenPopout trackOpenPopout = (TrackOpenPopout) obj; - return m.areEqual(this.source, trackOpenPopout.source) && m.areEqual(this.type, trackOpenPopout.type) && m.areEqual(this.otherUserId, trackOpenPopout.otherUserId) && m.areEqual(this.applicationId, trackOpenPopout.applicationId) && m.areEqual(this.applicationName, trackOpenPopout.applicationName) && m.areEqual(this.gameId, trackOpenPopout.gameId) && m.areEqual(this.isFriend, trackOpenPopout.isFriend) && m.areEqual(this.hasImages, trackOpenPopout.hasImages) && m.areEqual(this.partyMax, trackOpenPopout.partyMax) && m.areEqual(this.partyId, trackOpenPopout.partyId) && m.areEqual(this.partyPlatform, trackOpenPopout.partyPlatform) && m.areEqual(this.gameName, trackOpenPopout.gameName) && m.areEqual(this.gamePlatform, trackOpenPopout.gamePlatform) && m.areEqual(this.skuId, trackOpenPopout.skuId) && m.areEqual(this.profileUserStatus, trackOpenPopout.profileUserStatus) && m.areEqual(this.isStreaming, trackOpenPopout.isStreaming) && m.areEqual(this.hasCustomStatus, trackOpenPopout.hasCustomStatus) && m.areEqual(this.guildId, trackOpenPopout.guildId) && m.areEqual(this.emojiId, trackOpenPopout.emojiId) && m.areEqual(this.stickerId, trackOpenPopout.stickerId) && m.areEqual(this.stickerPackId, trackOpenPopout.stickerPackId) && m.areEqual(this.profileHasNitroCustomization, trackOpenPopout.profileHasNitroCustomization); + return m.areEqual(this.source, trackOpenPopout.source) && m.areEqual(this.type, trackOpenPopout.type) && m.areEqual(this.otherUserId, trackOpenPopout.otherUserId) && m.areEqual(this.applicationId, trackOpenPopout.applicationId) && m.areEqual(this.applicationName, trackOpenPopout.applicationName) && m.areEqual(this.gameId, trackOpenPopout.gameId) && m.areEqual(this.isFriend, trackOpenPopout.isFriend) && m.areEqual(this.hasImages, trackOpenPopout.hasImages) && m.areEqual(this.partyMax, trackOpenPopout.partyMax) && m.areEqual(this.partyId, trackOpenPopout.partyId) && m.areEqual(this.partyPlatform, trackOpenPopout.partyPlatform) && m.areEqual(this.gameName, trackOpenPopout.gameName) && m.areEqual(this.gamePlatform, trackOpenPopout.gamePlatform) && m.areEqual(this.skuId, trackOpenPopout.skuId) && m.areEqual(this.profileUserStatus, trackOpenPopout.profileUserStatus) && m.areEqual(this.isStreaming, trackOpenPopout.isStreaming) && m.areEqual(this.hasCustomStatus, trackOpenPopout.hasCustomStatus) && m.areEqual(this.guildId, trackOpenPopout.guildId) && m.areEqual(this.emojiId, trackOpenPopout.emojiId) && m.areEqual(this.stickerId, trackOpenPopout.stickerId) && m.areEqual(this.stickerPackId, trackOpenPopout.stickerPackId) && m.areEqual(this.profileHasNitroCustomization, trackOpenPopout.profileHasNitroCustomization) && m.areEqual(this.hasNickname, trackOpenPopout.hasNickname) && m.areEqual(this.hasGuildMemberAvatar, trackOpenPopout.hasGuildMemberAvatar) && m.areEqual(this.hasGuildMemberBanner, trackOpenPopout.hasGuildMemberBanner) && m.areEqual(this.hasGuildMemberBio, trackOpenPopout.hasGuildMemberBio); } public int hashCode() { @@ -102,10 +106,18 @@ public final class TrackOpenPopout implements AnalyticsSchema, TrackBaseReceiver Long l9 = this.stickerPackId; int hashCode21 = (hashCode20 + (l9 != null ? l9.hashCode() : 0)) * 31; Boolean bool5 = this.profileHasNitroCustomization; - if (bool5 != null) { - i = bool5.hashCode(); + int hashCode22 = (hashCode21 + (bool5 != null ? bool5.hashCode() : 0)) * 31; + Boolean bool6 = this.hasNickname; + int hashCode23 = (hashCode22 + (bool6 != null ? bool6.hashCode() : 0)) * 31; + Boolean bool7 = this.hasGuildMemberAvatar; + int hashCode24 = (hashCode23 + (bool7 != null ? bool7.hashCode() : 0)) * 31; + Boolean bool8 = this.hasGuildMemberBanner; + int hashCode25 = (hashCode24 + (bool8 != null ? bool8.hashCode() : 0)) * 31; + Boolean bool9 = this.hasGuildMemberBio; + if (bool9 != null) { + i = bool9.hashCode(); } - return hashCode21 + i; + return hashCode25 + i; } public String toString() { @@ -152,6 +164,14 @@ public final class TrackOpenPopout implements AnalyticsSchema, TrackBaseReceiver R.append(", stickerPackId="); R.append(this.stickerPackId); R.append(", profileHasNitroCustomization="); - return a.C(R, this.profileHasNitroCustomization, ")"); + R.append(this.profileHasNitroCustomization); + R.append(", hasNickname="); + R.append(this.hasNickname); + R.append(", hasGuildMemberAvatar="); + R.append(this.hasGuildMemberAvatar); + R.append(", hasGuildMemberBanner="); + R.append(this.hasGuildMemberBanner); + R.append(", hasGuildMemberBio="); + return a.C(R, this.hasGuildMemberBio, ")"); } } diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackSettingsPaneViewed.java b/app/src/main/java/com/discord/analytics/generated/events/TrackSettingsPaneViewed.java index 6d183718cd..52225d8bb9 100644 --- a/app/src/main/java/com/discord/analytics/generated/events/TrackSettingsPaneViewed.java +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackSettingsPaneViewed.java @@ -11,10 +11,12 @@ import com.discord.analytics.generated.traits.TrackLocationMetadata; import com.discord.analytics.generated.traits.TrackLocationMetadataReceiver; import com.discord.analytics.generated.traits.TrackOverlayClientMetadata; import com.discord.analytics.generated.traits.TrackOverlayClientMetadataReceiver; +import com.discord.analytics.generated.traits.TrackSourceMetadata; +import com.discord.analytics.generated.traits.TrackSourceMetadataReceiver; import com.discord.api.science.AnalyticsSchema; import d0.z.d.m; /* compiled from: TrackSettingsPaneViewed.kt */ -public final class TrackSettingsPaneViewed implements AnalyticsSchema, TrackBaseReceiver, TrackGuildReceiver, TrackChannelReceiver, TrackLocationMetadataReceiver, TrackOverlayClientMetadataReceiver { +public final class TrackSettingsPaneViewed implements AnalyticsSchema, TrackBaseReceiver, TrackGuildReceiver, TrackChannelReceiver, TrackLocationMetadataReceiver, TrackOverlayClientMetadataReceiver, TrackSourceMetadataReceiver { private final transient String analyticsSchemaTypeName = "settings_pane_viewed"; private final CharSequence destinationPane = null; private final CharSequence originPane = null; @@ -25,6 +27,7 @@ public final class TrackSettingsPaneViewed implements AnalyticsSchema, TrackBase private TrackGuild trackGuild; private TrackLocationMetadata trackLocationMetadata; private TrackOverlayClientMetadata trackOverlayClientMetadata; + private TrackSourceMetadata trackSourceMetadata; @Override // com.discord.api.science.AnalyticsSchema public String b() { diff --git a/app/src/main/java/com/discord/analytics/generated/traits/TrackEntitlementMetadata.java b/app/src/main/java/com/discord/analytics/generated/traits/TrackEntitlementMetadata.java index eeeee6349a..4b687f79a9 100644 --- a/app/src/main/java/com/discord/analytics/generated/traits/TrackEntitlementMetadata.java +++ b/app/src/main/java/com/discord/analytics/generated/traits/TrackEntitlementMetadata.java @@ -8,6 +8,7 @@ public final class TrackEntitlementMetadata { private final Long entitlementId = null; private final Long entitlementPaymentId = null; private final Long entitlementSubscriptionPlanId = null; + private final Long giftCodeBatchId = null; public boolean equals(Object obj) { if (this == obj) { @@ -17,7 +18,7 @@ public final class TrackEntitlementMetadata { return false; } TrackEntitlementMetadata trackEntitlementMetadata = (TrackEntitlementMetadata) obj; - return m.areEqual(this.entitlementId, trackEntitlementMetadata.entitlementId) && m.areEqual(this.entitlementCreatorId, trackEntitlementMetadata.entitlementCreatorId) && m.areEqual(this.entitlementSubscriptionPlanId, trackEntitlementMetadata.entitlementSubscriptionPlanId) && m.areEqual(this.entitlementPaymentId, trackEntitlementMetadata.entitlementPaymentId); + return m.areEqual(this.entitlementId, trackEntitlementMetadata.entitlementId) && m.areEqual(this.entitlementCreatorId, trackEntitlementMetadata.entitlementCreatorId) && m.areEqual(this.entitlementSubscriptionPlanId, trackEntitlementMetadata.entitlementSubscriptionPlanId) && m.areEqual(this.entitlementPaymentId, trackEntitlementMetadata.entitlementPaymentId) && m.areEqual(this.giftCodeBatchId, trackEntitlementMetadata.giftCodeBatchId); } public int hashCode() { @@ -29,10 +30,12 @@ public final class TrackEntitlementMetadata { Long l3 = this.entitlementSubscriptionPlanId; int hashCode3 = (hashCode2 + (l3 != null ? l3.hashCode() : 0)) * 31; Long l4 = this.entitlementPaymentId; - if (l4 != null) { - i = l4.hashCode(); + int hashCode4 = (hashCode3 + (l4 != null ? l4.hashCode() : 0)) * 31; + Long l5 = this.giftCodeBatchId; + if (l5 != null) { + i = l5.hashCode(); } - return hashCode3 + i; + return hashCode4 + i; } public String toString() { @@ -43,6 +46,8 @@ public final class TrackEntitlementMetadata { R.append(", entitlementSubscriptionPlanId="); R.append(this.entitlementSubscriptionPlanId); R.append(", entitlementPaymentId="); - return a.F(R, this.entitlementPaymentId, ")"); + R.append(this.entitlementPaymentId); + R.append(", giftCodeBatchId="); + return a.F(R, this.giftCodeBatchId, ")"); } } diff --git a/app/src/main/java/com/discord/api/channel/ChannelUtils.java b/app/src/main/java/com/discord/api/channel/ChannelUtils.java index 34aa746b9d..9cea1a2508 100644 --- a/app/src/main/java/com/discord/api/channel/ChannelUtils.java +++ b/app/src/main/java/com/discord/api/channel/ChannelUtils.java @@ -276,7 +276,7 @@ public final class ChannelUtils { } for (PermissionOverwrite permissionOverwrite : s2) { GuildRole guildRole2 = GuildUtilsKt.getGuildRole(Long.valueOf(permissionOverwrite.e())); - if (guildRole2 != null && RoleUtils.hasSubscriptionListingId(guildRole2) && PermissionOverwriteUtilsKt.grantsAccessTo(permissionOverwrite, channel)) { + if (guildRole2 != null && RoleUtils.isSubscriptionRolePurchasableOrHasSubscribers(guildRole2) && PermissionOverwriteUtilsKt.grantsAccessTo(permissionOverwrite, channel)) { return true; } } @@ -303,7 +303,7 @@ public final class ChannelUtils { boolean deniesAccessTo = permissionOverwrite2 != null ? PermissionOverwriteUtilsKt.deniesAccessTo(permissionOverwrite2, channel) : false; if (map != null && !deniesAccessTo && isFullyGatedGuildRoleSubscriptionGuild) { for (GuildRole guildRole3 : map.values()) { - if (RoleUtils.hasSubscriptionListingId(guildRole3) && PermissionUtils.INSTANCE.canRole(Permission.VIEW_CHANNEL, guildRole3, null)) { + if (RoleUtils.isSubscriptionRolePurchasableOrHasSubscribers(guildRole3) && PermissionUtils.INSTANCE.canRole(Permission.VIEW_CHANNEL, guildRole3, null)) { return true; } } diff --git a/app/src/main/java/com/discord/api/guild/Guild.java b/app/src/main/java/com/discord/api/guild/Guild.java index bd0750d7a7..27d22fa656 100644 --- a/app/src/main/java/com/discord/api/guild/Guild.java +++ b/app/src/main/java/com/discord/api/guild/Guild.java @@ -68,12 +68,11 @@ public final class Guild { private final List voiceStates; private final GuildWelcomeScreen welcomeScreen; - /* JADX DEBUG: Multi-variable search result rejected for r30v0, resolved type: java.util.List */ + /* JADX DEBUG: Multi-variable search result rejected for r29v0, resolved type: java.util.List */ /* JADX WARN: Multi-variable type inference failed */ public Guild(List list, List list2, List list3, String str, String str2, Integer num, long j, String str3, long j2, String str4, GuildVerificationLevel guildVerificationLevel, GuildExplicitContentFilter guildExplicitContentFilter, List list4, List list5, List list6, List list7, boolean z2, int i, int i2, Long l, Long l2, List list8, int i3, String str5, String str6, int i4, int i5, int i6, String str7, Long l3, Long l4, String str8, GuildWelcomeScreen guildWelcomeScreen, GuildMaxVideoChannelUsers guildMaxVideoChannelUsers, String str9, int i7, int i8, Integer num2, GuildHashes guildHashes, List list9, List list10, boolean z3, List list11, List list12, List list13) { m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_NAME); m.checkNotNullParameter(list8, "features"); - m.checkNotNullParameter(list13, "embeddedActivities"); this.roles = list; this.emojis = list2; this.stickers = list3; @@ -137,13 +136,14 @@ public final class Guild { List list17 = (i9 & 4096) != 0 ? guild.presences : list4; List list18 = (i9 & 8192) != 0 ? guild.channels : list5; List list19 = (i9 & 16384) != 0 ? guild.members : list6; - List list20 = (i9 & 32768) != 0 ? guild.voiceStates : null; + List list20 = null; + List list21 = (i9 & 32768) != 0 ? guild.voiceStates : null; boolean z4 = (i9 & 65536) != 0 ? guild.unavailable : z2; int i11 = (i9 & 131072) != 0 ? guild.mfaLevel : i; int i12 = (i9 & 262144) != 0 ? guild.afkTimeout : i2; Long l5 = (i9 & 524288) != 0 ? guild.afkChannelId : l; Long l6 = (i9 & 1048576) != 0 ? guild.systemChannelId : l2; - List list21 = (i9 & 2097152) != 0 ? guild.features : list8; + List list22 = (i9 & 2097152) != 0 ? guild.features : list8; int i13 = (i9 & 4194304) != 0 ? guild.memberCount : i3; String str14 = (i9 & 8388608) != 0 ? guild.banner : str5; String str15 = (i9 & 16777216) != 0 ? guild.splash : str6; @@ -161,17 +161,18 @@ public final class Guild { int i18 = (i10 & 16) != 0 ? guild.approximatePresenceCount : i8; Integer num4 = (i10 & 32) != 0 ? guild.permissions : null; GuildHashes guildHashes2 = (i10 & 64) != 0 ? guild.guildHashes : null; - List list22 = (i10 & 128) != 0 ? guild.channelUpdates : null; - List list23 = (i10 & 256) != 0 ? guild.threads : null; + List list23 = (i10 & 128) != 0 ? guild.channelUpdates : null; + List list24 = (i10 & 256) != 0 ? guild.threads : null; boolean z5 = (i10 & 512) != 0 ? guild.nsfw : z3; - List list24 = (i10 & 1024) != 0 ? guild.stageInstances : null; - List list25 = (i10 & 2048) != 0 ? guild.guildScheduledEvents : null; - List list26 = (i10 & 4096) != 0 ? guild.embeddedActivities : null; + List list25 = (i10 & 1024) != 0 ? guild.stageInstances : null; + List list26 = (i10 & 2048) != 0 ? guild.guildScheduledEvents : null; + if ((i10 & 4096) != 0) { + list20 = guild.embeddedActivities; + } Objects.requireNonNull(guild); m.checkNotNullParameter(str10, ModelAuditLogEntry.CHANGE_KEY_NAME); - m.checkNotNullParameter(list21, "features"); - m.checkNotNullParameter(list26, "embeddedActivities"); - return new Guild(list14, list15, list16, str10, str11, num3, j3, str12, j4, str13, guildVerificationLevel2, guildExplicitContentFilter2, list17, list18, list19, list20, z4, i11, i12, l5, l6, list21, i13, str14, str15, i14, i15, i16, str16, l7, l8, str17, guildWelcomeScreen2, guildMaxVideoChannelUsers2, str18, i17, i18, num4, guildHashes2, list22, list23, z5, list24, list25, list26); + m.checkNotNullParameter(list22, "features"); + return new Guild(list14, list15, list16, str10, str11, num3, j3, str12, j4, str13, guildVerificationLevel2, guildExplicitContentFilter2, list17, list18, list19, list21, z4, i11, i12, l5, l6, list22, i13, str14, str15, i14, i15, i16, str16, l7, l8, str17, guildWelcomeScreen2, guildMaxVideoChannelUsers2, str18, i17, i18, num4, guildHashes2, list23, list24, z5, list25, list26, list20); } public final int A() { diff --git a/app/src/main/java/com/discord/api/role/GuildRoleTags.java b/app/src/main/java/com/discord/api/role/GuildRoleTags.java index b60a1002ba..c73e516a42 100644 --- a/app/src/main/java/com/discord/api/role/GuildRoleTags.java +++ b/app/src/main/java/com/discord/api/role/GuildRoleTags.java @@ -9,6 +9,7 @@ public final class GuildRoleTags implements Serializable { private final String botId; private final String integrationId; private final NullSerializable premiumSubscriber; + private final NullSerializable purchasableOrHasSubscribers; private final String skuId; private final String subscriptionListingId; @@ -16,6 +17,10 @@ public final class GuildRoleTags implements Serializable { return this.subscriptionListingId; } + public final boolean b() { + return this.purchasableOrHasSubscribers != null; + } + @Override // java.lang.Object public boolean equals(Object obj) { if (this == obj) { @@ -25,7 +30,7 @@ public final class GuildRoleTags implements Serializable { return false; } GuildRoleTags guildRoleTags = (GuildRoleTags) obj; - return m.areEqual(this.premiumSubscriber, guildRoleTags.premiumSubscriber) && m.areEqual(this.botId, guildRoleTags.botId) && m.areEqual(this.integrationId, guildRoleTags.integrationId) && m.areEqual(this.skuId, guildRoleTags.skuId) && m.areEqual(this.subscriptionListingId, guildRoleTags.subscriptionListingId); + return m.areEqual(this.premiumSubscriber, guildRoleTags.premiumSubscriber) && m.areEqual(this.botId, guildRoleTags.botId) && m.areEqual(this.integrationId, guildRoleTags.integrationId) && m.areEqual(this.skuId, guildRoleTags.skuId) && m.areEqual(this.subscriptionListingId, guildRoleTags.subscriptionListingId) && m.areEqual(this.purchasableOrHasSubscribers, guildRoleTags.purchasableOrHasSubscribers); } @Override // java.lang.Object @@ -40,10 +45,12 @@ public final class GuildRoleTags implements Serializable { String str3 = this.skuId; int hashCode4 = (hashCode3 + (str3 != null ? str3.hashCode() : 0)) * 31; String str4 = this.subscriptionListingId; - if (str4 != null) { - i = str4.hashCode(); + int hashCode5 = (hashCode4 + (str4 != null ? str4.hashCode() : 0)) * 31; + NullSerializable nullSerializable2 = this.purchasableOrHasSubscribers; + if (nullSerializable2 != null) { + i = nullSerializable2.hashCode(); } - return hashCode4 + i; + return hashCode5 + i; } @Override // java.lang.Object @@ -57,6 +64,10 @@ public final class GuildRoleTags implements Serializable { R.append(", skuId="); R.append(this.skuId); R.append(", subscriptionListingId="); - return a.H(R, this.subscriptionListingId, ")"); + R.append(this.subscriptionListingId); + R.append(", purchasableOrHasSubscribers="); + R.append(this.purchasableOrHasSubscribers); + R.append(")"); + return R.toString(); } } diff --git a/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteListItemBinding.java b/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteListItemBinding.java index d1b98c5e30..5e4d42c241 100644 --- a/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteListItemBinding.java +++ b/app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteListItemBinding.java @@ -1,11 +1,13 @@ package com.discord.databinding; import android.view.View; +import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; import androidx.annotation.NonNull; import androidx.cardview.widget.CardView; +import androidx.constraintlayout.widget.Barrier; import androidx.viewbinding.ViewBinding; import com.discord.views.user.SettingsMemberView; public final class WidgetServerSettingsInstantInviteListItemBinding implements ViewBinding { @@ -24,12 +26,12 @@ public final class WidgetServerSettingsInstantInviteListItemBinding implements V @NonNull public final SettingsMemberView f; - public WidgetServerSettingsInstantInviteListItemBinding(@NonNull CardView cardView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout, @NonNull View view, @NonNull LinearLayout linearLayout2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull LinearLayout linearLayout3, @NonNull ImageView imageView, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull SettingsMemberView settingsMemberView) { + public WidgetServerSettingsInstantInviteListItemBinding(@NonNull CardView cardView, @NonNull Barrier barrier, @NonNull Barrier barrier2, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout, @NonNull FrameLayout frameLayout, @NonNull LinearLayout linearLayout2, @NonNull TextView textView3, @NonNull ImageView imageView, @NonNull TextView textView4, @NonNull LinearLayout linearLayout3, @NonNull SettingsMemberView settingsMemberView) { this.a = cardView; this.b = textView; this.f2014c = textView2; this.d = textView3; - this.e = textView5; + this.e = textView4; this.f = settingsMemberView; } diff --git a/app/src/main/java/com/discord/stores/StoreEmbeddedActivities.java b/app/src/main/java/com/discord/stores/StoreEmbeddedActivities.java index ded500747e..98e1f2ba0f 100644 --- a/app/src/main/java/com/discord/stores/StoreEmbeddedActivities.java +++ b/app/src/main/java/com/discord/stores/StoreEmbeddedActivities.java @@ -9,6 +9,7 @@ import com.discord.models.embeddedactivities.EmbeddedActivity; import com.discord.stores.updates.ObservationDeck; import com.discord.stores.updates.ObservationDeckProvider; import d0.t.h0; +import d0.t.n; import d0.z.d.m; import java.util.HashMap; import java.util.LinkedHashMap; @@ -47,7 +48,11 @@ public final class StoreEmbeddedActivities extends StoreV2 { @StoreThread private final void handleEmbeddedActivitiesForGuild(Guild guild) { - for (EmbeddedActivityInGuild embeddedActivityInGuild : guild.j()) { + List j = guild.j(); + if (j == null) { + j = n.emptyList(); + } + for (EmbeddedActivityInGuild embeddedActivityInGuild : j) { handleEmbeddedActivityForChannel(embeddedActivityInGuild.a(), embeddedActivityInGuild.c(), embeddedActivityInGuild.b(), guild.q()); } } diff --git a/app/src/main/java/com/discord/utilities/channel/GuildChannelIconType.java b/app/src/main/java/com/discord/utilities/channel/GuildChannelIconType.java index 44ba1e59d6..2f727ec04d 100644 --- a/app/src/main/java/com/discord/utilities/channel/GuildChannelIconType.java +++ b/app/src/main/java/com/discord/utilities/channel/GuildChannelIconType.java @@ -108,6 +108,15 @@ public abstract class GuildChannelIconType { } } + /* compiled from: GuildChannelIconUtils.kt */ + public static final class Voice extends GuildChannelIconType { + public static final Voice INSTANCE = new Voice(); + + private Voice() { + super(null); + } + } + private GuildChannelIconType() { } diff --git a/app/src/main/java/com/discord/utilities/channel/GuildChannelIconUtilsKt.java b/app/src/main/java/com/discord/utilities/channel/GuildChannelIconUtilsKt.java index 6a91a593a7..a14e9479da 100644 --- a/app/src/main/java/com/discord/utilities/channel/GuildChannelIconUtilsKt.java +++ b/app/src/main/java/com/discord/utilities/channel/GuildChannelIconUtilsKt.java @@ -20,6 +20,9 @@ public final class GuildChannelIconUtilsKt { return GuildChannelIconType.Text.INSTANCE; } int A = channel.A(); + if (A == 2) { + return GuildChannelIconType.Voice.INSTANCE; + } Object obj = null; if (A != 5) { if (A == 14) { @@ -130,6 +133,9 @@ public final class GuildChannelIconUtilsKt { if (guildChannelIconType instanceof GuildChannelIconType.Directory) { return R.drawable.ic_hub_24dp; } + if (guildChannelIconType instanceof GuildChannelIconType.Voice) { + return R.drawable.ic_channel_voice; + } throw new NoWhenBranchMatchedException(); } } diff --git a/app/src/main/java/com/discord/utilities/guilds/RoleUtils.java b/app/src/main/java/com/discord/utilities/guilds/RoleUtils.java index a215a57ecf..525ed342cb 100644 --- a/app/src/main/java/com/discord/utilities/guilds/RoleUtils.java +++ b/app/src/main/java/com/discord/utilities/guilds/RoleUtils.java @@ -129,6 +129,12 @@ public final class RoleUtils { return guildRole.b() == 0; } + public static final boolean isSubscriptionRolePurchasableOrHasSubscribers(GuildRole guildRole) { + GuildRoleTags j; + m.checkNotNullParameter(guildRole, "$this$isSubscriptionRolePurchasableOrHasSubscribers"); + return hasSubscriptionListingId(guildRole) && (j = guildRole.j()) != null && j.b(); + } + public static final boolean rankEquals(GuildRole guildRole, GuildRole guildRole2) { return ROLE_COMPARATOR.compare(guildRole, guildRole2) == 0; } diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.java index a840fe7f9d..26e550bf4c 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.java @@ -90,6 +90,8 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo boolean z4 = channel2 != null && j == channel2.h(); Collection collection = (Collection) a.c(this.$channel, this.$voiceStates$inlined); int size = collection != null ? collection.size() : 0; + boolean can = PermissionUtils.can(Permission.VIEW_CHANNEL, this.$permissions); + boolean z5 = this.$canSeeGuildRoleSubscriptions$inlined && ChannelUtils.q(channel, this.$guild$inlined.getGuild(), this.$guild$inlined.getEveryoneRole(), this.$guild$inlined.getGuildRoles()); PermissionUtils permissionUtils = PermissionUtils.INSTANCE; GuildRole everyoneRole = this.$guild$inlined.getEveryoneRole(); List s2 = channel.s(); @@ -100,8 +102,8 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo obj = null; break; } - obj = it.next(); - if (((PermissionOverwrite) obj).e() == this.$selectedGuildId$inlined) { + Object next = it.next(); + if (((PermissionOverwrite) next).e() == this.$selectedGuildId$inlined) { z2 = true; continue; } else { @@ -109,6 +111,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo continue; } if (z2) { + obj = next; break; } } @@ -116,17 +119,16 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo } else { permissionOverwrite = null; } - boolean z5 = !permissionUtils.canRole(Permission.CONNECT, everyoneRole, permissionOverwrite); + boolean z6 = !permissionUtils.canRole(Permission.CONNECT, everyoneRole, permissionOverwrite) || (!can && z5); Integer num = (Integer) this.$mentionCounts$inlined.get(Long.valueOf(this.$channelId)); int intValue = num != null ? num.intValue() : 0; boolean contains = this.$unreadChannelIds$inlined.contains(Long.valueOf(this.$channelId)); - boolean z6 = this.$canSeeGuildRoleSubscriptions$inlined && ChannelUtils.q(channel, this.$guild$inlined.getGuild(), this.$guild$inlined.getEveryoneRole(), this.$guild$inlined.getGuildRoles()); - if (!PermissionUtils.can(Permission.VIEW_CHANNEL, this.$permissions) && !z3 && !z6) { + if (!can && !z3 && !z5) { return null; } if (this.$collapsedCategories$inlined.contains(Long.valueOf(channel.r())) && size == 0 && !z3) { return null; } - return new WidgetChannelListModel.Companion.VocalChannelData(z3, z4, intValue, contains, z5, this.$permissions, size, !PermissionUtils.can(Permission.CONNECT, this.$permissions) && z6, z6); + return new WidgetChannelListModel.Companion.VocalChannelData(z3, z4, intValue, contains, z6, this.$permissions, size, (!can || !PermissionUtils.can(Permission.CONNECT, this.$permissions)) && z5, z5); } } diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4.java index 49980c1cc6..fdcde358e5 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4.java @@ -26,7 +26,7 @@ public final class WidgetChannelsList$onViewBound$4 extends o implements Functio public final void invoke(Channel channel) { Long access$getSelectedGuildId$p = WidgetChannelsList.access$getSelectedGuildId$p(this.this$0); if (access$getSelectedGuildId$p != null) { - WidgetGuildRoleSubscriptionEntryPoint.Companion.launch(this.this$0.requireContext(), access$getSelectedGuildId$p.longValue(), "gated_channel"); + WidgetGuildRoleSubscriptionEntryPoint.Companion.launch(this.this$0.requireContext(), access$getSelectedGuildId$p.longValue(), "Role Subscription Gated Channel"); } } } diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$9.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$9.java index d535a641a3..0a7a5e040a 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$9.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$9.java @@ -19,7 +19,7 @@ public final class WidgetChannelsList$onViewBound$9 extends o implements Functio public final void mo1invoke() { Long access$getSelectedGuildId$p = WidgetChannelsList.access$getSelectedGuildId$p(this.this$0); if (access$getSelectedGuildId$p != null) { - WidgetGuildRoleSubscriptionEntryPoint.Companion.launch(this.this$0.requireContext(), access$getSelectedGuildId$p.longValue(), "entrypoint"); + WidgetGuildRoleSubscriptionEntryPoint.Companion.launch(this.this$0.requireContext(), access$getSelectedGuildId$p.longValue(), "Role Subscriptions Tab"); } } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView.java b/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView.java index 3d6fb66dfb..5f7bb90517 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView.java +++ b/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView.java @@ -1,6 +1,7 @@ package com.discord.widgets.chat.list; import android.content.Context; +import android.os.Build; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; @@ -418,6 +419,10 @@ public final class InlineMediaView extends CardView implements View.OnAttachStat return viewParams3 != null ? viewParams3.getAutoPlayGifs() : this.storeUserSettings.getIsAutoPlayGifsEnabled(); } + private final boolean shouldAutoPlayGIFVs() { + return Build.VERSION.SDK_INT <= 30; + } + private final void updateUI(RenderableEmbedMedia renderableEmbedMedia, String str, EmbedType embedType, Integer num, Integer num2, String str2) { resetViews(); this.compositeSubscription.unsubscribe(); @@ -462,9 +467,10 @@ public final class InlineMediaView extends CardView implements View.OnAttachStat m.checkNotNullExpressionValue(J, "eventSubject.onBackpressureBuffer()"); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(J, this, null, 2, null), InlineMediaView.class, (Context) null, new InlineMediaView$updateUI$3(this), (Function1) null, (Function0) null, (Function0) null, new InlineMediaView$updateUI$4(this), 58, (Object) null); if (embedType == embedType2) { + boolean shouldAutoPlayGIFVs = shouldAutoPlayGIFVs(); PlayerView playerView2 = this.binding.f; m.checkNotNullExpressionValue(playerView2, "binding.inlineMediaPlayerView"); - AppMediaPlayer.b(appMediaPlayer, O, true, true, 0, playerView2, null, 40); + AppMediaPlayer.b(appMediaPlayer, O, shouldAutoPlayGIFVs, true, 0, playerView2, null, 40); appMediaPlayer.d(0.0f); } else { appMediaPlayer.d(1.0f); diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart.java index 57e513ef18..01657e2178 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStart.java @@ -58,7 +58,7 @@ public final class WidgetChatListAdapterItemStart extends WidgetChatListItem { return widgetChatListAdapterItemStart.getAuthorTextColor(guildMember); } - private final void configureChannel(long j, String str, boolean z2, boolean z3) { + private final void configureChannel(long j, String str, boolean z2, boolean z3, boolean z4) { TextView textView = this.binding.f1826c; m.checkNotNullExpressionValue(textView, "binding.chatListAdapterItemHeader"); int i = 0; @@ -66,10 +66,17 @@ public final class WidgetChatListAdapterItemStart extends WidgetChatListItem { TextView textView2 = this.binding.d; m.checkNotNullExpressionValue(textView2, "binding.chatListAdapterItemSubheader1"); textView2.setVisibility(8); - ImageView imageView = this.binding.f; - m.checkNotNullExpressionValue(imageView, "binding.chatListAdapterThreadHeaderIcon"); - imageView.setVisibility(8); if (z2) { + ImageView imageView = this.binding.f; + m.checkNotNullExpressionValue(imageView, "binding.chatListAdapterThreadHeaderIcon"); + imageView.setVisibility(0); + this.binding.f.setImageResource(R.drawable.ic_chat_message_white_24dp); + } else { + ImageView imageView2 = this.binding.f; + m.checkNotNullExpressionValue(imageView2, "binding.chatListAdapterThreadHeaderIcon"); + imageView2.setVisibility(8); + } + if (z3) { TextView textView3 = this.binding.e; m.checkNotNullExpressionValue(textView3, "binding.chatListAdapterItemSubheader2"); b.n(textView3, R.string.android_welcome_message_subtitle_channel, new Object[]{str}, null, 4); @@ -84,7 +91,7 @@ public final class WidgetChatListAdapterItemStart extends WidgetChatListItem { b.n(textView5, R.string.edit_channel, new Object[0], null, 4); TextView textView6 = this.binding.b; m.checkNotNullExpressionValue(textView6, "binding.chatListAdapterItemEditChannel"); - if (!z3) { + if (!z4) { i = 8; } textView6.setVisibility(i); @@ -104,6 +111,7 @@ public final class WidgetChatListAdapterItemStart extends WidgetChatListItem { ImageView imageView = this.binding.f; m.checkNotNullExpressionValue(imageView, "binding.chatListAdapterThreadHeaderIcon"); imageView.setVisibility(0); + this.binding.f.setImageResource(R.drawable.ic_thread); TextView textView4 = this.binding.d; m.checkNotNullExpressionValue(textView4, "binding.chatListAdapterItemSubheader1"); b.m(textView4, R.string.thread_started_by, new Object[]{str2}, new WidgetChatListAdapterItemStart$configureThread$1(this, str2, context, guildMember)); @@ -150,7 +158,7 @@ public final class WidgetChatListAdapterItemStart extends WidgetChatListItem { if (startOfChatEntry.isThread()) { configureThread(component1, component2, component3, component5, startOfChatEntry.getThreadCreatorMember(), startOfChatEntry.getThreadCreatorName(), startOfChatEntry.getThreadAutoArchiveDuration()); } else { - configureChannel(component1, component2, component3, component4); + configureChannel(component1, component2, startOfChatEntry.isTextInVoice(), component3, component4); } } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/entries/StartOfChatEntry.java b/app/src/main/java/com/discord/widgets/chat/list/entries/StartOfChatEntry.java index 6abfafe439..18d3f951af 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/entries/StartOfChatEntry.java +++ b/app/src/main/java/com/discord/widgets/chat/list/entries/StartOfChatEntry.java @@ -11,6 +11,7 @@ public final class StartOfChatEntry extends ChatListEntry { private final boolean canReadMessageHistory; private final long channelId; private final String channelName; + private final boolean isTextInVoice; private final boolean isThread; private final String key; private final Integer threadAutoArchiveDuration; @@ -18,8 +19,8 @@ public final class StartOfChatEntry extends ChatListEntry { private final String threadCreatorName; private final int type = 3; - /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x0027: INVOKE (r5v1 int) = (r1v0 'this' com.discord.widgets.chat.list.entries.StartOfChatEntry A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.chat.list.entries.StartOfChatEntry.getType():int), (r2v0 long)] */ - public StartOfChatEntry(long j, String str, boolean z2, boolean z3, boolean z4, boolean z5, Integer num, GuildMember guildMember, String str2) { + /* JADX DEBUG: TODO: convert one arg to string using `String.valueOf()`, args: [(wrap: int : 0x0029: INVOKE (r5v1 int) = (r1v0 'this' com.discord.widgets.chat.list.entries.StartOfChatEntry A[IMMUTABLE_TYPE, THIS]) type: VIRTUAL call: com.discord.widgets.chat.list.entries.StartOfChatEntry.getType():int), (r2v0 long)] */ + public StartOfChatEntry(long j, String str, boolean z2, boolean z3, boolean z4, boolean z5, Integer num, GuildMember guildMember, String str2, boolean z6) { m.checkNotNullParameter(str, "channelName"); m.checkNotNullParameter(str2, "threadCreatorName"); this.channelId = j; @@ -31,20 +32,25 @@ public final class StartOfChatEntry extends ChatListEntry { this.threadAutoArchiveDuration = num; this.threadCreatorMember = guildMember; this.threadCreatorName = str2; + this.isTextInVoice = z6; StringBuilder sb = new StringBuilder(); sb.append(getType()); sb.append(j); this.key = sb.toString(); } - public static /* synthetic */ StartOfChatEntry copy$default(StartOfChatEntry startOfChatEntry, long j, String str, boolean z2, boolean z3, boolean z4, boolean z5, Integer num, GuildMember guildMember, String str2, int i, Object obj) { - return startOfChatEntry.copy((i & 1) != 0 ? startOfChatEntry.channelId : j, (i & 2) != 0 ? startOfChatEntry.channelName : str, (i & 4) != 0 ? startOfChatEntry.canReadMessageHistory : z2, (i & 8) != 0 ? startOfChatEntry.canManageChannel : z3, (i & 16) != 0 ? startOfChatEntry.canManageThread : z4, (i & 32) != 0 ? startOfChatEntry.isThread : z5, (i & 64) != 0 ? startOfChatEntry.threadAutoArchiveDuration : num, (i & 128) != 0 ? startOfChatEntry.threadCreatorMember : guildMember, (i & 256) != 0 ? startOfChatEntry.threadCreatorName : str2); + public static /* synthetic */ StartOfChatEntry copy$default(StartOfChatEntry startOfChatEntry, long j, String str, boolean z2, boolean z3, boolean z4, boolean z5, Integer num, GuildMember guildMember, String str2, boolean z6, int i, Object obj) { + return startOfChatEntry.copy((i & 1) != 0 ? startOfChatEntry.channelId : j, (i & 2) != 0 ? startOfChatEntry.channelName : str, (i & 4) != 0 ? startOfChatEntry.canReadMessageHistory : z2, (i & 8) != 0 ? startOfChatEntry.canManageChannel : z3, (i & 16) != 0 ? startOfChatEntry.canManageThread : z4, (i & 32) != 0 ? startOfChatEntry.isThread : z5, (i & 64) != 0 ? startOfChatEntry.threadAutoArchiveDuration : num, (i & 128) != 0 ? startOfChatEntry.threadCreatorMember : guildMember, (i & 256) != 0 ? startOfChatEntry.threadCreatorName : str2, (i & 512) != 0 ? startOfChatEntry.isTextInVoice : z6); } public final long component1() { return this.channelId; } + public final boolean component10() { + return this.isTextInVoice; + } + public final String component2() { return this.channelName; } @@ -77,10 +83,10 @@ public final class StartOfChatEntry extends ChatListEntry { return this.threadCreatorName; } - public final StartOfChatEntry copy(long j, String str, boolean z2, boolean z3, boolean z4, boolean z5, Integer num, GuildMember guildMember, String str2) { + public final StartOfChatEntry copy(long j, String str, boolean z2, boolean z3, boolean z4, boolean z5, Integer num, GuildMember guildMember, String str2, boolean z6) { m.checkNotNullParameter(str, "channelName"); m.checkNotNullParameter(str2, "threadCreatorName"); - return new StartOfChatEntry(j, str, z2, z3, z4, z5, num, guildMember, str2); + return new StartOfChatEntry(j, str, z2, z3, z4, z5, num, guildMember, str2, z6); } public boolean equals(Object obj) { @@ -91,7 +97,7 @@ public final class StartOfChatEntry extends ChatListEntry { return false; } StartOfChatEntry startOfChatEntry = (StartOfChatEntry) obj; - return this.channelId == startOfChatEntry.channelId && m.areEqual(this.channelName, startOfChatEntry.channelName) && this.canReadMessageHistory == startOfChatEntry.canReadMessageHistory && this.canManageChannel == startOfChatEntry.canManageChannel && this.canManageThread == startOfChatEntry.canManageThread && this.isThread == startOfChatEntry.isThread && m.areEqual(this.threadAutoArchiveDuration, startOfChatEntry.threadAutoArchiveDuration) && m.areEqual(this.threadCreatorMember, startOfChatEntry.threadCreatorMember) && m.areEqual(this.threadCreatorName, startOfChatEntry.threadCreatorName); + return this.channelId == startOfChatEntry.channelId && m.areEqual(this.channelName, startOfChatEntry.channelName) && this.canReadMessageHistory == startOfChatEntry.canReadMessageHistory && this.canManageChannel == startOfChatEntry.canManageChannel && this.canManageThread == startOfChatEntry.canManageThread && this.isThread == startOfChatEntry.isThread && m.areEqual(this.threadAutoArchiveDuration, startOfChatEntry.threadAutoArchiveDuration) && m.areEqual(this.threadCreatorMember, startOfChatEntry.threadCreatorMember) && m.areEqual(this.threadCreatorName, startOfChatEntry.threadCreatorName) && this.isTextInVoice == startOfChatEntry.isTextInVoice; } public final boolean getCanManageChannel() { @@ -167,19 +173,31 @@ public final class StartOfChatEntry extends ChatListEntry { int i13 = z4 ? 1 : 0; int i14 = (i10 + i11) * 31; boolean z5 = this.isThread; - if (!z5) { - i2 = z5 ? 1 : 0; + if (z5) { + z5 = true; } - int i15 = (i14 + i2) * 31; + int i15 = z5 ? 1 : 0; + int i16 = z5 ? 1 : 0; + int i17 = z5 ? 1 : 0; + int i18 = (i14 + i15) * 31; Integer num = this.threadAutoArchiveDuration; - int hashCode2 = (i15 + (num != null ? num.hashCode() : 0)) * 31; + int hashCode2 = (i18 + (num != null ? num.hashCode() : 0)) * 31; GuildMember guildMember = this.threadCreatorMember; int hashCode3 = (hashCode2 + (guildMember != null ? guildMember.hashCode() : 0)) * 31; String str2 = this.threadCreatorName; if (str2 != null) { i = str2.hashCode(); } - return hashCode3 + i; + int i19 = (hashCode3 + i) * 31; + boolean z6 = this.isTextInVoice; + if (!z6) { + i2 = z6 ? 1 : 0; + } + return i19 + i2; + } + + public final boolean isTextInVoice() { + return this.isTextInVoice; } public final boolean isThread() { @@ -204,6 +222,8 @@ public final class StartOfChatEntry extends ChatListEntry { R.append(", threadCreatorMember="); R.append(this.threadCreatorMember); R.append(", threadCreatorName="); - return a.H(R, this.threadCreatorName, ")"); + R.append(this.threadCreatorName); + R.append(", isTextInVoice="); + return a.L(R, this.isTextInVoice, ")"); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$2.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$2.java index 3d0a778bb4..e30afd3f81 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$2.java +++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$2.java @@ -57,12 +57,13 @@ public final class WidgetChatListModelTop$Companion$getWelcomeEntry$2 Unit\n): OneShotPreDrawListener = OneShotPreDrawListener.add(this) { action(this) }"); } } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java index af9ae5ef14..65efe49ecd 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java @@ -346,7 +346,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi TextView textView = binding.f; m.checkNotNullExpressionValue(textView, "appInfoHeader"); String string = getString(R.string.app_information); - textView.setText(string + " - 102.4 - Alpha (102204)"); + textView.setText(string + " - 102.5 - Alpha (102205)"); binding.B.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$3(this)); binding.u.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE); binding.q.setOnClickListener(WidgetSettings$onViewBound$1$6.INSTANCE); diff --git a/app/src/main/res/layout-v22/widget_guild_role_subscription_plan_format.xml b/app/src/main/res/layout-v22/widget_guild_role_subscription_plan_format.xml index ff0645ca0e..925394fc52 100644 --- a/app/src/main/res/layout-v22/widget_guild_role_subscription_plan_format.xml +++ b/app/src/main/res/layout-v22/widget_guild_role_subscription_plan_format.xml @@ -3,6 +3,6 @@ - - + + diff --git a/app/src/main/res/layout-v22/widget_server_settings_empty_guild_role_subscription.xml b/app/src/main/res/layout-v22/widget_server_settings_empty_guild_role_subscription.xml index 03f0f0b9b3..07713f9478 100644 --- a/app/src/main/res/layout-v22/widget_server_settings_empty_guild_role_subscription.xml +++ b/app/src/main/res/layout-v22/widget_server_settings_empty_guild_role_subscription.xml @@ -8,7 +8,7 @@ - +