From e5dc602af929e9bccd0d4702ff1babbb9730dffa Mon Sep 17 00:00:00 2001 From: Juby210 Date: Fri, 12 Nov 2021 10:24:43 +0100 Subject: [PATCH] 101.6 - Beta (101106) --- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 2 +- .../com/discord/restapi/RestAPIInterface.java | 4 +- .../discord/stores/StoreMessagesHolder.java | 2 +- .../com/discord/utilities/rest/RestAPI.java | 4 +- .../InviteJoinHelper$joinViaInvite$4.java | 63 +++++++++---------- .../widgets/settings/WidgetSettings.java | 2 +- app/src/main/res/values/strings.xml | 2 +- 8 files changed, 41 insertions(+), 42 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5eaacd26a9..15a51de549 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 30 - versionCode 101105 - versionName "101.5 - Beta" + versionCode 101106 + versionName "101.6 - Beta" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6d9c9965d0..e2d8459c8e 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/restapi/RestAPIInterface.java b/app/src/main/java/com/discord/restapi/RestAPIInterface.java index 4bbea449f5..8aa19005c8 100644 --- a/app/src/main/java/com/discord/restapi/RestAPIInterface.java +++ b/app/src/main/java/com/discord/restapi/RestAPIInterface.java @@ -354,7 +354,7 @@ public interface RestAPIInterface { @b("guilds/{guildId}/integrations/{integrationId}") Observable deleteGuildIntegration(@s("guildId") long j, @s("integrationId") long j2); - @b("/guilds/{guildId}/role-subscriptions/group-listings/{groupListingId}/subscription-listings/{listingId}") + @b("guilds/{guildId}/role-subscriptions/group-listings/{groupListingId}/subscription-listings/{listingId}") Observable deleteGuildRoleSubscriptionTierListing(@s("guildId") long j, @s("groupListingId") long j2, @s("listingId") long j3); @b("guild-events/{eventId}") @@ -899,7 +899,7 @@ public interface RestAPIInterface { @n("guilds/{guildId}/role-subscriptions/group-listings/{groupListingId}") Observable updateGuildRoleSubscriptionGroupListing(@s("guildId") long j, @s("groupListingId") long j2, @a RestAPIParams.UpdateGuildRoleSubscriptionGroupListing updateGuildRoleSubscriptionGroupListing); - @n("/guilds/{guildId}/role-subscriptions/group-listings/{groupListingId}/subscription-listings/{listingId}") + @n("guilds/{guildId}/role-subscriptions/group-listings/{groupListingId}/subscription-listings/{listingId}") Observable updateGuildRoleSubscriptionTierListing(@s("guildId") long j, @s("groupListingId") long j2, @s("listingId") long j3, @a RestAPIParams.UpdateGuildRoleSubscriptionTierListing updateGuildRoleSubscriptionTierListing); @n("guild-events/{eventId}") diff --git a/app/src/main/java/com/discord/stores/StoreMessagesHolder.java b/app/src/main/java/com/discord/stores/StoreMessagesHolder.java index 3dd0e7de60..35b530f751 100644 --- a/app/src/main/java/com/discord/stores/StoreMessagesHolder.java +++ b/app/src/main/java/com/discord/stores/StoreMessagesHolder.java @@ -38,7 +38,7 @@ public class StoreMessagesHolder { private static final int MAX_MESSAGES_PER_CHANNEL = 200; private static final int MAX_MESSAGES_PER_CHANNEL_TRIM = 100; private final Set activeChannels = new HashSet(); - private final Persister>> cache = new Persister<>("STORE_MESSAGES_CACHE_V36", new HashMap()); + private final Persister>> cache = new Persister<>("STORE_MESSAGES_CACHE_V37", new HashMap()); private boolean cacheEnabled; private Subscription cachePersistSubscription; private long cachePersistedAt = ClockFactory.get().currentTimeMillis(); diff --git a/app/src/main/java/com/discord/utilities/rest/RestAPI.java b/app/src/main/java/com/discord/utilities/rest/RestAPI.java index fbe227abb8..848fb4d2c2 100644 --- a/app/src/main/java/com/discord/utilities/rest/RestAPI.java +++ b/app/src/main/java/com/discord/utilities/rest/RestAPI.java @@ -839,7 +839,7 @@ public final class RestAPI implements RestAPIInterface { } @Override // com.discord.restapi.RestAPIInterface - @b("/guilds/{guildId}/role-subscriptions/group-listings/{groupListingId}/subscription-listings/{listingId}") + @b("guilds/{guildId}/role-subscriptions/group-listings/{groupListingId}/subscription-listings/{listingId}") public Observable deleteGuildRoleSubscriptionTierListing(@s("guildId") long j, @s("groupListingId") long j2, @s("listingId") long j3) { return this._api.deleteGuildRoleSubscriptionTierListing(j, j2, j3); } @@ -2189,7 +2189,7 @@ public final class RestAPI implements RestAPIInterface { } @Override // com.discord.restapi.RestAPIInterface - @i0.f0.n("/guilds/{guildId}/role-subscriptions/group-listings/{groupListingId}/subscription-listings/{listingId}") + @i0.f0.n("guilds/{guildId}/role-subscriptions/group-listings/{groupListingId}/subscription-listings/{listingId}") public Observable updateGuildRoleSubscriptionTierListing(@s("guildId") long j, @s("groupListingId") long j2, @s("listingId") long j3, @i0.f0.a RestAPIParams.UpdateGuildRoleSubscriptionTierListing updateGuildRoleSubscriptionTierListing) { m.checkNotNullParameter(updateGuildRoleSubscriptionTierListing, "body"); return this._api.updateGuildRoleSubscriptionTierListing(j, j2, j3, updateGuildRoleSubscriptionTierListing); diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/InviteJoinHelper$joinViaInvite$4.java b/app/src/main/java/com/discord/widgets/guilds/invite/InviteJoinHelper$joinViaInvite$4.java index a74ee37867..dbcea39d82 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/InviteJoinHelper$joinViaInvite$4.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/InviteJoinHelper$joinViaInvite$4.java @@ -1,6 +1,7 @@ package com.discord.widgets.guilds.invite; import android.content.Context; +import androidx.fragment.app.FragmentActivity; import c.a.d.j; import com.discord.R; import com.discord.api.channel.Channel; @@ -43,7 +44,7 @@ import kotlin.jvm.internal.Ref$ObjectRef; import kotlinx.coroutines.CoroutineScope; import retrofit2.HttpException; /* compiled from: InviteJoinHelper.kt */ -@e(c = "com.discord.widgets.guilds.invite.InviteJoinHelper$joinViaInvite$4", f = "InviteJoinHelper.kt", l = {74, 99, 108, 109, 123, 162, 193}, m = "invokeSuspend") +@e(c = "com.discord.widgets.guilds.invite.InviteJoinHelper$joinViaInvite$4", f = "InviteJoinHelper.kt", l = {76, 101, 110, 111, 125, 164, 193}, m = "invokeSuspend") public final class InviteJoinHelper$joinViaInvite$4 extends k implements Function2, Object> { public final /* synthetic */ String $captchaKey; public final /* synthetic */ AppFragment $fragment; @@ -84,21 +85,21 @@ public final class InviteJoinHelper$joinViaInvite$4 extends k implements Functio return ((InviteJoinHelper$joinViaInvite$4) create(coroutineScope, continuation)).invokeSuspend(Unit.a); } - /* JADX WARNING: Removed duplicated region for block: B:104:0x0276 */ - /* JADX WARNING: Removed duplicated region for block: B:117:0x02c1 */ - /* JADX WARNING: Removed duplicated region for block: B:121:0x02d2 */ - /* JADX WARNING: Removed duplicated region for block: B:151:0x0369 */ - /* JADX WARNING: Removed duplicated region for block: B:152:0x0377 */ - /* JADX WARNING: Removed duplicated region for block: B:164:0x03cb */ - /* JADX WARNING: Removed duplicated region for block: B:167:0x03de A[RETURN] */ - /* JADX WARNING: Removed duplicated region for block: B:69:0x01a2 */ - /* JADX WARNING: Removed duplicated region for block: B:74:0x01af */ - /* JADX WARNING: Removed duplicated region for block: B:79:0x01d5 */ - /* JADX WARNING: Removed duplicated region for block: B:80:0x01d7 */ - /* JADX WARNING: Removed duplicated region for block: B:82:0x01da */ - /* JADX WARNING: Removed duplicated region for block: B:87:0x01f5 */ - /* JADX WARNING: Removed duplicated region for block: B:94:0x023e A[RETURN] */ - /* JADX WARNING: Removed duplicated region for block: B:95:0x023f */ + /* JADX WARNING: Removed duplicated region for block: B:104:0x027f */ + /* JADX WARNING: Removed duplicated region for block: B:117:0x02ca */ + /* JADX WARNING: Removed duplicated region for block: B:121:0x02db */ + /* JADX WARNING: Removed duplicated region for block: B:151:0x0372 */ + /* JADX WARNING: Removed duplicated region for block: B:152:0x0380 */ + /* JADX WARNING: Removed duplicated region for block: B:164:0x03d4 */ + /* JADX WARNING: Removed duplicated region for block: B:167:0x03e7 A[RETURN] */ + /* JADX WARNING: Removed duplicated region for block: B:69:0x01ab */ + /* JADX WARNING: Removed duplicated region for block: B:74:0x01b8 */ + /* JADX WARNING: Removed duplicated region for block: B:79:0x01de */ + /* JADX WARNING: Removed duplicated region for block: B:80:0x01e0 */ + /* JADX WARNING: Removed duplicated region for block: B:82:0x01e3 */ + /* JADX WARNING: Removed duplicated region for block: B:87:0x01fe */ + /* JADX WARNING: Removed duplicated region for block: B:94:0x0247 A[RETURN] */ + /* JADX WARNING: Removed duplicated region for block: B:95:0x0248 */ /* JADX WARNING: Unknown variable types count: 2 */ @Override // d0.w.i.a.a public final Object invokeSuspend(Object obj) { @@ -128,6 +129,7 @@ public final class InviteJoinHelper$joinViaInvite$4 extends k implements Functio List l2; List l3; Object coroutine_suspended = c.getCOROUTINE_SUSPENDED(); + String str = null; switch (this.label) { case 0: l.throwOnFailure(obj); @@ -145,15 +147,23 @@ public final class InviteJoinHelper$joinViaInvite$4 extends k implements Functio boolean z6 = (guild4 == null || (l = guild4.l()) == null || !l.contains(GuildFeature.HUB)) ? false : true; if (z6 && !GrowthTeamFeatures.INSTANCE.isHubEnabled()) { c.a.d.m.g(ref$ObjectRef4.element, R.string.discord_u_coming_soon_to_mobile, 0, null, 12); + return Unit.a; } else if (z6 && GrowthTeamFeatures.INSTANCE.isHubEmailConnectionEnabled()) { Context context = ref$ObjectRef4.element; HubEmailEntryPoint hubEmailEntryPoint = HubEmailEntryPoint.Invite; Guild guild5 = this.$invite.getGuild(); - String v = guild5 != null ? guild5.v() : null; - if (v == null) { - v = ""; + if (guild5 != null) { + str = guild5.v(); } - j.d(context, WidgetHubEmailFlow.class, new HubEmailArgs(v, this.$invite.getApproximateMemberCount(), hubEmailEntryPoint)); + if (str == null) { + str = ""; + } + j.d(context, WidgetHubEmailFlow.class, new HubEmailArgs(str, this.$invite.getApproximateMemberCount(), hubEmailEntryPoint)); + FragmentActivity activity = this.$fragment.getActivity(); + if (activity != null) { + activity.onBackPressed(); + } + return Unit.a; } else if (!z4 || !z5) { ref$ObjectRef2 = ref$ObjectRef4; modelInvite4 = null; @@ -426,18 +436,7 @@ public final class InviteJoinHelper$joinViaInvite$4 extends k implements Functio if (((guild != null || (boxLong2 = b.boxLong(guild.p())) == null) ? null : StoreStream.Companion.getGuilds().getGuilds().get(b.boxLong(boxLong2.longValue()))) != null) { } } - modelInvite = null; - function2 = this.$onInviteFlowFinished; - if (modelInvite == null) { - } - this.L$0 = null; - this.L$1 = null; - this.L$2 = null; - this.L$3 = null; - this.label = 7; - if (function2.invoke(modelInvite, this) == coroutine_suspended) { - } - return Unit.a; + break; case 1: InviteJoinHelper$joinViaInvite$4 inviteJoinHelper$joinViaInvite$4 = (InviteJoinHelper$joinViaInvite$4) this.L$3; Ref$ObjectRef ref$ObjectRef6 = (Ref$ObjectRef) this.L$1; 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 2b666cafc4..92cc73298a 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 + " - 101.5 - Beta (101105)"); + textView.setText(string + " - 101.6 - Beta (101106)"); 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/values/strings.xml b/app/src/main/res/values/strings.xml index 8c571179b6..9a9d1b2e5f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1475,7 +1475,7 @@ Select a color Transparency Use Default - be51239636d841e78cce35a4c7b37dec + 7fda0ac2434f4424ba121d532be29be8 Coming Soon Slash command application {applicationName} {applicationName} application