diff --git a/app/build.gradle b/app/build.gradle index 091d4fde19..b741965732 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 30 - versionCode 100110 - versionName "100.10 - Beta" + versionCode 100111 + versionName "100.11 - Beta" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a0b3e98881..88928ed5a2 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/api/guild/GuildFeature.java b/app/src/main/java/com/discord/api/guild/GuildFeature.java index 0077cc03a8..a3ff6ff240 100644 --- a/app/src/main/java/com/discord/api/guild/GuildFeature.java +++ b/app/src/main/java/com/discord/api/guild/GuildFeature.java @@ -17,6 +17,7 @@ public enum GuildFeature { MEMBER_VERIFICATION_GATE_ENABLED, PREVIEW_ENABLED, ROLE_SUBSCRIPTIONS_ENABLED, + ROLE_SUBSCRIPTIONS_AVAILABLE_FOR_PURCHASE, THREAD_DEFAULT_AUTO_ARCHIVE_DURATION, HUB, THREADS_ENABLED, diff --git a/app/src/main/java/com/discord/stores/StoreApplicationCommandFrecency$populateStore$1.java b/app/src/main/java/com/discord/stores/StoreApplicationCommandFrecency$populateStore$1.java deleted file mode 100644 index 3a07d753a8..0000000000 --- a/app/src/main/java/com/discord/stores/StoreApplicationCommandFrecency$populateStore$1.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.discord.stores; - -import com.discord.utilities.frecency.FrecencyTracker; -import d0.g0.s; -import d0.g0.w; -import d0.t.g0; -import d0.t.h0; -import d0.t.u; -import d0.z.d.o; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import kotlin.Unit; -import kotlin.jvm.functions.Function0; -/* compiled from: StoreApplicationCommandFrecency.kt */ -public final class StoreApplicationCommandFrecency$populateStore$1 extends o implements Function0 { - public final /* synthetic */ StoreApplicationCommandFrecency this$0; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public StoreApplicationCommandFrecency$populateStore$1(StoreApplicationCommandFrecency storeApplicationCommandFrecency) { - super(0); - this.this$0 = storeApplicationCommandFrecency; - } - - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public final void mo1invoke() { - LinkedHashMap linkedHashMap = new LinkedHashMap(); - for (String str : FrecencyTracker.getSortedKeys$default(StoreApplicationCommandFrecency.access$getFrecency$p(this.this$0), 0, 1, null)) { - if (w.contains$default((CharSequence) str, (CharSequence) ":", false, 2, (Object) null)) { - List split$default = w.split$default((CharSequence) str, new String[]{":"}, false, 0, 6, (Object) null); - Long longOrNull = s.toLongOrNull((String) split$default.get(1)); - long longValue = longOrNull != null ? longOrNull.longValue() : 0; - String str2 = (String) split$default.get(0); - List list = (List) linkedHashMap.get(Long.valueOf(longValue)); - if (list == null) { - list = new ArrayList(); - linkedHashMap.put(Long.valueOf(longValue), list); - } - list.add(str2); - } else { - List list2 = (List) linkedHashMap.get(0L); - if (list2 == null) { - list2 = new ArrayList(); - linkedHashMap.put(0L, list2); - } - list2.add(str); - } - } - StoreApplicationCommandFrecency storeApplicationCommandFrecency = this.this$0; - LinkedHashMap linkedHashMap2 = new LinkedHashMap(g0.mapCapacity(linkedHashMap.size())); - for (Map.Entry entry : linkedHashMap.entrySet()) { - linkedHashMap2.put(entry.getKey(), u.toList((Iterable) entry.getValue())); - } - StoreApplicationCommandFrecency.access$setTopCommandIds$p(storeApplicationCommandFrecency, h0.toMutableMap(linkedHashMap2)); - StoreApplicationCommandFrecency.access$setTopCommandIdsSnapshot$p(this.this$0, linkedHashMap); - } -} diff --git a/app/src/main/java/com/discord/stores/StoreApplicationCommandFrecency.java b/app/src/main/java/com/discord/stores/StoreApplicationCommandFrecency.java index 1827e94c51..98f389e718 100644 --- a/app/src/main/java/com/discord/stores/StoreApplicationCommandFrecency.java +++ b/app/src/main/java/com/discord/stores/StoreApplicationCommandFrecency.java @@ -6,10 +6,13 @@ import com.discord.utilities.applicationcommands.ApplicationCommandFrecencyTrack import com.discord.utilities.frecency.FrecencyTracker; import com.discord.utilities.persister.Persister; import com.discord.widgets.chat.input.MentionUtilsKt; +import d0.g0.s; import d0.g0.w; +import d0.t.g0; import d0.t.h0; import d0.t.n; import d0.t.o; +import d0.t.u; import d0.z.d.m; import java.util.ArrayList; import java.util.Collection; @@ -67,18 +70,10 @@ public final class StoreApplicationCommandFrecency extends StoreV2 { return storeApplicationCommandFrecency.topCommandIds; } - public static final /* synthetic */ Map access$getTopCommandIdsSnapshot$p(StoreApplicationCommandFrecency storeApplicationCommandFrecency) { - return storeApplicationCommandFrecency.topCommandIdsSnapshot; - } - public static final /* synthetic */ void access$setTopCommandIds$p(StoreApplicationCommandFrecency storeApplicationCommandFrecency, Map map) { storeApplicationCommandFrecency.topCommandIds = map; } - public static final /* synthetic */ void access$setTopCommandIdsSnapshot$p(StoreApplicationCommandFrecency storeApplicationCommandFrecency, Map map) { - storeApplicationCommandFrecency.topCommandIdsSnapshot = map; - } - private final List getAllTopCommandIds(Long l) { Collection sortedKeys$default = FrecencyTracker.getSortedKeys$default(this.frecency, 0, 1, null); ArrayList arrayList = new ArrayList(); @@ -138,7 +133,34 @@ public final class StoreApplicationCommandFrecency extends StoreV2 { } public final void populateStore() { - this.dispatcher.schedule(new StoreApplicationCommandFrecency$populateStore$1(this)); + LinkedHashMap linkedHashMap = new LinkedHashMap(); + for (String str : FrecencyTracker.getSortedKeys$default(this.frecency, 0, 1, null)) { + if (w.contains$default((CharSequence) str, (CharSequence) ":", false, 2, (Object) null)) { + List split$default = w.split$default((CharSequence) str, new String[]{":"}, false, 0, 6, (Object) null); + Long longOrNull = s.toLongOrNull((String) split$default.get(1)); + long longValue = longOrNull != null ? longOrNull.longValue() : 0; + String str2 = (String) split$default.get(0); + List list = (List) linkedHashMap.get(Long.valueOf(longValue)); + if (list == null) { + list = new ArrayList(); + linkedHashMap.put(Long.valueOf(longValue), list); + } + list.add(str2); + } else { + List list2 = (List) linkedHashMap.get(0L); + if (list2 == null) { + list2 = new ArrayList(); + linkedHashMap.put(0L, list2); + } + list2.add(str); + } + } + LinkedHashMap linkedHashMap2 = new LinkedHashMap(g0.mapCapacity(linkedHashMap.size())); + for (Map.Entry entry : linkedHashMap.entrySet()) { + linkedHashMap2.put(entry.getKey(), u.toList((Iterable) entry.getValue())); + } + this.topCommandIds = h0.toMutableMap(linkedHashMap2); + this.topCommandIdsSnapshot = linkedHashMap; } @Override // com.discord.stores.StoreV2 diff --git a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildRoleSubscriptionsFeatureFlag.java b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildRoleSubscriptionsFeatureFlag.java index 0746fc746b..5e86b7842c 100644 --- a/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildRoleSubscriptionsFeatureFlag.java +++ b/app/src/main/java/com/discord/widgets/guild_role_subscriptions/GuildRoleSubscriptionsFeatureFlag.java @@ -71,7 +71,7 @@ public final class GuildRoleSubscriptionsFeatureFlag { public final boolean canGuildSeePremiumMemberships(long j) { Guild guild; - return isGuildEligibleForRoleSubscriptions(j) && (guild = this.storeGuilds.getGuild(j)) != null && guild.hasFeature(GuildFeature.ROLE_SUBSCRIPTIONS_ENABLED); + return isGuildEligibleForRoleSubscriptions(j) && (guild = this.storeGuilds.getGuild(j)) != null && guild.hasFeature(GuildFeature.ROLE_SUBSCRIPTIONS_AVAILABLE_FOR_PURCHASE); } public final boolean isGuildEligibleForRoleSubscriptions(long j) { 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 9ebd201f8a..d0bc226cae 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java @@ -313,7 +313,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 + " - 100.10 - Beta (100110)"); + textView.setText(string + " - 100.11 - Beta (100111)"); binding.A.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 b7f26de4e6..0bc16e8566 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1463,7 +1463,7 @@ Select a color Transparency Use Default - 2ba370b3296e486cac5917b5a64454a1 + e202235cfa984e42bba4643ef6e08804 Coming Soon Slash command application {applicationName} {applicationName} application