diff --git a/app/build.gradle b/app/build.gradle index 78bf54d2a2..1d0bb39090 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 30 - versionCode 104106 - versionName "104.6 - Beta" + versionCode 104107 + versionName "104.7 - Beta" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 364fa52ffe..f9f0daab7f 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/utilities/directories/DirectoryUtilsKt.java b/app/src/main/java/com/discord/utilities/directories/DirectoryUtilsKt.java index 856e49abde..2ce7c0f64a 100644 --- a/app/src/main/java/com/discord/utilities/directories/DirectoryUtilsKt.java +++ b/app/src/main/java/com/discord/utilities/directories/DirectoryUtilsKt.java @@ -10,7 +10,7 @@ import java.util.List; public final class DirectoryUtilsKt { private static final int MAXIMUM_SIZE = 200; public static final int MAX_HOME_CATEGORY_COUNT = 5; - private static final int MAX_RECOMMENDATION_COUNT = 5; + public static final int MAX_RECOMMENDATION_COUNT = 5; private static final int MINIMUM_MEMBER_COUNT = 5; private static final int MINIMUM_SIZE = 5; @@ -44,7 +44,7 @@ public final class DirectoryUtilsKt { return u.take(u.sortedWith(arrayList, new DirectoryUtilsKt$sortByAdded$$inlined$sortedByDescending$1()), 5); } - public static final List sortByRanking(List list) { + public static final List sortByRanking(List list, int i) { m.checkNotNullParameter(list, "$this$sortByRanking"); ArrayList arrayList = new ArrayList(); for (Object obj : list) { @@ -52,6 +52,6 @@ public final class DirectoryUtilsKt { arrayList.add(obj); } } - return u.take(rank$default(arrayList, null, 1, null), 4); + return u.take(rank$default(arrayList, null, 1, null), i); } } diff --git a/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$7.java b/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$7.java index 6f95aa4920..7841742f08 100644 --- a/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$7.java +++ b/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$7.java @@ -1,21 +1,21 @@ package com.discord.utilities.rx; -import kotlin.jvm.functions.Function19; -import rx.functions.Func3; +import kotlin.jvm.functions.Function16; +import rx.functions.Func8; /* compiled from: ObservableCombineLatestOverloads.kt */ -public final class ObservableCombineLatestOverloadsKt$combineLatest$7 implements Func3, Holder, T19, R> { - public final /* synthetic */ Function19 $combineFunction; +public final class ObservableCombineLatestOverloadsKt$combineLatest$7 implements Func8, T10, T11, T12, T13, T14, T15, T16, R> { + public final /* synthetic */ Function16 $combineFunction; - public ObservableCombineLatestOverloadsKt$combineLatest$7(Function19 function19) { - this.$combineFunction = function19; + public ObservableCombineLatestOverloadsKt$combineLatest$7(Function16 function16) { + this.$combineFunction = function16; } - public final R call(Holder holder, Holder holder2, T19 t19) { - return (R) this.$combineFunction.invoke(holder.getT1(), holder.getT2(), holder.getT3(), holder.getT4(), holder.getT5(), holder.getT6(), holder.getT7(), holder.getT8(), holder.getT9(), holder2.getT1(), holder2.getT2(), holder2.getT3(), holder2.getT4(), holder2.getT5(), holder2.getT6(), holder2.getT7(), holder2.getT8(), holder2.getT9(), t19); + public final R call(Holder holder, T10 t10, T11 t11, T12 t12, T13 t13, T14 t14, T15 t15, T16 t16) { + return (R) this.$combineFunction.invoke(holder.getT1(), holder.getT2(), holder.getT3(), holder.getT4(), holder.getT5(), holder.getT6(), holder.getT7(), holder.getT8(), holder.getT9(), t10, t11, t12, t13, t14, t15, t16); } - @Override // rx.functions.Func3 - public /* bridge */ /* synthetic */ Object call(Object obj, Object obj2, Object obj3) { - return call((Holder) ((Holder) obj), (Holder) ((Holder) obj2), (Holder) obj3); + @Override // rx.functions.Func8 + public /* bridge */ /* synthetic */ Object call(Object obj, Object obj2, Object obj3, Object obj4, Object obj5, Object obj6, Object obj7, Object obj8) { + return call((Holder) ((Holder) obj), (Holder) obj2, obj3, obj4, obj5, obj6, obj7, obj8); } } diff --git a/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$8.java b/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$8.java new file mode 100644 index 0000000000..2ba7183f97 --- /dev/null +++ b/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt$combineLatest$8.java @@ -0,0 +1,21 @@ +package com.discord.utilities.rx; + +import kotlin.jvm.functions.Function19; +import rx.functions.Func3; +/* compiled from: ObservableCombineLatestOverloads.kt */ +public final class ObservableCombineLatestOverloadsKt$combineLatest$8 implements Func3, Holder, T19, R> { + public final /* synthetic */ Function19 $combineFunction; + + public ObservableCombineLatestOverloadsKt$combineLatest$8(Function19 function19) { + this.$combineFunction = function19; + } + + public final R call(Holder holder, Holder holder2, T19 t19) { + return (R) this.$combineFunction.invoke(holder.getT1(), holder.getT2(), holder.getT3(), holder.getT4(), holder.getT5(), holder.getT6(), holder.getT7(), holder.getT8(), holder.getT9(), holder2.getT1(), holder2.getT2(), holder2.getT3(), holder2.getT4(), holder2.getT5(), holder2.getT6(), holder2.getT7(), holder2.getT8(), holder2.getT9(), t19); + } + + @Override // rx.functions.Func3 + public /* bridge */ /* synthetic */ Object call(Object obj, Object obj2, Object obj3) { + return call((Holder) ((Holder) obj), (Holder) ((Holder) obj2), (Holder) obj3); + } +} diff --git a/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt.java b/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt.java index bc16a6b5cc..ed00199f85 100644 --- a/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt.java +++ b/app/src/main/java/com/discord/utilities/rx/ObservableCombineLatestOverloadsKt.java @@ -7,6 +7,7 @@ import kotlin.jvm.functions.Function12; import kotlin.jvm.functions.Function13; import kotlin.jvm.functions.Function14; import kotlin.jvm.functions.Function15; +import kotlin.jvm.functions.Function16; import kotlin.jvm.functions.Function19; import rx.Observable; /* compiled from: ObservableCombineLatestOverloads.kt */ @@ -128,6 +129,29 @@ public final class ObservableCombineLatestOverloadsKt { return e; } + public static final Observable combineLatest(Observable observable, Observable observable2, Observable observable3, Observable observable4, Observable observable5, Observable observable6, Observable observable7, Observable observable8, Observable observable9, Observable observable10, Observable observable11, Observable observable12, Observable observable13, Observable observable14, Observable observable15, Observable observable16, Function16 function16) { + m.checkNotNullParameter(observable, "o1"); + m.checkNotNullParameter(observable2, "o2"); + m.checkNotNullParameter(observable3, "o3"); + m.checkNotNullParameter(observable4, "o4"); + m.checkNotNullParameter(observable5, "o5"); + m.checkNotNullParameter(observable6, "o6"); + m.checkNotNullParameter(observable7, "o7"); + m.checkNotNullParameter(observable8, "o8"); + m.checkNotNullParameter(observable9, "o9"); + m.checkNotNullParameter(observable10, "o10"); + m.checkNotNullParameter(observable11, "o11"); + m.checkNotNullParameter(observable12, "o12"); + m.checkNotNullParameter(observable13, "o13"); + m.checkNotNullParameter(observable14, "o14"); + m.checkNotNullParameter(observable15, "o15"); + m.checkNotNullParameter(observable16, "o16"); + m.checkNotNullParameter(function16, "combineFunction"); + Observable d = Observable.d(createHolderObservable(observable, observable2, observable3, observable4, observable5, observable6, observable7, observable8, observable9), observable10, observable11, observable12, observable13, observable14, observable15, observable16, new ObservableCombineLatestOverloadsKt$combineLatest$7(function16)); + m.checkNotNullExpressionValue(d, "Observable\n .comb…t16\n )\n }"); + return d; + } + public static final Observable combineLatest(Observable observable, Observable observable2, Observable observable3, Observable observable4, Observable observable5, Observable observable6, Observable observable7, Observable observable8, Observable observable9, Observable observable10, Observable observable11, Observable observable12, Observable observable13, Observable observable14, Observable observable15, Observable observable16, Observable observable17, Observable observable18, Observable observable19, Function19 function19) { m.checkNotNullParameter(observable, "o1"); m.checkNotNullParameter(observable2, "o2"); @@ -149,7 +173,7 @@ public final class ObservableCombineLatestOverloadsKt { m.checkNotNullParameter(observable18, "o18"); m.checkNotNullParameter(observable19, "o19"); m.checkNotNullParameter(function19, "combineFunction"); - Observable i = Observable.i(createHolderObservable(observable, observable2, observable3, observable4, observable5, observable6, observable7, observable8, observable9), createHolderObservable(observable10, observable11, observable12, observable13, observable14, observable15, observable16, observable17, observable18), observable19, new ObservableCombineLatestOverloadsKt$combineLatest$7(function19)); + Observable i = Observable.i(createHolderObservable(observable, observable2, observable3, observable4, observable5, observable6, observable7, observable8, observable9), createHolderObservable(observable10, observable11, observable12, observable13, observable14, observable15, observable16, observable17, observable18), observable19, new ObservableCombineLatestOverloadsKt$combineLatest$8(function19)); m.checkNotNullExpressionValue(i, "Observable\n .comb…o19\n )\n }"); return i; } diff --git a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$get$1.java b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$get$1.java index 931a64db7c..429afabcd7 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$get$1.java +++ b/app/src/main/java/com/discord/widgets/chat/list/model/WidgetChatListModel$Companion$get$1.java @@ -1,5 +1,6 @@ package com.discord.widgets.chat.list.model; +import com.discord.api.channel.ChannelUtils; import com.discord.stores.StoreChannelsSelected; import com.discord.widgets.chat.list.model.WidgetChatListModel; import j0.k.b; @@ -11,12 +12,13 @@ public final class WidgetChatListModel$Companion$get$1 implements b call(StoreChannelsSelected.ResolvedSelectedChannel resolvedSelectedChannel) { if (resolvedSelectedChannel instanceof StoreChannelsSelected.ResolvedSelectedChannel.Channel) { - return WidgetChatListModel.Companion.access$getChannel(WidgetChatListModel.Companion, ((StoreChannelsSelected.ResolvedSelectedChannel.Channel) resolvedSelectedChannel).getChannel()); - } - if (!(resolvedSelectedChannel instanceof StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft)) { + StoreChannelsSelected.ResolvedSelectedChannel.Channel channel = (StoreChannelsSelected.ResolvedSelectedChannel.Channel) resolvedSelectedChannel; + return ChannelUtils.o(channel.getChannel()) ? new j(null) : WidgetChatListModel.Companion.access$getChannel(WidgetChatListModel.Companion, channel.getChannel()); + } else if (!(resolvedSelectedChannel instanceof StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft)) { return new j(null); + } else { + StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft threadDraft = (StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft) resolvedSelectedChannel; + return WidgetChatListModel.Companion.access$getThreadDraft(WidgetChatListModel.Companion, threadDraft.getParentChannel(), threadDraft.getStarterMessageId()); } - StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft threadDraft = (StoreChannelsSelected.ResolvedSelectedChannel.ThreadDraft) resolvedSelectedChannel; - return WidgetChatListModel.Companion.access$getThreadDraft(WidgetChatListModel.Companion, threadDraft.getParentChannel(), threadDraft.getStarterMessageId()); } } diff --git a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryCategory.java b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryCategory.java index 1f53272e76..8c322026de 100644 --- a/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryCategory.java +++ b/app/src/main/java/com/discord/widgets/directories/WidgetDirectoryCategory.java @@ -31,7 +31,6 @@ import d0.z.d.a0; import d0.z.d.m; import java.util.ArrayList; import java.util.Collection; -import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; import kotlin.Lazy; @@ -87,7 +86,6 @@ public final class WidgetDirectoryCategory extends AppFragment { private final void configureHomeUi(WidgetDirectoriesViewModel.ViewState viewState) { List directoryItems; - Object obj; List directoryItems2; List directoryItems3; if (viewState.getChannel() != null) { @@ -111,7 +109,7 @@ public final class WidgetDirectoryCategory extends AppFragment { sortByAdded = null; } if (!(sortByAdded == null || (directoryItems3 = toDirectoryItems(sortByAdded)) == null)) { - arrayList.add(new DirectoryChannelItem.SectionHeader(R.string.search_newest_short)); + arrayList.add(new DirectoryChannelItem.SectionHeader(R.string.search_newest)); arrayList.addAll(directoryItems3); for (DirectoryChannelItem.DirectoryItem directoryItem : directoryItems3) { linkedHashSet.add(Long.valueOf(directoryItem.getDirectoryEntryData().getEntry().e().h())); @@ -119,51 +117,43 @@ public final class WidgetDirectoryCategory extends AppFragment { } } if (hubUnreadsRecommendations) { - Iterator it = viewState.getAllDirectoryEntryData().iterator(); - while (true) { - if (!it.hasNext()) { - obj = null; + ArrayList arrayList3 = new ArrayList(); + for (DirectoryEntryData directoryEntryData : viewState.getAllDirectoryEntryData()) { + if (arrayList3.size() >= 2) { break; + } else if (!linkedHashSet.contains(Long.valueOf(directoryEntryData.getEntry().e().h()))) { + arrayList3.add(directoryEntryData); + linkedHashSet.add(Long.valueOf(directoryEntryData.getEntry().e().h())); } - obj = it.next(); - if (!linkedHashSet.contains(Long.valueOf(((DirectoryEntryData) obj).getEntry().e().h()))) { - break; - } - } - DirectoryEntryData directoryEntryData = (DirectoryEntryData) obj; - if (directoryEntryData != null) { - linkedHashSet.add(Long.valueOf(directoryEntryData.getEntry().e().h())); - } else { - directoryEntryData = null; } List allDirectoryEntryData = viewState.getAllDirectoryEntryData(); - ArrayList arrayList3 = new ArrayList(); - for (Object obj2 : allDirectoryEntryData) { - if (!linkedHashSet.contains(Long.valueOf(((DirectoryEntryData) obj2).getEntry().e().h()))) { - arrayList3.add(obj2); + ArrayList arrayList4 = new ArrayList(); + for (Object obj : allDirectoryEntryData) { + if (!linkedHashSet.contains(Long.valueOf(((DirectoryEntryData) obj).getEntry().e().h()))) { + arrayList4.add(obj); } } - List sortByRanking = DirectoryUtilsKt.sortByRanking(arrayList3); + List sortByRanking = DirectoryUtilsKt.sortByRanking(arrayList4, 5 - arrayList3.size()); if (!sortByRanking.isEmpty()) { arrayList2 = sortByRanking; } if (!(arrayList2 == null || (directoryItems2 = toDirectoryItems(arrayList2)) == null)) { arrayList.add(new DirectoryChannelItem.SectionHeader(R.string.directory_category_recommended)); - if (directoryEntryData != null) { - arrayList.add(new DirectoryChannelItem.DirectoryItem(directoryEntryData)); + for (DirectoryEntryData directoryEntryData2 : arrayList3) { + arrayList.add(new DirectoryChannelItem.DirectoryItem(directoryEntryData2)); } arrayList.addAll(directoryItems2); } } else { List allDirectoryEntryData2 = viewState.getAllDirectoryEntryData(); - ArrayList arrayList4 = new ArrayList(); - for (Object obj3 : allDirectoryEntryData2) { - if (!linkedHashSet.contains(Long.valueOf(((DirectoryEntryData) obj3).getEntry().e().h()))) { - arrayList4.add(obj3); + ArrayList arrayList5 = new ArrayList(); + for (Object obj2 : allDirectoryEntryData2) { + if (!linkedHashSet.contains(Long.valueOf(((DirectoryEntryData) obj2).getEntry().e().h()))) { + arrayList5.add(obj2); } } - if (!arrayList4.isEmpty()) { - arrayList2 = arrayList4; + if (!arrayList5.isEmpty()) { + arrayList2 = arrayList5; } if (!(arrayList2 == null || (directoryItems = toDirectoryItems(arrayList2)) == null)) { arrayList.add(new DirectoryChannelItem.SectionHeader(R.string.all_servers)); diff --git a/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/GuildCommunicationDisabledGuildsFeatureFlag$observeCanGuildAccessCommunicationDisabled$1.java b/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/GuildCommunicationDisabledGuildsFeatureFlag$observeCanGuildAccessCommunicationDisabled$1.java index 3e38c471c5..886d55dcf4 100644 --- a/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/GuildCommunicationDisabledGuildsFeatureFlag$observeCanGuildAccessCommunicationDisabled$1.java +++ b/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/GuildCommunicationDisabledGuildsFeatureFlag$observeCanGuildAccessCommunicationDisabled$1.java @@ -18,6 +18,6 @@ public final class GuildCommunicationDisabledGuildsFeatureFlag$observeCanGuildAc @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final Boolean mo1invoke() { - return (!this.this$0.canGuildAccessCommunicationDisabled(this.$guildId) || !this.this$0.canUserCreateRoleSubscriptions()) ? null : 1; + return (!this.this$0.canGuildAccessCommunicationDisabled(this.$guildId) || !this.this$0.canUserAccessDisableCommunication()) ? null : 1; } } diff --git a/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/GuildCommunicationDisabledGuildsFeatureFlag.java b/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/GuildCommunicationDisabledGuildsFeatureFlag.java index 2b9cc66434..706c80b2ef 100644 --- a/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/GuildCommunicationDisabledGuildsFeatureFlag.java +++ b/app/src/main/java/com/discord/widgets/guildcommunicationdisabled/start/GuildCommunicationDisabledGuildsFeatureFlag.java @@ -62,7 +62,7 @@ public final class GuildCommunicationDisabledGuildsFeatureFlag { return (this.guildsStore.getGuild(j) == null || (guildExperiment = this.storeExperiments.getGuildExperiment("2021-11_guild_communication_disabled_guilds", j, true)) == null || guildExperiment.getBucket() != 1) ? false : true; } - public final boolean canUserCreateRoleSubscriptions() { + public final boolean canUserAccessDisableCommunication() { Experiment userExperiment = this.storeExperiments.getUserExperiment("2021-11_guild_communication_disabled_users", true); return userExperiment != null && userExperiment.getBucket() == 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 ff199f8449..9f8fcf3d29 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 + " - 104.6 - Beta (104106)"); + textView.setText(string + " - 104.7 - Beta (104107)"); 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/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java index 9a9a826d8a..d16417b6a0 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.java @@ -810,6 +810,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { /* compiled from: WidgetUserSheetViewModel.kt */ public static final class StoreState { + private final boolean canDisableCommunication; private final Channel channel; private final Map computedMembers; private final Map currentChannelVoiceStates; @@ -835,7 +836,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { private final StageRequestToSpeakState userRequestToSpeakState; private final StageRoles userStageRoles; - private StoreState(User user, MeUser meUser, Channel channel, Map map, Map map2, Map map3, Map map4, boolean z2, boolean z3, boolean z4, float f, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, UserProfile userProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, Channel channel2, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2) { + private StoreState(User user, MeUser meUser, Channel channel, Map map, Map map2, Map map3, Map map4, boolean z2, boolean z3, boolean z4, float f, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, UserProfile userProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, Channel channel2, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2, boolean z5) { this.user = user; this.f2279me = meUser; this.channel = channel; @@ -858,15 +859,16 @@ public final class WidgetUserSheetViewModel extends AppViewModel { this.userStageRoles = stageRoles; this.userRequestToSpeakState = stageRequestToSpeakState; this.myStageRoles = stageRoles2; + this.canDisableCommunication = z5; } - public /* synthetic */ StoreState(User user, MeUser meUser, Channel channel, Map map, Map map2, Map map3, Map map4, boolean z2, boolean z3, boolean z4, float f, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, UserProfile userProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, Channel channel2, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2, DefaultConstructorMarker defaultConstructorMarker) { - this(user, meUser, channel, map, map2, map3, map4, z2, z3, z4, f, modelRichPresence, guild, l, streamContext, userProfile, num, userNoteState, channel2, stageRoles, stageRequestToSpeakState, stageRoles2); + public /* synthetic */ StoreState(User user, MeUser meUser, Channel channel, Map map, Map map2, Map map3, Map map4, boolean z2, boolean z3, boolean z4, float f, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, UserProfile userProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, Channel channel2, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2, boolean z5, DefaultConstructorMarker defaultConstructorMarker) { + this(user, meUser, channel, map, map2, map3, map4, z2, z3, z4, f, modelRichPresence, guild, l, streamContext, userProfile, num, userNoteState, channel2, stageRoles, stageRequestToSpeakState, stageRoles2, z5); } - /* renamed from: copy-1YV1AGg$default reason: not valid java name */ - public static /* synthetic */ StoreState m49copy1YV1AGg$default(StoreState storeState, User user, MeUser meUser, Channel channel, Map map, Map map2, Map map3, Map map4, boolean z2, boolean z3, boolean z4, float f, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, UserProfile userProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, Channel channel2, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2, int i, Object obj) { - return storeState.m52copy1YV1AGg((i & 1) != 0 ? storeState.user : user, (i & 2) != 0 ? storeState.f2279me : meUser, (i & 4) != 0 ? storeState.channel : channel, (i & 8) != 0 ? storeState.computedMembers : map, (i & 16) != 0 ? storeState.guildRoles : map2, (i & 32) != 0 ? storeState.mySelectedVoiceChannelVoiceStates : map3, (i & 64) != 0 ? storeState.currentChannelVoiceStates : map4, (i & 128) != 0 ? storeState.muted : z2, (i & 256) != 0 ? storeState.selfMuted : z3, (i & 512) != 0 ? storeState.selfDeafened : z4, (i & 1024) != 0 ? storeState.outputVolume : f, (i & 2048) != 0 ? storeState.richPresence : modelRichPresence, (i & 4096) != 0 ? storeState.guild : guild, (i & 8192) != 0 ? storeState.permissions : l, (i & 16384) != 0 ? storeState.streamContext : streamContext, (i & 32768) != 0 ? storeState.userProfile : userProfile, (i & 65536) != 0 ? storeState.userRelationshipType : num, (i & 131072) != 0 ? storeState.userNoteFetchState : userNoteState, (i & 262144) != 0 ? storeState.stageChannel : channel2, (i & 524288) != 0 ? storeState.userStageRoles : stageRoles, (i & 1048576) != 0 ? storeState.userRequestToSpeakState : stageRequestToSpeakState, (i & 2097152) != 0 ? storeState.myStageRoles : stageRoles2); + /* renamed from: copy-U9gTzXU$default reason: not valid java name */ + public static /* synthetic */ StoreState m49copyU9gTzXU$default(StoreState storeState, User user, MeUser meUser, Channel channel, Map map, Map map2, Map map3, Map map4, boolean z2, boolean z3, boolean z4, float f, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, UserProfile userProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, Channel channel2, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2, boolean z5, int i, Object obj) { + return storeState.m52copyU9gTzXU((i & 1) != 0 ? storeState.user : user, (i & 2) != 0 ? storeState.f2279me : meUser, (i & 4) != 0 ? storeState.channel : channel, (i & 8) != 0 ? storeState.computedMembers : map, (i & 16) != 0 ? storeState.guildRoles : map2, (i & 32) != 0 ? storeState.mySelectedVoiceChannelVoiceStates : map3, (i & 64) != 0 ? storeState.currentChannelVoiceStates : map4, (i & 128) != 0 ? storeState.muted : z2, (i & 256) != 0 ? storeState.selfMuted : z3, (i & 512) != 0 ? storeState.selfDeafened : z4, (i & 1024) != 0 ? storeState.outputVolume : f, (i & 2048) != 0 ? storeState.richPresence : modelRichPresence, (i & 4096) != 0 ? storeState.guild : guild, (i & 8192) != 0 ? storeState.permissions : l, (i & 16384) != 0 ? storeState.streamContext : streamContext, (i & 32768) != 0 ? storeState.userProfile : userProfile, (i & 65536) != 0 ? storeState.userRelationshipType : num, (i & 131072) != 0 ? storeState.userNoteFetchState : userNoteState, (i & 262144) != 0 ? storeState.stageChannel : channel2, (i & 524288) != 0 ? storeState.userStageRoles : stageRoles, (i & 1048576) != 0 ? storeState.userRequestToSpeakState : stageRequestToSpeakState, (i & 2097152) != 0 ? storeState.myStageRoles : stageRoles2, (i & 4194304) != 0 ? storeState.canDisableCommunication : z5); } public final User component1() { @@ -931,6 +933,10 @@ public final class WidgetUserSheetViewModel extends AppViewModel { return this.myStageRoles; } + public final boolean component23() { + return this.canDisableCommunication; + } + public final Channel component3() { return this.channel; } @@ -959,8 +965,8 @@ public final class WidgetUserSheetViewModel extends AppViewModel { return this.selfMuted; } - /* renamed from: copy-1YV1AGg reason: not valid java name */ - public final StoreState m52copy1YV1AGg(User user, MeUser meUser, Channel channel, Map map, Map map2, Map map3, Map map4, boolean z2, boolean z3, boolean z4, float f, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, UserProfile userProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, Channel channel2, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2) { + /* renamed from: copy-U9gTzXU reason: not valid java name */ + public final StoreState m52copyU9gTzXU(User user, MeUser meUser, Channel channel, Map map, Map map2, Map map3, Map map4, boolean z2, boolean z3, boolean z4, float f, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, UserProfile userProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, Channel channel2, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2, boolean z5) { m.checkNotNullParameter(user, "user"); m.checkNotNullParameter(meUser, "me"); m.checkNotNullParameter(map, "computedMembers"); @@ -970,7 +976,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { m.checkNotNullParameter(userProfile, "userProfile"); m.checkNotNullParameter(userNoteState, "userNoteFetchState"); m.checkNotNullParameter(stageRequestToSpeakState, "userRequestToSpeakState"); - return new StoreState(user, meUser, channel, map, map2, map3, map4, z2, z3, z4, f, modelRichPresence, guild, l, streamContext, userProfile, num, userNoteState, channel2, stageRoles, stageRequestToSpeakState, stageRoles2); + return new StoreState(user, meUser, channel, map, map2, map3, map4, z2, z3, z4, f, modelRichPresence, guild, l, streamContext, userProfile, num, userNoteState, channel2, stageRoles, stageRequestToSpeakState, stageRoles2, z5); } public boolean equals(Object obj) { @@ -981,7 +987,11 @@ public final class WidgetUserSheetViewModel extends AppViewModel { return false; } StoreState storeState = (StoreState) obj; - return m.areEqual(this.user, storeState.user) && m.areEqual(this.f2279me, storeState.f2279me) && m.areEqual(this.channel, storeState.channel) && m.areEqual(this.computedMembers, storeState.computedMembers) && m.areEqual(this.guildRoles, storeState.guildRoles) && m.areEqual(this.mySelectedVoiceChannelVoiceStates, storeState.mySelectedVoiceChannelVoiceStates) && m.areEqual(this.currentChannelVoiceStates, storeState.currentChannelVoiceStates) && this.muted == storeState.muted && this.selfMuted == storeState.selfMuted && this.selfDeafened == storeState.selfDeafened && Float.compare(this.outputVolume, storeState.outputVolume) == 0 && m.areEqual(this.richPresence, storeState.richPresence) && m.areEqual(this.guild, storeState.guild) && m.areEqual(this.permissions, storeState.permissions) && m.areEqual(this.streamContext, storeState.streamContext) && m.areEqual(this.userProfile, storeState.userProfile) && m.areEqual(this.userRelationshipType, storeState.userRelationshipType) && m.areEqual(this.userNoteFetchState, storeState.userNoteFetchState) && m.areEqual(this.stageChannel, storeState.stageChannel) && m.areEqual(this.userStageRoles, storeState.userStageRoles) && m.areEqual(this.userRequestToSpeakState, storeState.userRequestToSpeakState) && m.areEqual(this.myStageRoles, storeState.myStageRoles); + return m.areEqual(this.user, storeState.user) && m.areEqual(this.f2279me, storeState.f2279me) && m.areEqual(this.channel, storeState.channel) && m.areEqual(this.computedMembers, storeState.computedMembers) && m.areEqual(this.guildRoles, storeState.guildRoles) && m.areEqual(this.mySelectedVoiceChannelVoiceStates, storeState.mySelectedVoiceChannelVoiceStates) && m.areEqual(this.currentChannelVoiceStates, storeState.currentChannelVoiceStates) && this.muted == storeState.muted && this.selfMuted == storeState.selfMuted && this.selfDeafened == storeState.selfDeafened && Float.compare(this.outputVolume, storeState.outputVolume) == 0 && m.areEqual(this.richPresence, storeState.richPresence) && m.areEqual(this.guild, storeState.guild) && m.areEqual(this.permissions, storeState.permissions) && m.areEqual(this.streamContext, storeState.streamContext) && m.areEqual(this.userProfile, storeState.userProfile) && m.areEqual(this.userRelationshipType, storeState.userRelationshipType) && m.areEqual(this.userNoteFetchState, storeState.userNoteFetchState) && m.areEqual(this.stageChannel, storeState.stageChannel) && m.areEqual(this.userStageRoles, storeState.userStageRoles) && m.areEqual(this.userRequestToSpeakState, storeState.userRequestToSpeakState) && m.areEqual(this.myStageRoles, storeState.myStageRoles) && this.canDisableCommunication == storeState.canDisableCommunication; + } + + public final boolean getCanDisableCommunication() { + return this.canDisableCommunication; } public final Channel getChannel() { @@ -1108,10 +1118,13 @@ public final class WidgetUserSheetViewModel extends AppViewModel { int i9 = z3 ? 1 : 0; int i10 = (i6 + i7) * 31; boolean z4 = this.selfDeafened; - if (!z4) { - i2 = z4 ? 1 : 0; + if (z4) { + z4 = true; } - int floatToIntBits = (Float.floatToIntBits(this.outputVolume) + ((i10 + i2) * 31)) * 31; + int i11 = z4 ? 1 : 0; + int i12 = z4 ? 1 : 0; + int i13 = z4 ? 1 : 0; + int floatToIntBits = (Float.floatToIntBits(this.outputVolume) + ((i10 + i11) * 31)) * 31; ModelRichPresence modelRichPresence = this.richPresence; int hashCode8 = (floatToIntBits + (modelRichPresence != null ? modelRichPresence.hashCode() : 0)) * 31; Guild guild = this.guild; @@ -1136,7 +1149,12 @@ public final class WidgetUserSheetViewModel extends AppViewModel { if (stageRoles2 != null) { i = stageRoles2.hashCode(); } - return hashCode17 + i; + int i14 = (hashCode17 + i) * 31; + boolean z5 = this.canDisableCommunication; + if (!z5) { + i2 = z5 ? 1 : 0; + } + return i14 + i2; } public String toString() { @@ -1184,8 +1202,8 @@ public final class WidgetUserSheetViewModel extends AppViewModel { R.append(this.userRequestToSpeakState); R.append(", myStageRoles="); R.append(this.myStageRoles); - R.append(")"); - return R.toString(); + R.append(", canDisableCommunication="); + return a.L(R, this.canDisableCommunication, ")"); } } @@ -1733,35 +1751,35 @@ public final class WidgetUserSheetViewModel extends AppViewModel { widgetUserSheetViewModel.updateViewState(viewState); } - private final UserProfileAdminView.ViewState createAdminViewState(Channel channel, boolean z2, boolean z3, ManageUserContext manageUserContext, VoiceState voiceState) { - boolean z4; + private final UserProfileAdminView.ViewState createAdminViewState(Channel channel, boolean z2, boolean z3, ManageUserContext manageUserContext, VoiceState voiceState, boolean z4) { + boolean z5; if (channel == null) { return null; } - boolean z5 = manageUserContext != null && (manageUserContext.getCanChangeNickname() || manageUserContext.getCanManageRoles()); - boolean z6 = !ChannelUtils.w(channel) ? !(manageUserContext == null || !manageUserContext.getCanKick()) : !(ChannelUtils.v(channel) || !z2 || z3); - boolean z7 = manageUserContext != null && manageUserContext.getCanDisableCommunication() && !z3; + boolean z6 = manageUserContext != null && (manageUserContext.getCanChangeNickname() || manageUserContext.getCanManageRoles()); + boolean z7 = !ChannelUtils.w(channel) ? !(manageUserContext == null || !manageUserContext.getCanKick()) : !(ChannelUtils.v(channel) || !z2 || z3); + boolean z8 = z4 && manageUserContext != null && manageUserContext.getCanDisableCommunication() && !z3; boolean w = ChannelUtils.w(channel); - boolean z8 = manageUserContext != null && manageUserContext.getCanBan(); - boolean z9 = voiceState != null && manageUserContext != null && manageUserContext.getCanMute() && !ChannelUtils.z(channel); - boolean z10 = voiceState != null && voiceState.e(); - boolean z11 = (voiceState == null || manageUserContext == null || !manageUserContext.getCanDeafen()) ? false : true; - boolean z12 = voiceState != null && voiceState.b(); - boolean z13 = (voiceState == null || manageUserContext == null || !manageUserContext.getCanMove()) ? false : true; - Boolean[] boolArr = {Boolean.valueOf(z5), Boolean.valueOf(z6), Boolean.valueOf(z8), Boolean.valueOf(z9), Boolean.valueOf(z11), Boolean.valueOf(z13)}; + boolean z9 = manageUserContext != null && manageUserContext.getCanBan(); + boolean z10 = voiceState != null && manageUserContext != null && manageUserContext.getCanMute() && !ChannelUtils.z(channel); + boolean z11 = voiceState != null && voiceState.e(); + boolean z12 = (voiceState == null || manageUserContext == null || !manageUserContext.getCanDeafen()) ? false : true; + boolean z13 = voiceState != null && voiceState.b(); + boolean z14 = (voiceState == null || manageUserContext == null || !manageUserContext.getCanMove()) ? false : true; + Boolean[] boolArr = {Boolean.valueOf(z6), Boolean.valueOf(z7), Boolean.valueOf(z9), Boolean.valueOf(z10), Boolean.valueOf(z12), Boolean.valueOf(z14)}; int i = 0; while (true) { if (i >= 6) { - z4 = false; + z5 = false; break; } else if (boolArr[i].booleanValue()) { - z4 = true; + z5 = true; break; } else { i++; } } - return new UserProfileAdminView.ViewState(z5, z6, z7, w, z8, z9, z10, z11, z12, z13, z4, z3); + return new UserProfileAdminView.ViewState(z6, z7, z8, w, z9, z10, z11, z12, z13, z14, z5, z3); } private final List> createAndProcessBioAstFromText(String str) { @@ -1842,24 +1860,24 @@ public final class WidgetUserSheetViewModel extends AppViewModel { } /* JADX WARNING: Code restructure failed: missing block: B:19:0x008e, code lost: - if (r2 != null) goto L_0x0095; + if (r3 != null) goto L_0x0095; */ - /* JADX WARNING: Removed duplicated region for block: B:105:0x0244 */ - /* JADX WARNING: Removed duplicated region for block: B:108:0x0249 */ - /* JADX WARNING: Removed duplicated region for block: B:114:0x025d */ - /* JADX WARNING: Removed duplicated region for block: B:117:0x0262 */ - /* JADX WARNING: Removed duplicated region for block: B:118:0x0267 */ - /* JADX WARNING: Removed duplicated region for block: B:121:0x026c */ - /* JADX WARNING: Removed duplicated region for block: B:127:0x027f */ - /* JADX WARNING: Removed duplicated region for block: B:135:0x0291 A[ADDED_TO_REGION] */ - /* JADX WARNING: Removed duplicated region for block: B:138:0x029a */ - /* JADX WARNING: Removed duplicated region for block: B:142:0x02a6 */ - /* JADX WARNING: Removed duplicated region for block: B:143:0x02ad */ - /* JADX WARNING: Removed duplicated region for block: B:145:0x02b1 */ - /* JADX WARNING: Removed duplicated region for block: B:146:0x02b8 */ - /* JADX WARNING: Removed duplicated region for block: B:82:0x01f0 */ - /* JADX WARNING: Removed duplicated region for block: B:91:0x0216 */ - /* JADX WARNING: Removed duplicated region for block: B:98:0x022d */ + /* JADX WARNING: Removed duplicated region for block: B:100:0x0241 */ + /* JADX WARNING: Removed duplicated region for block: B:106:0x0256 */ + /* JADX WARNING: Removed duplicated region for block: B:109:0x025c */ + /* JADX WARNING: Removed duplicated region for block: B:115:0x0271 */ + /* JADX WARNING: Removed duplicated region for block: B:118:0x0277 */ + /* JADX WARNING: Removed duplicated region for block: B:119:0x027c */ + /* JADX WARNING: Removed duplicated region for block: B:122:0x0282 */ + /* JADX WARNING: Removed duplicated region for block: B:128:0x0295 */ + /* JADX WARNING: Removed duplicated region for block: B:136:0x02a7 A[ADDED_TO_REGION] */ + /* JADX WARNING: Removed duplicated region for block: B:139:0x02b0 */ + /* JADX WARNING: Removed duplicated region for block: B:143:0x02bc */ + /* JADX WARNING: Removed duplicated region for block: B:144:0x02c3 */ + /* JADX WARNING: Removed duplicated region for block: B:146:0x02c7 */ + /* JADX WARNING: Removed duplicated region for block: B:147:0x02ce */ + /* JADX WARNING: Removed duplicated region for block: B:82:0x01fd */ + /* JADX WARNING: Removed duplicated region for block: B:92:0x0227 */ private final void handleStoreState(StoreState storeState) { List list; boolean z2; @@ -1925,7 +1943,7 @@ public final class WidgetUserSheetViewModel extends AppViewModel { UserProfileVoiceSettingsView.ViewState viewState2 = new UserProfileVoiceSettingsView.ViewState(selfMuted, valueOf, f); VoiceState voiceState3 = (VoiceState) a.e(user2, storeState.getCurrentChannelVoiceStates()); String c2 = (guild == null || (name = guild.getName()) == null) ? (channel == null || !ChannelUtils.w(channel)) ? null : ChannelUtils.c(channel) : name; - UserProfileAdminView.ViewState createAdminViewState = createAdminViewState(channel, z8, z7, from, voiceState3); + UserProfileAdminView.ViewState createAdminViewState = createAdminViewState(channel, z8, z7, from, voiceState3, storeState.getCanDisableCommunication()); UserProfile userProfile = storeState.getUserProfile(); UserProfileConnectionsView.ViewState createConnectionsViewState = createConnectionsViewState(userProfile, z7, z2); StreamContext streamContext = storeState.getStreamContext(); diff --git a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelStoreState$observeStoreState$3.java b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelStoreState$observeStoreState$3.java index 3bd1a1ac63..8899a4b2cd 100644 --- a/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelStoreState$observeStoreState$3.java +++ b/app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheetViewModelStoreState$observeStoreState$3.java @@ -23,6 +23,7 @@ import com.discord.stores.StoreVoiceStates; import com.discord.utilities.rx.ObservableCombineLatestOverloadsKt; import com.discord.utilities.streams.StreamContext; import com.discord.utilities.streams.StreamContextService; +import com.discord.widgets.guildcommunicationdisabled.start.GuildCommunicationDisabledGuildsFeatureFlag; import com.discord.widgets.stage.StageRoles; import com.discord.widgets.user.presence.ModelRichPresence; import com.discord.widgets.user.usersheet.WidgetUserSheetViewModel; @@ -35,7 +36,7 @@ import j0.k.b; import j0.l.e.j; import java.util.Map; import java.util.concurrent.TimeUnit; -import kotlin.jvm.functions.Function15; +import kotlin.jvm.functions.Function16; import rx.Observable; /* compiled from: WidgetUserSheetViewModelStoreState.kt */ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3 implements b> { @@ -63,7 +64,7 @@ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3 /* compiled from: WidgetUserSheetViewModelStoreState.kt */ /* renamed from: com.discord.widgets.user.usersheet.WidgetUserSheetViewModelStoreState$observeStoreState$3$2 reason: invalid class name */ - public static final class AnonymousClass2 extends o implements Function15, Map, Map, Map, StoreMediaSettings.VoiceConfiguration, ModelRichPresence, Guild, Long, StreamContext, UserProfile, Integer, StoreUserNotes.UserNoteState, StageRoles, StageRequestToSpeakState, StageRoles, WidgetUserSheetViewModel.StoreState> { + public static final class AnonymousClass2 extends o implements Function16, Map, Map, Map, StoreMediaSettings.VoiceConfiguration, ModelRichPresence, Guild, Long, StreamContext, UserProfile, Integer, StoreUserNotes.UserNoteState, StageRoles, StageRequestToSpeakState, StageRoles, Boolean, WidgetUserSheetViewModel.StoreState> { public final /* synthetic */ Channel $channel; public final /* synthetic */ MeUser $me; public final /* synthetic */ Channel $selectedVoiceChannel; @@ -71,14 +72,14 @@ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3 /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public AnonymousClass2(User user, MeUser meUser, Channel channel, Channel channel2) { - super(15); + super(16); this.$user = user; this.$me = meUser; this.$channel = channel; this.$selectedVoiceChannel = channel2; } - public final WidgetUserSheetViewModel.StoreState invoke(Map map, Map map2, Map map3, Map map4, StoreMediaSettings.VoiceConfiguration voiceConfiguration, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, UserProfile userProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2) { + public final WidgetUserSheetViewModel.StoreState invoke(Map map, Map map2, Map map3, Map map4, StoreMediaSettings.VoiceConfiguration voiceConfiguration, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, UserProfile userProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2, boolean z2) { m.checkNotNullParameter(map, "computedMembers"); m.checkNotNullParameter(map2, "guildRoles"); m.checkNotNullParameter(map3, "mySelectedVoiceChannelVoiceStates"); @@ -97,14 +98,14 @@ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3 MeUser meUser = this.$me; Channel channel = this.$channel; Channel channel2 = this.$selectedVoiceChannel; - return new WidgetUserSheetViewModel.StoreState(user, meUser, channel, map, map2, map3, map4, booleanValue, isSelfMuted, isSelfDeafened, floatValue, modelRichPresence, guild, l, streamContext, userProfile, num, userNoteState, (channel2 == null || !ChannelUtils.z(channel2)) ? null : channel2, stageRoles, stageRequestToSpeakState, stageRoles2, null); + return new WidgetUserSheetViewModel.StoreState(user, meUser, channel, map, map2, map3, map4, booleanValue, isSelfMuted, isSelfDeafened, floatValue, modelRichPresence, guild, l, streamContext, userProfile, num, userNoteState, (channel2 == null || !ChannelUtils.z(channel2)) ? null : channel2, stageRoles, stageRequestToSpeakState, stageRoles2, z2, null); } /* Return type fixed from 'java.lang.Object' to match base method */ - /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */ - @Override // kotlin.jvm.functions.Function15 - public /* bridge */ /* synthetic */ WidgetUserSheetViewModel.StoreState invoke(Map map, Map map2, Map map3, Map map4, StoreMediaSettings.VoiceConfiguration voiceConfiguration, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, UserProfile userProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2) { - return invoke((Map) map, (Map) map2, (Map) map3, (Map) map4, voiceConfiguration, modelRichPresence, guild, l, streamContext, userProfile, num, userNoteState, stageRoles, stageRequestToSpeakState, stageRoles2); + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object, java.lang.Object] */ + @Override // kotlin.jvm.functions.Function16 + public /* bridge */ /* synthetic */ WidgetUserSheetViewModel.StoreState invoke(Map map, Map map2, Map map3, Map map4, StoreMediaSettings.VoiceConfiguration voiceConfiguration, ModelRichPresence modelRichPresence, Guild guild, Long l, StreamContext streamContext, UserProfile userProfile, Integer num, StoreUserNotes.UserNoteState userNoteState, StageRoles stageRoles, StageRequestToSpeakState stageRequestToSpeakState, StageRoles stageRoles2, Boolean bool) { + return invoke((Map) map, (Map) map2, (Map) map3, (Map) map4, voiceConfiguration, modelRichPresence, guild, l, streamContext, userProfile, num, userNoteState, stageRoles, stageRequestToSpeakState, stageRoles2, bool.booleanValue()); } } @@ -123,31 +124,43 @@ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3 } /* JADX WARNING: Code restructure failed: missing block: B:32:0x00e3, code lost: - if (r5 != null) goto L_0x00ec; + if (r6 != null) goto L_0x00ec; */ - /* JADX WARNING: Code restructure failed: missing block: B:41:0x011f, code lost: - if (r7 != null) goto L_0x012a; + /* JADX WARNING: Code restructure failed: missing block: B:36:0x00f9, code lost: + if (r7 != null) goto L_0x0103; */ - /* JADX WARNING: Code restructure failed: missing block: B:46:0x013d, code lost: - if (r2 != null) goto L_0x014b; + /* JADX WARNING: Code restructure failed: missing block: B:42:0x0123, code lost: + if (r2 != null) goto L_0x012f; + */ + /* JADX WARNING: Code restructure failed: missing block: B:47:0x0141, code lost: + if (r3 != null) goto L_0x014e; + */ + /* JADX WARNING: Code restructure failed: missing block: B:56:0x0176, code lost: + if (r5 != null) goto L_0x0181; */ /* JADX WARNING: Removed duplicated region for block: B:15:0x0071 */ /* JADX WARNING: Removed duplicated region for block: B:20:0x008e */ /* JADX WARNING: Removed duplicated region for block: B:25:0x00ac */ /* JADX WARNING: Removed duplicated region for block: B:31:0x00d6 */ - /* JADX WARNING: Removed duplicated region for block: B:40:0x010f */ - /* JADX WARNING: Removed duplicated region for block: B:42:0x0122 */ - /* JADX WARNING: Removed duplicated region for block: B:45:0x012c */ - /* JADX WARNING: Removed duplicated region for block: B:47:0x0140 */ + /* JADX WARNING: Removed duplicated region for block: B:35:0x00ee */ + /* JADX WARNING: Removed duplicated region for block: B:37:0x00fc */ + /* JADX WARNING: Removed duplicated region for block: B:41:0x0112 */ + /* JADX WARNING: Removed duplicated region for block: B:43:0x0126 */ + /* JADX WARNING: Removed duplicated region for block: B:46:0x0131 */ + /* JADX WARNING: Removed duplicated region for block: B:48:0x0144 */ + /* JADX WARNING: Removed duplicated region for block: B:55:0x0165 */ public final Observable call(WidgetUserSheetViewModelStoreState.BootstrapData bootstrapData) { Observable> observable; Observable> observable2; Observable observable3; - Observable observable4; - Observable observable5; + Observable observable4; + Observable observable5; Channel channel; MeUser meUser; - Observable observable6; + Observable observable6; + MeUser meUser2; + Observable observable7; + Observable observable8; Observable> observe; Observable> observe2; User component1 = bootstrapData.component1(); @@ -173,49 +186,59 @@ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3 observable2 = observeRoles; Observable> jVar = (component4 != null || (observe2 = this.$storeVoiceStates.observe(component4.f(), component4.h())) == null) ? new j(h0.emptyMap()) : observe2; Observable> jVar2 = (component3 != null || (observe = this.$storeVoiceStates.observe(component3.f(), component3.h())) == null) ? new j(h0.emptyMap()) : observe; - Observable observable7 = ModelRichPresence.Companion.get(component1.getId(), this.$storeUserPresence); + Observable observable9 = ModelRichPresence.Companion.get(component1.getId(), this.$storeUserPresence); if (l != null) { l.longValue(); observable3 = this.$storeGuilds.observeGuild(l.longValue()); } observable3 = new j<>(null); - if (component3 == null || (r6 = this.$storePermissions.observePermissionsForChannel(component3.h())) == null) { - Observable observable8 = new j<>(null); - } - Observable forUser = this.$streamContextService.getForUser(component1.getId(), true); - if (component4 != null) { - observable4 = observable7; - observable5 = this.$storeStageChannels.observeUserRoles(component1.getId(), component4.h()); + if (component3 != null) { + observable4 = observable; + observable5 = this.$storePermissions.observePermissionsForChannel(component3.h()); } else { - observable4 = observable7; + observable4 = observable; } observable5 = new j<>(null); + Observable forUser = this.$streamContextService.getForUser(component1.getId(), true); if (component4 != null) { meUser = component2; channel = component3; - observable6 = this.$storeStageChannels.observeUserRequestToSpeakState(component1.getId(), component4.h()); + observable6 = this.$storeStageChannels.observeUserRoles(component1.getId(), component4.h()); } else { meUser = component2; channel = component3; } - observable6 = new j(StageRequestToSpeakState.NONE); - if (component4 == null || (r3 = this.$storeStageChannels.observeMyRoles(component4.h())) == null) { - Observable observable9 = new j<>(null); + observable6 = new j<>(null); + if (component4 != null) { + meUser2 = meUser; + observable7 = this.$storeStageChannels.observeUserRequestToSpeakState(component1.getId(), component4.h()); + } else { + meUser2 = meUser; } - m.checkNotNullExpressionValue(observable, "computedMembersObservable"); + observable7 = new j(StageRequestToSpeakState.NONE); + if (component4 == null || (r9 = this.$storeStageChannels.observeMyRoles(component4.h())) == null) { + Observable observable10 = new j<>(null); + } + if (l != null) { + l.longValue(); + observable8 = GuildCommunicationDisabledGuildsFeatureFlag.Companion.getINSTANCE().observeCanGuildAccessCommunicationDisabled(l.longValue()); + } + observable8 = new j(Boolean.FALSE); + m.checkNotNullExpressionValue(observable4, "computedMembersObservable"); m.checkNotNullExpressionValue(observable2, "guildRolesObservable"); m.checkNotNullExpressionValue(jVar, "mySelectedVoiceChannelVoiceStatesObservable"); m.checkNotNullExpressionValue(jVar2, "currentChannelVoiceStatesObservable"); Observable voiceConfig = this.$storeMediaSettings.getVoiceConfig(); m.checkNotNullExpressionValue(observable3, "guildsObservable"); - m.checkNotNullExpressionValue(observable8, "permissionsObservable"); + m.checkNotNullExpressionValue(observable5, "permissionsObservable"); Observable observeUserProfile = this.$storeUserProfile.observeUserProfile(component1.getId()); Observable observe3 = this.$storeUserRelationships.observe(component1.getId()); Observable observeUserNote = this.$storeUserNotes.observeUserNote(component1.getId()); - m.checkNotNullExpressionValue(observable5, "userStageRolesObservable"); - m.checkNotNullExpressionValue(observable6, "userStageRequestToSpeakStateObservable"); - m.checkNotNullExpressionValue(observable9, "myStageRolesObservable"); - return ObservableCombineLatestOverloadsKt.combineLatest(observable, observable2, jVar, jVar2, voiceConfig, observable4, observable3, observable8, forUser, observeUserProfile, observe3, observeUserNote, observable5, observable6, observable9, new AnonymousClass2(component1, meUser, channel, component4)); + m.checkNotNullExpressionValue(observable6, "userStageRolesObservable"); + m.checkNotNullExpressionValue(observable7, "userStageRequestToSpeakStateObservable"); + m.checkNotNullExpressionValue(observable10, "myStageRolesObservable"); + m.checkNotNullExpressionValue(observable8, "canDisableCommunicationObservable"); + return ObservableCombineLatestOverloadsKt.combineLatest(observable4, observable2, jVar, jVar2, voiceConfig, observable9, observable3, observable5, forUser, observeUserProfile, observe3, observeUserNote, observable6, observable7, observable10, observable8, new AnonymousClass2(component1, meUser2, channel, component4)); } } observable2 = new j(h0.emptyMap()); @@ -223,33 +246,39 @@ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3 } if (component3 != null) { } - Observable observable7 = ModelRichPresence.Companion.get(component1.getId(), this.$storeUserPresence); + Observable observable9 = ModelRichPresence.Companion.get(component1.getId(), this.$storeUserPresence); if (l != null) { } observable3 = new j<>(null); - Observable observable8 = new j<>(null); + if (component3 != null) { + } + observable5 = new j<>(null); Observable forUser = this.$streamContextService.getForUser(component1.getId(), true); if (component4 != null) { } - observable5 = new j<>(null); + observable6 = new j<>(null); if (component4 != null) { } - observable6 = new j(StageRequestToSpeakState.NONE); - Observable observable9 = new j<>(null); - m.checkNotNullExpressionValue(observable, "computedMembersObservable"); + observable7 = new j(StageRequestToSpeakState.NONE); + Observable observable10 = new j<>(null); + if (l != null) { + } + observable8 = new j(Boolean.FALSE); + m.checkNotNullExpressionValue(observable4, "computedMembersObservable"); m.checkNotNullExpressionValue(observable2, "guildRolesObservable"); m.checkNotNullExpressionValue(jVar, "mySelectedVoiceChannelVoiceStatesObservable"); m.checkNotNullExpressionValue(jVar2, "currentChannelVoiceStatesObservable"); Observable voiceConfig = this.$storeMediaSettings.getVoiceConfig(); m.checkNotNullExpressionValue(observable3, "guildsObservable"); - m.checkNotNullExpressionValue(observable8, "permissionsObservable"); + m.checkNotNullExpressionValue(observable5, "permissionsObservable"); Observable observeUserProfile = this.$storeUserProfile.observeUserProfile(component1.getId()); Observable observe3 = this.$storeUserRelationships.observe(component1.getId()); Observable observeUserNote = this.$storeUserNotes.observeUserNote(component1.getId()); - m.checkNotNullExpressionValue(observable5, "userStageRolesObservable"); - m.checkNotNullExpressionValue(observable6, "userStageRequestToSpeakStateObservable"); - m.checkNotNullExpressionValue(observable9, "myStageRolesObservable"); - return ObservableCombineLatestOverloadsKt.combineLatest(observable, observable2, jVar, jVar2, voiceConfig, observable4, observable3, observable8, forUser, observeUserProfile, observe3, observeUserNote, observable5, observable6, observable9, new AnonymousClass2(component1, meUser, channel, component4)); + m.checkNotNullExpressionValue(observable6, "userStageRolesObservable"); + m.checkNotNullExpressionValue(observable7, "userStageRequestToSpeakStateObservable"); + m.checkNotNullExpressionValue(observable10, "myStageRolesObservable"); + m.checkNotNullExpressionValue(observable8, "canDisableCommunicationObservable"); + return ObservableCombineLatestOverloadsKt.combineLatest(observable4, observable2, jVar, jVar2, voiceConfig, observable9, observable3, observable5, forUser, observeUserProfile, observe3, observeUserNote, observable6, observable7, observable10, observable8, new AnonymousClass2(component1, meUser2, channel, component4)); } } observable = new j(h0.emptyMap()); @@ -260,32 +289,38 @@ public final class WidgetUserSheetViewModelStoreState$observeStoreState$3 } if (component3 != null) { } - Observable observable7 = ModelRichPresence.Companion.get(component1.getId(), this.$storeUserPresence); + Observable observable9 = ModelRichPresence.Companion.get(component1.getId(), this.$storeUserPresence); if (l != null) { } observable3 = new j<>(null); - Observable observable8 = new j<>(null); + if (component3 != null) { + } + observable5 = new j<>(null); Observable forUser = this.$streamContextService.getForUser(component1.getId(), true); if (component4 != null) { } - observable5 = new j<>(null); + observable6 = new j<>(null); if (component4 != null) { } - observable6 = new j(StageRequestToSpeakState.NONE); - Observable observable9 = new j<>(null); - m.checkNotNullExpressionValue(observable, "computedMembersObservable"); + observable7 = new j(StageRequestToSpeakState.NONE); + Observable observable10 = new j<>(null); + if (l != null) { + } + observable8 = new j(Boolean.FALSE); + m.checkNotNullExpressionValue(observable4, "computedMembersObservable"); m.checkNotNullExpressionValue(observable2, "guildRolesObservable"); m.checkNotNullExpressionValue(jVar, "mySelectedVoiceChannelVoiceStatesObservable"); m.checkNotNullExpressionValue(jVar2, "currentChannelVoiceStatesObservable"); Observable voiceConfig = this.$storeMediaSettings.getVoiceConfig(); m.checkNotNullExpressionValue(observable3, "guildsObservable"); - m.checkNotNullExpressionValue(observable8, "permissionsObservable"); + m.checkNotNullExpressionValue(observable5, "permissionsObservable"); Observable observeUserProfile = this.$storeUserProfile.observeUserProfile(component1.getId()); Observable observe3 = this.$storeUserRelationships.observe(component1.getId()); Observable observeUserNote = this.$storeUserNotes.observeUserNote(component1.getId()); - m.checkNotNullExpressionValue(observable5, "userStageRolesObservable"); - m.checkNotNullExpressionValue(observable6, "userStageRequestToSpeakStateObservable"); - m.checkNotNullExpressionValue(observable9, "myStageRolesObservable"); - return ObservableCombineLatestOverloadsKt.combineLatest(observable, observable2, jVar, jVar2, voiceConfig, observable4, observable3, observable8, forUser, observeUserProfile, observe3, observeUserNote, observable5, observable6, observable9, new AnonymousClass2(component1, meUser, channel, component4)); + m.checkNotNullExpressionValue(observable6, "userStageRolesObservable"); + m.checkNotNullExpressionValue(observable7, "userStageRequestToSpeakStateObservable"); + m.checkNotNullExpressionValue(observable10, "myStageRolesObservable"); + m.checkNotNullExpressionValue(observable8, "canDisableCommunicationObservable"); + return ObservableCombineLatestOverloadsKt.combineLatest(observable4, observable2, jVar, jVar2, voiceConfig, observable9, observable3, observable5, forUser, observeUserProfile, observe3, observeUserNote, observable6, observable7, observable10, observable8, new AnonymousClass2(component1, meUser2, channel, component4)); } } diff --git a/app/src/main/java/d0/e0/p/d/c.java b/app/src/main/java/d0/e0/p/d/c.java index 77fe1c8f6c..3adbfc3905 100644 --- a/app/src/main/java/d0/e0/p/d/c.java +++ b/app/src/main/java/d0/e0/p/d/c.java @@ -3,7 +3,6 @@ package d0.e0.p.d; import d0.z.c.b; import d0.z.c.d; import d0.z.c.e; -import d0.z.c.f; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; import kotlin.jvm.functions.Function10; @@ -12,6 +11,7 @@ import kotlin.jvm.functions.Function12; import kotlin.jvm.functions.Function13; import kotlin.jvm.functions.Function14; import kotlin.jvm.functions.Function15; +import kotlin.jvm.functions.Function16; import kotlin.jvm.functions.Function19; import kotlin.jvm.functions.Function2; import kotlin.jvm.functions.Function3; @@ -23,7 +23,7 @@ import kotlin.jvm.functions.Function8; import kotlin.jvm.functions.Function9; import kotlin.reflect.KCallable; /* compiled from: FunctionWithAllInvokes.kt */ -public interface c extends Function0, Function1, Function10, Function11, Function12, Function13, Function14, Function15, d0.z.c.a, b, d0.z.c.c, Function19, Function2, d, e, f, Function3, Function4, Function5, Function6, Function7, Function8, Function9, KCallable { +public interface c extends Function0, Function1, Function10, Function11, Function12, Function13, Function14, Function15, Function16, d0.z.c.a, b, Function19, Function2, d0.z.c.c, d, e, Function3, Function4, Function5, Function6, Function7, Function8, Function9, KCallable { /* compiled from: FunctionWithAllInvokes.kt */ public static final class a { @@ -91,6 +91,10 @@ public interface c extends Function0, Function1, Functio return ((f) cVar).call(obj, obj2, obj3, obj4, obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15); } + public static Object invoke(c cVar, Object obj, Object obj2, Object obj3, Object obj4, Object obj5, Object obj6, Object obj7, Object obj8, Object obj9, Object obj10, Object obj11, Object obj12, Object obj13, Object obj14, Object obj15, Object obj16) { + return ((f) cVar).call(obj, obj2, obj3, obj4, obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15, obj16); + } + public static Object invoke(c cVar, Object obj, Object obj2, Object obj3, Object obj4, Object obj5, Object obj6, Object obj7, Object obj8, Object obj9, Object obj10, Object obj11, Object obj12, Object obj13, Object obj14, Object obj15, Object obj16, Object obj17, Object obj18, Object obj19) { return ((f) cVar).call(obj, obj2, obj3, obj4, obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15, obj16, obj17, obj18, obj19); } diff --git a/app/src/main/java/d0/e0/p/d/j.java b/app/src/main/java/d0/e0/p/d/j.java index 5ee06ee7bc..7c4413907d 100644 --- a/app/src/main/java/d0/e0/p/d/j.java +++ b/app/src/main/java/d0/e0/p/d/j.java @@ -373,6 +373,11 @@ public final class j extends f implements i, KFunction, return c.a.invoke(this, obj, obj2, obj3, obj4, obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15); } + @Override // kotlin.jvm.functions.Function16 + public Object invoke(Object obj, Object obj2, Object obj3, Object obj4, Object obj5, Object obj6, Object obj7, Object obj8, Object obj9, Object obj10, Object obj11, Object obj12, Object obj13, Object obj14, Object obj15, Object obj16) { + return c.a.invoke(this, obj, obj2, obj3, obj4, obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15, obj16); + } + @Override // kotlin.jvm.functions.Function19 public Object invoke(Object obj, Object obj2, Object obj3, Object obj4, Object obj5, Object obj6, Object obj7, Object obj8, Object obj9, Object obj10, Object obj11, Object obj12, Object obj13, Object obj14, Object obj15, Object obj16, Object obj17, Object obj18, Object obj19) { return c.a.invoke(this, obj, obj2, obj3, obj4, obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15, obj16, obj17, obj18, obj19); diff --git a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/b.java b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/b.java index 3c51190367..42305bf710 100644 --- a/app/src/main/java/d0/e0/p/d/m0/c/k1/b/b.java +++ b/app/src/main/java/d0/e0/p/d/m0/c/k1/b/b.java @@ -10,7 +10,6 @@ import d0.t.k; import d0.t.n; import d0.z.c.d; import d0.z.c.e; -import d0.z.c.f; import d0.z.d.a0; import d0.z.d.m; import d0.z.d.o; @@ -29,6 +28,7 @@ import kotlin.jvm.functions.Function12; import kotlin.jvm.functions.Function13; import kotlin.jvm.functions.Function14; import kotlin.jvm.functions.Function15; +import kotlin.jvm.functions.Function16; import kotlin.jvm.functions.Function19; import kotlin.jvm.functions.Function2; import kotlin.jvm.functions.Function3; @@ -102,7 +102,7 @@ public final class b { arrayList2.add(d0.o.to(d0.z.a.getJavaPrimitiveType(cVar2), d0.z.a.getJavaObjectType(cVar2))); } f2604c = h0.toMap(arrayList2); - List listOf2 = n.listOf((Object[]) new Class[]{Function0.class, Function1.class, Function2.class, Function3.class, Function4.class, Function5.class, Function6.class, Function7.class, Function8.class, Function9.class, Function10.class, Function11.class, Function12.class, Function13.class, Function14.class, Function15.class, d0.z.c.a.class, d0.z.c.b.class, d0.z.c.c.class, Function19.class, d.class, e.class, f.class}); + List listOf2 = n.listOf((Object[]) new Class[]{Function0.class, Function1.class, Function2.class, Function3.class, Function4.class, Function5.class, Function6.class, Function7.class, Function8.class, Function9.class, Function10.class, Function11.class, Function12.class, Function13.class, Function14.class, Function15.class, Function16.class, d0.z.c.a.class, d0.z.c.b.class, Function19.class, d0.z.c.c.class, d.class, e.class}); ArrayList arrayList3 = new ArrayList(d0.t.o.collectionSizeOrDefault(listOf2, 10)); for (Object obj : listOf2) { int i2 = i + 1; diff --git a/app/src/main/java/d0/z/c/a.java b/app/src/main/java/d0/z/c/a.java index a6ed4abc90..10eb9c7ea1 100644 --- a/app/src/main/java/d0/z/c/a.java +++ b/app/src/main/java/d0/z/c/a.java @@ -2,5 +2,5 @@ package d0.z.c; import d0.c; /* compiled from: Functions.kt */ -public interface a extends c { +public interface a extends c { } diff --git a/app/src/main/java/d0/z/c/b.java b/app/src/main/java/d0/z/c/b.java index e8b2a9c7bf..f7c3d0ee6a 100644 --- a/app/src/main/java/d0/z/c/b.java +++ b/app/src/main/java/d0/z/c/b.java @@ -2,5 +2,5 @@ package d0.z.c; import d0.c; /* compiled from: Functions.kt */ -public interface b extends c { +public interface b extends c { } diff --git a/app/src/main/java/d0/z/c/c.java b/app/src/main/java/d0/z/c/c.java index 7fa74d0db1..74a6049852 100644 --- a/app/src/main/java/d0/z/c/c.java +++ b/app/src/main/java/d0/z/c/c.java @@ -1,4 +1,4 @@ package d0.z.c; /* compiled from: Functions.kt */ -public interface c extends d0.c { +public interface c extends d0.c { } diff --git a/app/src/main/java/d0/z/c/d.java b/app/src/main/java/d0/z/c/d.java index 92001f2c2a..810651ab65 100644 --- a/app/src/main/java/d0/z/c/d.java +++ b/app/src/main/java/d0/z/c/d.java @@ -2,5 +2,5 @@ package d0.z.c; import d0.c; /* compiled from: Functions.kt */ -public interface d extends c { +public interface d extends c { } diff --git a/app/src/main/java/d0/z/c/e.java b/app/src/main/java/d0/z/c/e.java index f0ffc6ee80..ace2334596 100644 --- a/app/src/main/java/d0/z/c/e.java +++ b/app/src/main/java/d0/z/c/e.java @@ -2,5 +2,5 @@ package d0.z.c; import d0.c; /* compiled from: Functions.kt */ -public interface e extends c { +public interface e extends c { } diff --git a/app/src/main/java/d0/z/c/f.java b/app/src/main/java/d0/z/c/f.java deleted file mode 100644 index 18139a6318..0000000000 --- a/app/src/main/java/d0/z/c/f.java +++ /dev/null @@ -1,6 +0,0 @@ -package d0.z.c; - -import d0.c; -/* compiled from: Functions.kt */ -public interface f extends c { -} diff --git a/app/src/main/java/d0/z/d/e0.java b/app/src/main/java/d0/z/d/e0.java index ca6be3ab3c..ea653c6815 100644 --- a/app/src/main/java/d0/z/d/e0.java +++ b/app/src/main/java/d0/z/d/e0.java @@ -1,6 +1,5 @@ package d0.z.d; -import d0.z.c.f; import d0.z.d.g0.a; import d0.z.d.g0.b; import d0.z.d.g0.c; @@ -18,6 +17,7 @@ import kotlin.jvm.functions.Function12; import kotlin.jvm.functions.Function13; import kotlin.jvm.functions.Function14; import kotlin.jvm.functions.Function15; +import kotlin.jvm.functions.Function16; import kotlin.jvm.functions.Function19; import kotlin.jvm.functions.Function2; import kotlin.jvm.functions.Function3; @@ -163,25 +163,25 @@ public class e0 { if (obj instanceof Function15) { return 15; } - if (obj instanceof d0.z.c.a) { + if (obj instanceof Function16) { return 16; } - if (obj instanceof d0.z.c.b) { + if (obj instanceof d0.z.c.a) { return 17; } - if (obj instanceof d0.z.c.c) { + if (obj instanceof d0.z.c.b) { return 18; } if (obj instanceof Function19) { return 19; } - if (obj instanceof d0.z.c.d) { + if (obj instanceof d0.z.c.c) { return 20; } - if (obj instanceof d0.z.c.e) { + if (obj instanceof d0.z.c.d) { return 21; } - return obj instanceof f ? 22 : -1; + return obj instanceof d0.z.c.e ? 22 : -1; } public static boolean isFunctionOfArity(Object obj, int i) { diff --git a/app/src/main/java/d0/z/d/f.java b/app/src/main/java/d0/z/d/f.java index 4e126dab67..3befc6c773 100644 --- a/app/src/main/java/d0/z/d/f.java +++ b/app/src/main/java/d0/z/d/f.java @@ -28,6 +28,7 @@ import kotlin.jvm.functions.Function12; import kotlin.jvm.functions.Function13; import kotlin.jvm.functions.Function14; import kotlin.jvm.functions.Function15; +import kotlin.jvm.functions.Function16; import kotlin.jvm.functions.Function19; import kotlin.jvm.functions.Function2; import kotlin.jvm.functions.Function3; @@ -122,7 +123,7 @@ public final class f implements c, e { /* JADX WARN: Multi-variable type inference failed */ static { int i2 = 0; - List listOf = n.listOf((Object[]) new Class[]{Function0.class, Function1.class, Function2.class, Function3.class, Function4.class, Function5.class, Function6.class, Function7.class, Function8.class, Function9.class, Function10.class, Function11.class, Function12.class, Function13.class, Function14.class, Function15.class, d0.z.c.a.class, b.class, d0.z.c.c.class, Function19.class, d.class, e.class, d0.z.c.f.class}); + List listOf = n.listOf((Object[]) new Class[]{Function0.class, Function1.class, Function2.class, Function3.class, Function4.class, Function5.class, Function6.class, Function7.class, Function8.class, Function9.class, Function10.class, Function11.class, Function12.class, Function13.class, Function14.class, Function15.class, Function16.class, d0.z.c.a.class, b.class, Function19.class, d0.z.c.c.class, d.class, e.class}); ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(listOf, 10)); for (Object obj : listOf) { int i3 = i2 + 1; diff --git a/app/src/main/java/kotlin/jvm/functions/Function16.java b/app/src/main/java/kotlin/jvm/functions/Function16.java new file mode 100644 index 0000000000..111197ad9a --- /dev/null +++ b/app/src/main/java/kotlin/jvm/functions/Function16.java @@ -0,0 +1,7 @@ +package kotlin.jvm.functions; + +import d0.c; +/* compiled from: Functions.kt */ +public interface Function16 extends c { + R invoke(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8, P9 p9, P10 p10, P11 p11, P12 p12, P13 p13, P14 p14, P15 p15, P16 p16); +} diff --git a/app/src/main/res/layout/view_server_discovery_item.xml b/app/src/main/res/layout/view_server_discovery_item.xml index eeba24eef4..a0dbd0c66d 100644 --- a/app/src/main/res/layout/view_server_discovery_item.xml +++ b/app/src/main/res/layout/view_server_discovery_item.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f300c4eab9..069cc7e19a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1519,7 +1519,7 @@ Select a color Transparency Use Default - 4e8a83e3bc0c46fe9aecf836c91b77a2 + dc4061326c634bf7948bec01036d867e Coming Soon Slash command application {applicationName} {applicationName} application