From c899db8087f2d5e10cff6c1f988a2ed37a578562 Mon Sep 17 00:00:00 2001 From: Juby210 Date: Wed, 22 Sep 2021 08:37:51 +0200 Subject: [PATCH] 94.1 - Alpha (94201) --- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 2 +- app/src/main/java/c/a/q/o0/a.java | 4 +- app/src/main/java/c/a/q/o0/e.java | 127 +- app/src/main/java/c/a/q/o0/g.java | 25 - app/src/main/java/c/a/q/o0/h.java | 28 - app/src/main/java/c/a/q/x.java | 18 +- .../TrackNetworkActionChannelCreate.java | 25 +- .../TrackNetworkActionGuildCreate.java | 18 +- .../TrackNetworkActionInviteResolve.java | 49 +- .../discord/models/domain/ModelInvite.java | 66 +- .../discord/restapi/RestAPIAbortCodes.java | 1 + .../com/discord/restapi/RestAPIInterface.java | 14 +- .../discord/rtcconnection/RtcConnection.java | 21 +- .../ConnectionTimeStats$addListener$2.java | 2 +- .../ConnectionTimeStats$addListener$3.java | 2 +- .../StoreAuthentication$forgotPassword$1.java | 18 + .../stores/StoreAuthentication$logout$1.java | 18 +- .../stores/StoreAuthentication$logout$2.java | 22 +- .../stores/StoreAuthentication$logout$3.java | 12 +- .../stores/StoreAuthentication$logout$4.java | 30 + .../discord/stores/StoreAuthentication.java | 6 +- ...ontactSync$backgroundUploadContacts$1.java | 19 + .../com/discord/stores/StoreContactSync.java | 3 +- ...stantInvites$fetchInviteIfNotLoaded$1.java | 62 +- .../StoreInstantInvites$observeInvites$1.java | 25 - .../discord/stores/StoreInstantInvites.java | 17 +- .../discord/stores/StoreRtcConnection.java | 13 +- .../stores/StoreStreamRtcConnection.java | 13 +- ...stenerCollectionSubject$notifyAsync$1.java | 18 - ...istenerCollectionSubject$threadPool$2.java | 21 - .../ListenerCollectionSubject.java | 17 - .../utilities/fcm/NotificationData.java | 77 +- .../discord/utilities/intent/IntentUtils.java | 5 + .../com/discord/utilities/rest/RestAPI.java | 14 +- .../auth/WidgetAuthLandingViewModel.java | 2 +- .../WidgetAuthPhoneVerify$evaluateCode$1.java | 36 +- .../WidgetAuthPhoneVerify$evaluateCode$2.java | 28 +- .../WidgetAuthPhoneVerify$evaluateCode$3.java | 33 + .../widgets/auth/WidgetAuthPhoneVerify.java | 3 +- .../WidgetCreateChannel$configureUI$1.java | 29 +- ...ListBuilder$$inlined$forEach$lambda$1.java | 26 +- ...ListBuilder$$inlined$forEach$lambda$2.java | 18 +- ...ListBuilder$$inlined$forEach$lambda$3.java | 18 +- ...ListBuilder$$inlined$forEach$lambda$4.java | 18 +- ...ListBuilder$$inlined$forEach$lambda$5.java | 18 +- ...ListBuilder$$inlined$forEach$lambda$6.java | 18 +- ...ListBuilder$$inlined$forEach$lambda$7.java | 22 +- ...ListBuilder$$inlined$forEach$lambda$8.java | 18 +- ...istModel$Companion$guildListBuilder$1.java | 39 - ...istModel$Companion$guildListBuilder$2.java | 46 +- ...istModel$Companion$guildListBuilder$3.java | 32 +- ...istModel$Companion$guildListBuilder$4.java | 16 +- ...istModel$Companion$guildListBuilder$5.java | 41 + ...del$Companion$guildListBuilder$6$7$1.java} | 6 +- .../channels/list/WidgetChannelListModel.java | 2 +- .../WidgetChannelsList$onViewBound$7.java | 12 +- ...temGuildScheduledEvents$onConfigure$1.java | 2 +- ...tAdapter$onViewGuildScheduledEvents$1.java | 11 +- .../list/WidgetChannelsListAdapter.java | 14 +- .../ChannelListItemGuildScheduledEvents.java | 48 +- .../WidgetChatListAdapterItemInvite.java | 2 +- .../WidgetChatListAdapterItemStageInvite.java | 2 +- ...tactSyncViewModel$onContactsFetched$1.java | 25 +- ...tactSyncViewModel$onContactsFetched$2.java | 14 +- ...tactSyncViewModel$onContactsFetched$3.java | 30 + .../WidgetContactSyncViewModel.java | 2 +- ...eGuild$createGuildRequestObservable$1.java | 21 + .../create/WidgetGuildCreateViewModel.java | 7 +- .../guilds/invite/WidgetGuildInvite.java | 2 +- .../GuildEventPromptListView.java | 15 +- ...uledEventBottomButtonView$configure$5.java | 18 + ...erestedButton$$inlined$apply$lambda$1.java | 12 +- .../GuildScheduledEventBottomButtonView.java | 57 +- ...uledEventItemView$configureInternal$5.java | 17 +- ...uledEventItemView$configureInternal$6.java | 17 + .../GuildScheduledEventItemView.java | 19 +- ...Adapter$EventViewHolder$onConfigure$6.java | 51 + .../GuildScheduledEventListAdapter.java | 2 +- .../GuildScheduledEventModel.java | 20 +- .../GuildScheduledEventPickerDateTime.java | 9 +- .../GuildScheduledEventPickerTime.java | 35 +- .../GuildScheduledEventSettingsViewModel.java | 101 +- ...ScheduledEventViewModel$startEvent$1.java} | 4 +- ...ScheduledEventViewModel$startEvent$2.java} | 4 +- .../PreviewGuildScheduledEventViewModel.java | 48 +- ...EventDetailsBottomSheet$configureUi$7.java | 47 + ...GuildScheduledEventDetailsBottomSheet.java | 2 +- ...cheduledEventDetailsExtrasBottomSheet.java | 3 +- ...dgetGuildScheduledEventLocationSelect.java | 9 +- ...ScheduledEventLocationSelectViewModel.java | 78 +- ...dScheduledEventSettings$onViewBound$7.java | 3 +- ...dScheduledEventSettings$onViewBound$8.java | 8 +- .../WidgetGuildScheduledEventSettings.java | 14 +- ...reviewGuildScheduledEvent$viewModel$2.java | 2 +- ...WidgetNuxChannelPrompt$handleSubmit$1.java | 32 +- .../widgets/settings/WidgetSettings.java | 2 +- .../start/ModeratorStartStageAdapter.java | 2 +- ...etUserPhoneVerify$handleCodeEntered$1.java | 17 +- ...etUserPhoneVerify$handleCodeEntered$2.java | 8 +- ...etUserPhoneVerify$handleCodeEntered$3.java | 16 + .../user/phone/WidgetUserPhoneVerify.java | 3 +- ...uled_event_details_extras_bottom_sheet.xml | 2 +- app/src/main/res/values-ar-rXB/strings.xml | 11 +- app/src/main/res/values-en-rXA/strings.xml | 11 +- app/src/main/res/values/public.xml | 12589 ++++++++-------- app/src/main/res/values/strings.xml | 13 +- 107 files changed, 7613 insertions(+), 7165 deletions(-) delete mode 100644 app/src/main/java/c/a/q/o0/g.java delete mode 100644 app/src/main/java/c/a/q/o0/h.java create mode 100644 app/src/main/java/com/discord/stores/StoreAuthentication$forgotPassword$1.java create mode 100644 app/src/main/java/com/discord/stores/StoreAuthentication$logout$4.java create mode 100644 app/src/main/java/com/discord/stores/StoreContactSync$backgroundUploadContacts$1.java delete mode 100644 app/src/main/java/com/discord/stores/StoreInstantInvites$observeInvites$1.java delete mode 100644 app/src/main/java/com/discord/utilities/collections/ListenerCollectionSubject$notifyAsync$1.java delete mode 100644 app/src/main/java/com/discord/utilities/collections/ListenerCollectionSubject$threadPool$2.java create mode 100644 app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$evaluateCode$3.java delete mode 100644 app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1.java create mode 100644 app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$5.java rename app/src/main/java/com/discord/widgets/channels/list/{WidgetChannelListModel$Companion$guildListBuilder$5$7$1.java => WidgetChannelListModel$Companion$guildListBuilder$6$7$1.java} (84%) create mode 100644 app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel$onContactsFetched$3.java create mode 100644 app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$createGuild$createGuildRequestObservable$1.java create mode 100644 app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventBottomButtonView$configure$5.java create mode 100644 app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView$configureInternal$6.java create mode 100644 app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListAdapter$EventViewHolder$onConfigure$6.java rename app/src/main/java/com/discord/widgets/guildscheduledevent/{PreviewGuildScheduledEventViewModel$startVoiceEvent$1.java => PreviewGuildScheduledEventViewModel$startEvent$1.java} (79%) rename app/src/main/java/com/discord/widgets/guildscheduledevent/{PreviewGuildScheduledEventViewModel$startVoiceEvent$2.java => PreviewGuildScheduledEventViewModel$startEvent$2.java} (80%) create mode 100644 app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsBottomSheet$configureUi$7.java create mode 100644 app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify$handleCodeEntered$3.java diff --git a/app/build.gradle b/app/build.gradle index 01dc8fa164..ae7e928c57 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 29 - versionCode 94200 - versionName "94.0 - Alpha" + versionCode 94201 + versionName "94.1 - Alpha" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7f392f663d..551f66afb6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/java/c/a/q/o0/a.java b/app/src/main/java/c/a/q/o0/a.java index 1ce5e51fff..1ef2c1b7d2 100644 --- a/app/src/main/java/c/a/q/o0/a.java +++ b/app/src/main/java/c/a/q/o0/a.java @@ -46,9 +46,8 @@ public final /* synthetic */ class a extends k implements Function1 Transport transport = stats2.getTransport(); eVar.g(null, Integer.valueOf((transport == null || (receiverReports = transport.getReceiverReports()) == null) ? 0 : receiverReports.length), currentTimeMillis); if (!eVar.k.a() && (outboundRtpVideo = stats2.getOutboundRtpVideo()) != null) { - eVar.a(eVar.l, new e.h((long) outboundRtpVideo.getResolution().getHeight(), currentTimeMillis, new e.a(outboundRtpVideo.getFramesEncoded(), outboundRtpVideo.getFramesSent(), outboundRtpVideo.getPacketsSent(), (long) outboundRtpVideo.getPacketsLost(), 0, outboundRtpVideo.getBytesSent(), outboundRtpVideo.getNackCount(), outboundRtpVideo.getPliCount(), outboundRtpVideo.getQpSum()))); + eVar.a(eVar.l, new e.g((long) outboundRtpVideo.getResolution().getHeight(), currentTimeMillis, new e.a(outboundRtpVideo.getFramesEncoded(), outboundRtpVideo.getFramesSent(), outboundRtpVideo.getPacketsSent(), (long) outboundRtpVideo.getPacketsLost(), 0, outboundRtpVideo.getBytesSent(), outboundRtpVideo.getNackCount(), outboundRtpVideo.getPliCount(), outboundRtpVideo.getQpSum()))); if (eVar.l.d == null && outboundRtpVideo.getFramesEncoded() > 0) { - eVar.e.notifyAsync(g.i); eVar.l.d = Long.valueOf(currentTimeMillis - eVar.g); Logger.i$default(eVar.p, "VideoQuality: outboundStats.timeToFirstFrame: " + eVar.l.d, null, 2, null); } @@ -76,7 +75,6 @@ public final /* synthetic */ class a extends k implements Function1 } Long l = eVar.n.get(Long.valueOf(value.getSsrc())); if (l != null) { - eVar.e.notifyAsync(new h(value)); eVar3.d = Long.valueOf(currentTimeMillis - l.longValue()); Logger.i$default(eVar.p, "VideoQuality: inbound.timeToFirstFrame: " + eVar3.d + " (userId: " + j + ", ssrc: " + value.getSsrc() + ')', null, 2, null); } else { diff --git a/app/src/main/java/c/a/q/o0/e.java b/app/src/main/java/c/a/q/o0/e.java index 3ac9ae49b6..7240a453df 100644 --- a/app/src/main/java/c/a/q/o0/e.java +++ b/app/src/main/java/c/a/q/o0/e.java @@ -33,14 +33,14 @@ public final class e { /* renamed from: c reason: collision with root package name */ public static final List f230c = n.listOf((Object[]) new Integer[]{720, 480, 360}); public static final b d = new b(null); - public final ListenerCollectionSubject e; - public final ListenerCollection f; + public final ListenerCollectionSubject e; + public final ListenerCollection f; public final long g; public Long h; public final d i; public final d j; public final d k; - public final g l = new g(); + public final f l = new f(); public final Map m = new LinkedHashMap(); public final Map n = new LinkedHashMap(); public final DeviceResourceUsageMonitor o; @@ -140,7 +140,7 @@ public final class e { } /* compiled from: VideoQuality.kt */ - public static abstract class c implements f { + public static abstract class c { } /* compiled from: VideoQuality.kt */ @@ -183,7 +183,7 @@ public final class e { /* compiled from: VideoQuality.kt */ /* renamed from: c.a.q.o0.e$e reason: collision with other inner class name */ public static class C0043e { - public List a = new ArrayList(); + public List a = new ArrayList(); public final Histogram b = new Histogram(5, 0, 2, null); /* renamed from: c reason: collision with root package name */ @@ -210,14 +210,7 @@ public final class e { } /* compiled from: VideoQuality.kt */ - public interface f { - void onFirstFrameReceived(long j); - - void onFirstFrameSent(); - } - - /* compiled from: VideoQuality.kt */ - public static final class g extends C0043e { + public static final class f extends C0043e { public int k = 2500000; public int l = 30; public long m; @@ -226,18 +219,18 @@ public final class e { } /* compiled from: VideoQuality.kt */ - public static final class h { + public static final class g { public final long a; public final long b; /* renamed from: c reason: collision with root package name */ public final a f233c; - public h() { + public g() { this(0, 0, new a(0, 0, 0, 0, 0, 0, 0, 0, 0, FrameMetricsAggregator.EVERY_DURATION)); } - public h(long j, long j2, a aVar) { + public g(long j, long j2, a aVar) { m.checkNotNullParameter(aVar, "aggregatedProperties"); this.a = j; this.b = j2; @@ -248,11 +241,11 @@ public final class e { if (this == obj) { return true; } - if (!(obj instanceof h)) { + if (!(obj instanceof g)) { return false; } - h hVar = (h) obj; - return this.a == hVar.a && this.b == hVar.b && m.areEqual(this.f233c, hVar.f233c); + g gVar = (g) obj; + return this.a == gVar.a && this.b == gVar.b && m.areEqual(this.f233c, gVar.f233c); } public int hashCode() { @@ -274,11 +267,11 @@ public final class e { } /* compiled from: VideoQuality.kt */ - public static final class i extends o implements Function1 { + public static final class h extends o implements Function1 { public final /* synthetic */ e this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public i(e eVar) { + public h(e eVar) { super(1); this.this$0 = eVar; } @@ -309,7 +302,7 @@ public final class e { m.checkNotNullParameter(clock, "clock"); this.p = logger; this.q = clock; - ListenerCollectionSubject listenerCollectionSubject = new ListenerCollectionSubject<>(); + ListenerCollectionSubject listenerCollectionSubject = new ListenerCollectionSubject<>(); this.e = listenerCollectionSubject; this.f = listenerCollectionSubject; long currentTimeMillis = clock.currentTimeMillis(); @@ -317,23 +310,23 @@ public final class e { this.i = new d(false, currentTimeMillis); this.j = new d(false, currentTimeMillis); this.k = new d(false, currentTimeMillis); - DeviceResourceUsageMonitor deviceResourceUsageMonitor = new DeviceResourceUsageMonitor(new TimeSpan(1, TimeUnit.SECONDS), clock, new i(this)); + DeviceResourceUsageMonitor deviceResourceUsageMonitor = new DeviceResourceUsageMonitor(new TimeSpan(1, TimeUnit.SECONDS), clock, new h(this)); this.o = deviceResourceUsageMonitor; deviceResourceUsageMonitor.start(); } - public final void a(C0043e eVar, h hVar) { - eVar.a.add(hVar); + public final void a(C0043e eVar, g gVar) { + eVar.a.add(gVar); if (eVar.a.size() >= 2) { - List list = eVar.a; - h hVar2 = list.get(list.size() - 1); - List list2 = eVar.a; - h hVar3 = list2.get(list2.size() - 2); + List list = eVar.a; + g gVar2 = list.get(list.size() - 1); + List list2 = eVar.a; + g gVar3 = list2.get(list2.size() - 2); f fVar = f.i; - eVar.f = (hVar2.b - hVar3.b) + eVar.f; + eVar.f = (gVar2.b - gVar3.b) + eVar.f; a aVar = eVar.e; - a aVar2 = hVar2.f233c; - a aVar3 = hVar3.f233c; + a aVar2 = gVar2.f233c; + a aVar3 = gVar3.f233c; aVar.a = fVar.a(aVar2.a, aVar3.a) + aVar.a; aVar.b = fVar.a(aVar2.b, aVar3.b) + aVar.b; aVar.f231c = fVar.a(aVar2.f231c, aVar3.f231c) + aVar.f231c; @@ -343,20 +336,20 @@ public final class e { aVar.g = fVar.a(aVar2.g, aVar3.g) + aVar.g; aVar.h = fVar.a(aVar2.h, aVar3.h) + aVar.h; aVar.i = fVar.a(aVar2.i, aVar3.i) + aVar.i; - a aVar4 = hVar2.f233c; + a aVar4 = gVar2.f233c; long j = aVar4.f; long j2 = aVar4.a; - long j3 = hVar2.b; - long j4 = hVar2.a; - float f2 = ((float) (j3 - hVar3.b)) / 1000.0f; + long j3 = gVar2.b; + long j4 = gVar2.a; + float f2 = ((float) (j3 - gVar3.b)) / 1000.0f; eVar.i = (((float) j4) * f2) + eVar.i; if (eVar.a.size() >= 6) { - List list3 = eVar.a; - h hVar4 = list3.get(list3.size() - 3); - a aVar5 = hVar4.f233c; + List list3 = eVar.a; + g gVar4 = list3.get(list3.size() - 3); + a aVar5 = gVar4.f233c; long j5 = aVar5.f; long j6 = aVar5.a; - long j7 = hVar4.b; + long j7 = gVar4.b; Iterator it = f230c.iterator(); while (true) { float f3 = 0.0f; @@ -402,28 +395,28 @@ public final class e { } } - public final void b(int i2) { + public final void b(int i) { if (this.l.a.size() >= 2) { - List list = this.l.a; + List list = this.l.a; long j = list.get(list.size() - 1).b; - List list2 = this.l.a; + List list2 = this.l.a; float f2 = ((float) (j - list2.get(list2.size() - 2).b)) / 1000.0f; - g gVar = this.l; - long j2 = gVar.m; - Float valueOf = Float.valueOf(((float) gVar.l) * f2); + f fVar = this.l; + long j2 = fVar.m; + Float valueOf = Float.valueOf(((float) fVar.l) * f2); long j3 = 0; - gVar.m = j2 + (valueOf != null ? d0.a0.a.roundToLong(valueOf.floatValue()) : 0); - g gVar2 = this.l; - long j4 = gVar2.n; - Float valueOf2 = Float.valueOf((((float) i2) / 8.0f) * f2); - gVar2.n = j4 + (valueOf2 != null ? d0.a0.a.roundToLong(valueOf2.floatValue()) : 0); - g gVar3 = this.l; - long j5 = gVar3.o; - Float valueOf3 = Float.valueOf((((float) gVar3.k) / 8.0f) * f2); + fVar.m = j2 + (valueOf != null ? d0.a0.a.roundToLong(valueOf.floatValue()) : 0); + f fVar2 = this.l; + long j4 = fVar2.n; + Float valueOf2 = Float.valueOf((((float) i) / 8.0f) * f2); + fVar2.n = j4 + (valueOf2 != null ? d0.a0.a.roundToLong(valueOf2.floatValue()) : 0); + f fVar3 = this.l; + long j5 = fVar3.o; + Float valueOf3 = Float.valueOf((((float) fVar3.k) / 8.0f) * f2); if (valueOf3 != null) { j3 = d0.a0.a.roundToLong(valueOf3.floatValue()); } - gVar3.o = j5 + j3; + fVar3.o = j5 + j3; } } @@ -437,16 +430,16 @@ public final class e { @AnyThread public final synchronized Map d() { - g gVar; + f fVar; float f2; - int i2; + int i; Float valueOf; Float valueOf2; Float valueOf3; - gVar = this.l; - f2 = ((float) gVar.f) / 1000.0f; - i2 = (f2 > ((float) 0) ? 1 : (f2 == ((float) 0) ? 0 : -1)); - return h0.plus(e(this.l), h0.mapOf(d0.o.to("target_bitrate_max", Long.valueOf((i2 <= 0 || (valueOf3 = Float.valueOf(((float) (gVar.o * ((long) 8))) / f2)) == null) ? 0 : d0.a0.a.roundToLong(valueOf3.floatValue()))), d0.o.to("target_bitrate_network", Long.valueOf((i2 <= 0 || (valueOf2 = Float.valueOf(((float) (this.l.n * ((long) 8))) / f2)) == null) ? 0 : d0.a0.a.roundToLong(valueOf2.floatValue()))), d0.o.to("target_fps", Long.valueOf((i2 <= 0 || (valueOf = Float.valueOf(((float) this.l.m) / f2)) == null) ? 0 : d0.a0.a.roundToLong(valueOf.floatValue()))), d0.o.to("duration_encoder_nvidia_cuda", 0L), d0.o.to("duration_encoder_nvidia_direct3d", 0L), d0.o.to("duration_encoder_openh264", 0L), d0.o.to("duration_encoder_videotoolbox", 0L), d0.o.to("duration_encoder_amd_direct3d", 0L), d0.o.to("duration_encoder_intel", 0L), d0.o.to("duration_encoder_intel_direct3d", 0L), d0.o.to("duration_encoder_unknown", 0L))); + fVar = this.l; + f2 = ((float) fVar.f) / 1000.0f; + i = (f2 > ((float) 0) ? 1 : (f2 == ((float) 0) ? 0 : -1)); + return h0.plus(e(this.l), h0.mapOf(d0.o.to("target_bitrate_max", Long.valueOf((i <= 0 || (valueOf3 = Float.valueOf(((float) (fVar.o * ((long) 8))) / f2)) == null) ? 0 : d0.a0.a.roundToLong(valueOf3.floatValue()))), d0.o.to("target_bitrate_network", Long.valueOf((i <= 0 || (valueOf2 = Float.valueOf(((float) (this.l.n * ((long) 8))) / f2)) == null) ? 0 : d0.a0.a.roundToLong(valueOf2.floatValue()))), d0.o.to("target_fps", Long.valueOf((i <= 0 || (valueOf = Float.valueOf(((float) this.l.m) / f2)) == null) ? 0 : d0.a0.a.roundToLong(valueOf.floatValue()))), d0.o.to("duration_encoder_nvidia_cuda", 0L), d0.o.to("duration_encoder_nvidia_direct3d", 0L), d0.o.to("duration_encoder_openh264", 0L), d0.o.to("duration_encoder_videotoolbox", 0L), d0.o.to("duration_encoder_amd_direct3d", 0L), d0.o.to("duration_encoder_intel", 0L), d0.o.to("duration_encoder_intel_direct3d", 0L), d0.o.to("duration_encoder_unknown", 0L))); } /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x04e0: APUT @@ -463,16 +456,16 @@ public final class e { Long l = this.h; float longValue = ((float) (l != null ? l.longValue() - this.g : currentTimeMillis - this.g)) / 1000.0f; float f2 = ((float) eVar.f) / 1000.0f; - int i2 = (f2 > ((float) 0) ? 1 : (f2 == ((float) 0) ? 0 : -1)); - long roundToLong = (i2 <= 0 || (valueOf = Float.valueOf(eVar.i / f2)) == null) ? 0 : d0.a0.a.roundToLong(valueOf.floatValue()); + int i = (f2 > ((float) 0) ? 1 : (f2 == ((float) 0) ? 0 : -1)); + long roundToLong = (i <= 0 || (valueOf = Float.valueOf(eVar.i / f2)) == null) ? 0 : d0.a0.a.roundToLong(valueOf.floatValue()); Histogram.Report report = eVar.b.getReport(); Histogram.Report report2 = eVar.f232c.getReport(); b bVar = d; long j = (long) 1024; Map mapOf = h0.mapOf(d0.o.to("duration", Double.valueOf(Math.floor((double) longValue))), c.d.b.a.a.Y(bVar, eVar.g.get(8000000), "duration_stream_under_8mbps"), c.d.b.a.a.Y(bVar, eVar.g.get(7000000), "duration_stream_under_7mbps"), c.d.b.a.a.Y(bVar, eVar.g.get(6000000), "duration_stream_under_6mbps"), c.d.b.a.a.Y(bVar, eVar.g.get(5000000), "duration_stream_under_5mbps"), c.d.b.a.a.Y(bVar, eVar.g.get(4000000), "duration_stream_under_4mbps"), c.d.b.a.a.Y(bVar, eVar.g.get(3000000), "duration_stream_under_3mbps"), c.d.b.a.a.Y(bVar, eVar.g.get(2000000), "duration_stream_under_2mbps"), c.d.b.a.a.Y(bVar, eVar.g.get(1500000), "duration_stream_under_1_5mbps"), c.d.b.a.a.Y(bVar, eVar.g.get(1000000), "duration_stream_under_1mbps"), c.d.b.a.a.Y(bVar, eVar.g.get(500000), "duration_stream_under_0_5mbps"), c.d.b.a.a.Y(bVar, eVar.g.get(0), "duration_stream_at_0mbps"), c.d.b.a.a.Y(bVar, eVar.h.get(60), "duration_fps_under_60"), c.d.b.a.a.Y(bVar, eVar.h.get(55), "duration_fps_under_55"), c.d.b.a.a.Y(bVar, eVar.h.get(50), "duration_fps_under_50"), c.d.b.a.a.Y(bVar, eVar.h.get(45), "duration_fps_under_45"), c.d.b.a.a.Y(bVar, eVar.h.get(40), "duration_fps_under_40"), c.d.b.a.a.Y(bVar, eVar.h.get(35), "duration_fps_under_35"), c.d.b.a.a.Y(bVar, eVar.h.get(30), "duration_fps_under_30"), c.d.b.a.a.Y(bVar, eVar.h.get(25), "duration_fps_under_25"), c.d.b.a.a.Y(bVar, eVar.h.get(20), "duration_fps_under_20"), c.d.b.a.a.Y(bVar, eVar.h.get(15), "duration_fps_under_15"), c.d.b.a.a.Y(bVar, eVar.h.get(10), "duration_fps_under_10"), c.d.b.a.a.Y(bVar, eVar.h.get(5), "duration_fps_under_5"), c.d.b.a.a.Y(bVar, eVar.h.get(0), "duration_fps_at_0"), d0.o.to("avg_resolution", Long.valueOf(roundToLong)), c.d.b.a.a.Y(bVar, eVar.j.get(720), "duration_resolution_under_720"), c.d.b.a.a.Y(bVar, eVar.j.get(480), "duration_resolution_under_480"), c.d.b.a.a.Y(bVar, eVar.j.get(360), "duration_resolution_under_360"), d0.o.to("num_pauses", 0), d0.o.to("duration_paused", Long.valueOf(b.a(bVar, Float.valueOf(((float) this.i.c(currentTimeMillis)) / 1000.0f)))), d0.o.to("duration_zero_receivers", Long.valueOf(b.a(bVar, Float.valueOf(((float) this.j.c(currentTimeMillis)) / 1000.0f)))), d0.o.to("duration_video_stopped", Long.valueOf(b.a(bVar, Float.valueOf(((float) this.k.c(currentTimeMillis)) / 1000.0f)))), d0.o.to("client_performance_cpu_percentile25", Long.valueOf(report.getPercentile25())), d0.o.to("client_performance_cpu_percentile50", Long.valueOf(report.getPercentile50())), d0.o.to("client_performance_cpu_percentile75", Long.valueOf(report.getPercentile75())), d0.o.to("client_performance_cpu_percentile90", Long.valueOf(report.getPercentile90())), d0.o.to("client_performance_cpu_percentile95", Long.valueOf(report.getPercentile95())), d0.o.to("client_performance_memory_percentile25", Long.valueOf(report2.getPercentile25() / j)), d0.o.to("client_performance_memory_percentile50", Long.valueOf(report2.getPercentile50() / j)), d0.o.to("client_performance_memory_percentile75", Long.valueOf(report2.getPercentile75() / j)), d0.o.to("client_performance_memory_percentile90", Long.valueOf(report2.getPercentile90() / j)), d0.o.to("client_performance_memory_percentile95", Long.valueOf(report2.getPercentile95() / j)), d0.o.to("client_performance_memory_min", Long.valueOf(report2.getMin() / j)), d0.o.to("client_performance_memory_max", Long.valueOf(report2.getMax() / j))); a aVar = eVar.e; - long a2 = i2 > 0 ? b.a(bVar, Float.valueOf(((float) (aVar.f * ((long) 8))) / f2)) : 0; - long a3 = i2 > 0 ? b.a(bVar, Float.valueOf(((float) aVar.a) / f2)) : 0; + long a2 = i > 0 ? b.a(bVar, Float.valueOf(((float) (aVar.f * ((long) 8))) / f2)) : 0; + long a3 = i > 0 ? b.a(bVar, Float.valueOf(((float) aVar.a) / f2)) : 0; Pair[] pairArr = new Pair[11]; pairArr[0] = d0.o.to("avg_bitrate", Long.valueOf(a2)); pairArr[1] = d0.o.to("avg_fps", Long.valueOf(a3)); @@ -489,8 +482,8 @@ public final class e { return h0.plus(mapOf, h0.mapOf(pairArr)); } - public final h f(InboundRtpVideo inboundRtpVideo, long j) { - return new h((long) inboundRtpVideo.getResolution().getHeight(), j, new a((long) inboundRtpVideo.getFramesDecoded(), (long) inboundRtpVideo.getFramesReceived(), (long) inboundRtpVideo.getPacketsReceived(), (long) inboundRtpVideo.getPacketsLost(), (long) inboundRtpVideo.getFramesDropped(), inboundRtpVideo.getBytesReceived(), inboundRtpVideo.getNackCount(), inboundRtpVideo.getPliCount(), inboundRtpVideo.getQpSum())); + public final g f(InboundRtpVideo inboundRtpVideo, long j) { + return new g((long) inboundRtpVideo.getResolution().getHeight(), j, new a((long) inboundRtpVideo.getFramesDecoded(), (long) inboundRtpVideo.getFramesReceived(), (long) inboundRtpVideo.getPacketsReceived(), (long) inboundRtpVideo.getPacketsLost(), (long) inboundRtpVideo.getFramesDropped(), inboundRtpVideo.getBytesReceived(), inboundRtpVideo.getNackCount(), inboundRtpVideo.getPliCount(), inboundRtpVideo.getQpSum())); } public final void g(Boolean bool, Integer num, long j) { diff --git a/app/src/main/java/c/a/q/o0/g.java b/app/src/main/java/c/a/q/o0/g.java deleted file mode 100644 index e86ceb9030..0000000000 --- a/app/src/main/java/c/a/q/o0/g.java +++ /dev/null @@ -1,25 +0,0 @@ -package c.a.q.o0; - -import c.a.q.o0.e; -import d0.z.d.m; -import d0.z.d.o; -import kotlin.Unit; -import kotlin.jvm.functions.Function1; -/* compiled from: VideoQuality.kt */ -public final class g extends o implements Function1 { - public static final g i = new g(); - - public g() { - super(1); - } - - /* 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] */ - @Override // kotlin.jvm.functions.Function1 - public Unit invoke(e.f fVar) { - e.f fVar2 = fVar; - m.checkNotNullParameter(fVar2, "it"); - fVar2.onFirstFrameSent(); - return Unit.a; - } -} diff --git a/app/src/main/java/c/a/q/o0/h.java b/app/src/main/java/c/a/q/o0/h.java deleted file mode 100644 index 826d4c8706..0000000000 --- a/app/src/main/java/c/a/q/o0/h.java +++ /dev/null @@ -1,28 +0,0 @@ -package c.a.q.o0; - -import c.a.q.o0.e; -import co.discord.media_engine.InboundRtpVideo; -import d0.z.d.m; -import d0.z.d.o; -import kotlin.Unit; -import kotlin.jvm.functions.Function1; -/* compiled from: VideoQuality.kt */ -public final class h extends o implements Function1 { - public final /* synthetic */ InboundRtpVideo $statsPerUser; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public h(InboundRtpVideo inboundRtpVideo) { - super(1); - this.$statsPerUser = inboundRtpVideo; - } - - /* 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] */ - @Override // kotlin.jvm.functions.Function1 - public Unit invoke(e.f fVar) { - e.f fVar2 = fVar; - m.checkNotNullParameter(fVar2, "it"); - fVar2.onFirstFrameReceived(this.$statsPerUser.getSsrc()); - return Unit.a; - } -} diff --git a/app/src/main/java/c/a/q/x.java b/app/src/main/java/c/a/q/x.java index b7c8edb1e2..0845a51a0f 100644 --- a/app/src/main/java/c/a/q/x.java +++ b/app/src/main/java/c/a/q/x.java @@ -4,23 +4,9 @@ import c.a.q.o0.e; import com.discord.rtcconnection.RtcConnection; /* compiled from: RtcConnection.kt */ public final class x extends e.c { - public final /* synthetic */ RtcConnection i; + public final /* synthetic */ RtcConnection a; public x(RtcConnection rtcConnection) { - this.i = rtcConnection; - } - - @Override // c.a.q.o0.e.f - public void onFirstFrameReceived(long j) { - for (RtcConnection.c cVar : this.i.m) { - cVar.onFirstFrameReceived(j); - } - } - - @Override // c.a.q.o0.e.f - public void onFirstFrameSent() { - for (RtcConnection.c cVar : this.i.m) { - cVar.onFirstFrameSent(); - } + this.a = rtcConnection; } } diff --git a/app/src/main/java/com/discord/analytics/generated/events/network_action/TrackNetworkActionChannelCreate.java b/app/src/main/java/com/discord/analytics/generated/events/network_action/TrackNetworkActionChannelCreate.java index 9dbfe9583d..ac18ad9749 100644 --- a/app/src/main/java/com/discord/analytics/generated/events/network_action/TrackNetworkActionChannelCreate.java +++ b/app/src/main/java/com/discord/analytics/generated/events/network_action/TrackNetworkActionChannelCreate.java @@ -11,16 +11,29 @@ import com.discord.api.science.AnalyticsSchema; import d0.z.d.m; /* compiled from: TrackNetworkActionChannelCreate.kt */ public final class TrackNetworkActionChannelCreate implements AnalyticsSchema, TrackBaseReceiver, TrackLocationMetadataReceiver, TrackNetworkMetadataReceiver { - private final transient String analyticsSchemaTypeName = "network_action_channel_create"; - private final Long channelId = null; - private final Long channelType = null; - private final Long guildId = null; - private final Boolean isPrivate = null; - private final Long parentId = null; + private final transient String analyticsSchemaTypeName; + private final Long channelId; + private final Long channelType; + private final Long guildId; + private final Boolean isPrivate; + private final Long parentId; private TrackBase trackBase; private TrackLocationMetadata trackLocationMetadata; private TrackNetworkMetadata trackNetworkMetadata; + public TrackNetworkActionChannelCreate() { + this(null, null, null, null, null); + } + + public TrackNetworkActionChannelCreate(Boolean bool, Long l, Long l2, Long l3, Long l4) { + this.isPrivate = bool; + this.channelType = l; + this.channelId = l2; + this.parentId = l3; + this.guildId = l4; + this.analyticsSchemaTypeName = "network_action_channel_create"; + } + @Override // com.discord.analytics.generated.traits.TrackNetworkMetadataReceiver public void a(TrackNetworkMetadata trackNetworkMetadata) { this.trackNetworkMetadata = trackNetworkMetadata; diff --git a/app/src/main/java/com/discord/analytics/generated/events/network_action/TrackNetworkActionGuildCreate.java b/app/src/main/java/com/discord/analytics/generated/events/network_action/TrackNetworkActionGuildCreate.java index 49c31be3c2..db76f22516 100644 --- a/app/src/main/java/com/discord/analytics/generated/events/network_action/TrackNetworkActionGuildCreate.java +++ b/app/src/main/java/com/discord/analytics/generated/events/network_action/TrackNetworkActionGuildCreate.java @@ -11,13 +11,25 @@ import com.discord.api.science.AnalyticsSchema; import d0.z.d.m; /* compiled from: TrackNetworkActionGuildCreate.kt */ public final class TrackNetworkActionGuildCreate implements AnalyticsSchema, TrackBaseReceiver, TrackLocationMetadataReceiver, TrackNetworkMetadataReceiver { - private final transient String analyticsSchemaTypeName = "network_action_guild_create"; - private final Boolean isCommunityIntent = null; - private final CharSequence templateName = null; + private final transient String analyticsSchemaTypeName; + private final Boolean isCommunityIntent; + private final CharSequence templateName; private TrackBase trackBase; private TrackLocationMetadata trackLocationMetadata; private TrackNetworkMetadata trackNetworkMetadata; + public TrackNetworkActionGuildCreate() { + this.templateName = null; + this.isCommunityIntent = null; + this.analyticsSchemaTypeName = "network_action_guild_create"; + } + + public TrackNetworkActionGuildCreate(CharSequence charSequence, Boolean bool) { + this.templateName = charSequence; + this.isCommunityIntent = null; + this.analyticsSchemaTypeName = "network_action_guild_create"; + } + @Override // com.discord.analytics.generated.traits.TrackNetworkMetadataReceiver public void a(TrackNetworkMetadata trackNetworkMetadata) { this.trackNetworkMetadata = trackNetworkMetadata; diff --git a/app/src/main/java/com/discord/analytics/generated/events/network_action/TrackNetworkActionInviteResolve.java b/app/src/main/java/com/discord/analytics/generated/events/network_action/TrackNetworkActionInviteResolve.java index 6a7af9da2e..9d572f0f73 100644 --- a/app/src/main/java/com/discord/analytics/generated/events/network_action/TrackNetworkActionInviteResolve.java +++ b/app/src/main/java/com/discord/analytics/generated/events/network_action/TrackNetworkActionInviteResolve.java @@ -11,23 +11,44 @@ import com.discord.api.science.AnalyticsSchema; import d0.z.d.m; /* compiled from: TrackNetworkActionInviteResolve.kt */ public final class TrackNetworkActionInviteResolve implements AnalyticsSchema, TrackBaseReceiver, TrackLocationMetadataReceiver, TrackNetworkMetadataReceiver { - private final transient String analyticsSchemaTypeName = "network_action_invite_resolve"; - private final Boolean authenticated = null; - private final Long channelId = null; - private final Long channelType = null; - private final CharSequence code = null; - private final Long destinationUserId = null; - private final Long guildId = null; - private final CharSequence inputValue = null; - private final CharSequence inviteType = null; - private final Long inviterId = null; - private final Boolean resolved = null; - private final Long sizeOnline = null; - private final Long sizeTotal = null; + private final transient String analyticsSchemaTypeName; + private final Boolean authenticated; + private final Long channelId; + private final Long channelType; + private final CharSequence code; + private final Long destinationUserId; + private final Long guildId; + private final CharSequence inputValue; + private final CharSequence inviteType; + private final Long inviterId; + private final Boolean resolved; + private final Long sizeOnline; + private final Long sizeTotal; private TrackBase trackBase; private TrackLocationMetadata trackLocationMetadata; private TrackNetworkMetadata trackNetworkMetadata; - private final Boolean userBanned = null; + private final Boolean userBanned; + + public TrackNetworkActionInviteResolve() { + this(null, null, null, null, null, null, null, null, null, null, null, null, null); + } + + public TrackNetworkActionInviteResolve(Boolean bool, CharSequence charSequence, Boolean bool2, Long l, Long l2, Long l3, Long l4, Long l5, Long l6, CharSequence charSequence2, Long l7, Boolean bool3, CharSequence charSequence3) { + this.resolved = bool; + this.code = charSequence; + this.authenticated = bool2; + this.guildId = l; + this.channelId = l2; + this.channelType = l3; + this.inviterId = l4; + this.sizeTotal = l5; + this.sizeOnline = l6; + this.inviteType = charSequence2; + this.destinationUserId = l7; + this.userBanned = bool3; + this.inputValue = charSequence3; + this.analyticsSchemaTypeName = "network_action_invite_resolve"; + } @Override // com.discord.analytics.generated.traits.TrackNetworkMetadataReceiver public void a(TrackNetworkMetadata trackNetworkMetadata) { diff --git a/app/src/main/java/com/discord/models/domain/ModelInvite.java b/app/src/main/java/com/discord/models/domain/ModelInvite.java index 7a815c687a..412a58d564 100644 --- a/app/src/main/java/com/discord/models/domain/ModelInvite.java +++ b/app/src/main/java/com/discord/models/domain/ModelInvite.java @@ -26,9 +26,33 @@ public class ModelInvite implements Serializable { private ModelMemberVerificationForm memberVerificationForm; private boolean newMember; private boolean revoked; + private int targetType; private boolean temporary; private int uses; + public enum InviteTargetTypes { + STREAM(1, "Stream"), + EMBEDDED_APPLICATION(2, "Application"), + GDM(-1, "GDM Invite"), + SERVER(-1, "Server Invite"); + + private final int code; + private final String name; + + private InviteTargetTypes(int i, String str) { + this.code = i; + this.name = str; + } + + public static /* synthetic */ int access$000(InviteTargetTypes inviteTargetTypes) { + return inviteTargetTypes.code; + } + + public static /* synthetic */ String access$100(InviteTargetTypes inviteTargetTypes) { + return inviteTargetTypes.name; + } + } + public static class Settings { public static final int[] EXPIRES_AFTER_ARRAY = {0, SEVEN_DAYS, 86400, TWELVE_HOURS, SIX_HOURS, 3600, HALF_HOUR}; public static final int HALF_HOUR = 1800; @@ -132,6 +156,15 @@ public class ModelInvite implements Serializable { return str + "?event=" + l; } + private boolean isMultiUserDm(Channel channel) { + return channel.A() == 3; + } + + private boolean isPublic(Channel channel) { + int A = channel.A(); + return (A == 1 || A == 3) ? false : true; + } + public boolean canEqual(Object obj) { return obj instanceof ModelInvite; } @@ -145,7 +178,7 @@ public class ModelInvite implements Serializable { return false; } ModelInvite modelInvite = (ModelInvite) obj; - if (!modelInvite.canEqual(this) || getMaxAge() != modelInvite.getMaxAge() || isRevoked() != modelInvite.isRevoked() || isTemporary() != modelInvite.isTemporary() || getUses() != modelInvite.getUses() || getMaxUses() != modelInvite.getMaxUses() || getApproximatePresenceCount() != modelInvite.getApproximatePresenceCount() || getApproximateMemberCount() != modelInvite.getApproximateMemberCount() || isNewMember() != modelInvite.isNewMember() || isStatic() != modelInvite.isStatic()) { + if (!modelInvite.canEqual(this) || getMaxAge() != modelInvite.getMaxAge() || isRevoked() != modelInvite.isRevoked() || isTemporary() != modelInvite.isTemporary() || getTargetType() != modelInvite.getTargetType() || getUses() != modelInvite.getUses() || getMaxUses() != modelInvite.getMaxUses() || getApproximatePresenceCount() != modelInvite.getApproximatePresenceCount() || getApproximateMemberCount() != modelInvite.getApproximateMemberCount() || isNewMember() != modelInvite.isNewMember() || isStatic() != modelInvite.isStatic()) { return false; } User inviter = getInviter(); @@ -213,6 +246,29 @@ public class ModelInvite implements Serializable { return this.guildScheduledEvent; } + public String getInviteType() { + if (this.channel == null) { + return null; + } + int i = this.targetType; + InviteTargetTypes inviteTargetTypes = InviteTargetTypes.STREAM; + if (i == InviteTargetTypes.access$000(inviteTargetTypes)) { + return InviteTargetTypes.access$100(inviteTargetTypes); + } + int i2 = this.targetType; + InviteTargetTypes inviteTargetTypes2 = InviteTargetTypes.EMBEDDED_APPLICATION; + if (i2 == InviteTargetTypes.access$000(inviteTargetTypes2)) { + return InviteTargetTypes.access$100(inviteTargetTypes2); + } + if (isMultiUserDm(this.channel)) { + return InviteTargetTypes.access$100(InviteTargetTypes.GDM); + } + if (isPublic(this.channel)) { + return InviteTargetTypes.access$100(InviteTargetTypes.SERVER); + } + return null; + } + public User getInviter() { return this.inviter; } @@ -229,6 +285,10 @@ public class ModelInvite implements Serializable { return this.memberVerificationForm; } + public int getTargetType() { + return this.targetType; + } + public long getTimeToExpirationMillis() { return getExpirationTime() - ClockFactory.get().currentTimeMillis(); } @@ -240,7 +300,7 @@ public class ModelInvite implements Serializable { @Override // java.lang.Object public int hashCode() { int i = 79; - int approximateMemberCount = (((getApproximateMemberCount() + ((getApproximatePresenceCount() + ((getMaxUses() + ((getUses() + ((((((getMaxAge() + 59) * 59) + (isRevoked() ? 79 : 97)) * 59) + (isTemporary() ? 79 : 97)) * 59)) * 59)) * 59)) * 59)) * 59) + (isNewMember() ? 79 : 97)) * 59; + int approximateMemberCount = (((getApproximateMemberCount() + ((getApproximatePresenceCount() + ((getMaxUses() + ((getUses() + ((getTargetType() + ((((((getMaxAge() + 59) * 59) + (isRevoked() ? 79 : 97)) * 59) + (isTemporary() ? 79 : 97)) * 59)) * 59)) * 59)) * 59)) * 59)) * 59) + (isNewMember() ? 79 : 97)) * 59; if (!isStatic()) { i = 97; } @@ -315,6 +375,8 @@ public class ModelInvite implements Serializable { P.append(isRevoked()); P.append(", temporary="); P.append(isTemporary()); + P.append(", targetType="); + P.append(getTargetType()); P.append(", uses="); P.append(getUses()); P.append(", maxUses="); diff --git a/app/src/main/java/com/discord/restapi/RestAPIAbortCodes.java b/app/src/main/java/com/discord/restapi/RestAPIAbortCodes.java index 3c746b2578..43a21ce14e 100644 --- a/app/src/main/java/com/discord/restapi/RestAPIAbortCodes.java +++ b/app/src/main/java/com/discord/restapi/RestAPIAbortCodes.java @@ -91,6 +91,7 @@ public final class RestAPIAbortCodes { public static final int UNKNOWN_TOKEN = 10012; public static final int UNKNOWN_USER = 10013; public static final int UNKNOWN_WEBHOOK = 10015; + public static final int USER_BANNED = 40007; private RestAPIAbortCodes() { } diff --git a/app/src/main/java/com/discord/restapi/RestAPIInterface.java b/app/src/main/java/com/discord/restapi/RestAPIInterface.java index 8c90226d2b..e9569b98ba 100644 --- a/app/src/main/java/com/discord/restapi/RestAPIInterface.java +++ b/app/src/main/java/com/discord/restapi/RestAPIInterface.java @@ -296,10 +296,10 @@ public interface RestAPIInterface { Observable createConnectionContacts(@a RestAPIParams.ConnectedAccountContacts connectedAccountContacts); @i0.f0.o("guilds") - Observable createGuild(@a RestAPIParams.CreateGuild createGuild); + Observable> createGuild(@a RestAPIParams.CreateGuild createGuild); @i0.f0.o("guilds/{guildId}/channels") - Observable createGuildChannel(@s("guildId") long j, @a RestAPIParams.CreateGuildChannel createGuildChannel); + Observable> createGuildChannel(@s("guildId") long j, @a RestAPIParams.CreateGuildChannel createGuildChannel); @i0.f0.o("guilds/templates/{guildTemplateCode}") Observable createGuildFromTemplate(@s("guildTemplateCode") String str, @a RestAPIParams.CreateGuildFromTemplate createGuildFromTemplate); @@ -425,7 +425,7 @@ public interface RestAPIInterface { Observable endStageInstance(@s("channelId") long j); @i0.f0.o("auth/forgot") - Observable forgotPassword(@a RestAPIParams.ForgotPassword forgotPassword); + Observable> forgotPassword(@a RestAPIParams.ForgotPassword forgotPassword); @i0.f0.o("users/@me/entitlements/gift-codes") Observable generateGiftCode(@a RestAPIParams.GenerateGiftCode generateGiftCode); @@ -563,7 +563,7 @@ public interface RestAPIInterface { Observable getInteractionData(@s("channelId") long j, @s("messageId") long j2); @f("invites/{code}") - Observable getInviteCode(@s("code") String str, @t("with_counts") boolean z2, @t("guild_scheduled_event_id") Long l); + Observable> getInviteCode(@s("code") String str, @t("with_counts") boolean z2, @t("guild_scheduled_event_id") Long l); @i0.f0.o("users/@me/billing/invoices/preview") Observable getInvoicePreview(@a RestAPIParams.InvoicePreviewBody invoicePreviewBody); @@ -692,7 +692,7 @@ public interface RestAPIInterface { Observable leaveThread(@s("channelId") long j, @t("location") String str); @i0.f0.o("auth/logout") - Observable logout(@a RestAPIParams.UserDevices userDevices); + Observable> logout(@a RestAPIParams.UserDevices userDevices); @n("channels/{channelId}/directory-entry/{guildId}") Observable modifyServerInHub(@s("channelId") long j, @s("guildId") long j2, @a RestAPIParams.AddServerBody addServerBody); @@ -710,7 +710,7 @@ public interface RestAPIInterface { Observable phoneVerificationsResend(@a RestAPIParams.VerificationCodeResend verificationCodeResend); @i0.f0.o("phone-verifications/verify") - Observable phoneVerificationsVerify(@a RestAPIParams.VerificationCode verificationCode); + Observable> phoneVerificationsVerify(@a RestAPIParams.VerificationCode verificationCode); @i0.f0.o("auth/fingerprint") Observable postAuthFingerprint(@a RestAPIParams.EmptyBody emptyBody); @@ -946,7 +946,7 @@ public interface RestAPIInterface { Observable updateVanityUrl(@s("guildId") long j, @a RestAPIParams.VanityUrl vanityUrl); @p("users/@me/connections/contacts/@me/external-friend-list-entries") - Observable uploadContacts(@a RestAPIParams.UploadContacts uploadContacts); + Observable> uploadContacts(@a RestAPIParams.UploadContacts uploadContacts); @i0.f0.o("debug-logs/4/{filename}") Observable uploadLog(@s("filename") String str, @a String str2); diff --git a/app/src/main/java/com/discord/rtcconnection/RtcConnection.java b/app/src/main/java/com/discord/rtcconnection/RtcConnection.java index 93cbeb8041..c622b75315 100644 --- a/app/src/main/java/com/discord/rtcconnection/RtcConnection.java +++ b/app/src/main/java/com/discord/rtcconnection/RtcConnection.java @@ -11,7 +11,6 @@ import c.a.q.g; import c.a.q.g0; import c.a.q.h0; import c.a.q.j; -import c.a.q.o0.e; import c.a.q.p; import c.a.q.q; import c.a.q.r; @@ -50,7 +49,7 @@ import rx.Observable; import rx.Subscription; import rx.subjects.BehaviorSubject; /* compiled from: RtcConnection.kt */ -public final class RtcConnection implements DebugPrintable, MediaSinkWantsManager.a, e.f { +public final class RtcConnection implements DebugPrintable, MediaSinkWantsManager.a { public static int i; public static final a j = new a(null); public final c.a.q.o0.e A; @@ -372,11 +371,9 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage public void onFatalClose() { } - @Override // c.a.q.o0.e.f public void onFirstFrameReceived(long j) { } - @Override // c.a.q.o0.e.f public void onFirstFrameSent() { } @@ -417,7 +414,7 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage } /* compiled from: RtcConnection.kt */ - public interface c extends e.f { + public interface c { void onAnalyticsEvent(AnalyticsEvent analyticsEvent, Map map); void onFatalClose(); @@ -855,20 +852,6 @@ public final class RtcConnection implements DebugPrintable, MediaSinkWantsManage } } - @Override // c.a.q.o0.e.f - public void onFirstFrameReceived(long j2) { - for (c cVar : this.m) { - cVar.onFirstFrameReceived(j2); - } - } - - @Override // c.a.q.o0.e.f - public void onFirstFrameSent() { - for (c cVar : this.m) { - cVar.onFirstFrameSent(); - } - } - public final void p(AnalyticsEvent analyticsEvent, Map map) { String str; map.put("rtc_connection_id", this.l); diff --git a/app/src/main/java/com/discord/stores/ConnectionTimeStats$addListener$2.java b/app/src/main/java/com/discord/stores/ConnectionTimeStats$addListener$2.java index 354a58ed50..b6ae458e3f 100644 --- a/app/src/main/java/com/discord/stores/ConnectionTimeStats$addListener$2.java +++ b/app/src/main/java/com/discord/stores/ConnectionTimeStats$addListener$2.java @@ -22,7 +22,7 @@ public final class ConnectionTimeStats$addListener$2 extends StoreRtcConnection. ConnectionTimeStats.Stat.start$default(ConnectionTimeStats.access$getConnectionStreamFirstFrame$p(this.this$0), false, 1, null); } - @Override // com.discord.stores.StoreRtcConnection.DefaultListener, com.discord.stores.StoreRtcConnection.Listener, c.a.q.o0.e.f + @Override // com.discord.stores.StoreRtcConnection.DefaultListener, com.discord.stores.StoreRtcConnection.Listener public void onFirstFrameReceived(long j) { ConnectionTimeStats.Stat.end$default(ConnectionTimeStats.access$getVideoFirstFrame$p(this.this$0), false, 1, null); ConnectionTimeStats.Stat.end$default(ConnectionTimeStats.access$getConnectionVideoFirstFrame$p(this.this$0), false, 1, null); diff --git a/app/src/main/java/com/discord/stores/ConnectionTimeStats$addListener$3.java b/app/src/main/java/com/discord/stores/ConnectionTimeStats$addListener$3.java index 3e579ebd01..e65af13966 100644 --- a/app/src/main/java/com/discord/stores/ConnectionTimeStats$addListener$3.java +++ b/app/src/main/java/com/discord/stores/ConnectionTimeStats$addListener$3.java @@ -22,7 +22,7 @@ public final class ConnectionTimeStats$addListener$3 extends StoreStreamRtcConne ConnectionTimeStats.Stat.start$default(ConnectionTimeStats.access$getStreamConnection$p(this.this$0), false, 1, null); } - @Override // com.discord.stores.StoreStreamRtcConnection.DefaultListener, com.discord.stores.StoreStreamRtcConnection.Listener, c.a.q.o0.e.f + @Override // com.discord.stores.StoreStreamRtcConnection.DefaultListener, com.discord.stores.StoreStreamRtcConnection.Listener public void onFirstFrameReceived(long j) { ConnectionTimeStats.Stat.end$default(ConnectionTimeStats.access$getStreamFirstFrame$p(this.this$0), false, 1, null); ConnectionTimeStats.Stat.end$default(ConnectionTimeStats.access$getConnectionStreamFirstFrame$p(this.this$0), false, 1, null); diff --git a/app/src/main/java/com/discord/stores/StoreAuthentication$forgotPassword$1.java b/app/src/main/java/com/discord/stores/StoreAuthentication$forgotPassword$1.java new file mode 100644 index 0000000000..4ce1c2026e --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreAuthentication$forgotPassword$1.java @@ -0,0 +1,18 @@ +package com.discord.stores; + +import com.discord.analytics.generated.events.network_action.TrackNetworkActionForgotPassword; +import com.discord.analytics.generated.traits.TrackNetworkMetadataReceiver; +import d0.z.d.o; +import kotlin.jvm.functions.Function1; +/* compiled from: StoreAuthentication.kt */ +public final class StoreAuthentication$forgotPassword$1 extends o implements Function1 { + public static final StoreAuthentication$forgotPassword$1 INSTANCE = new StoreAuthentication$forgotPassword$1(); + + public StoreAuthentication$forgotPassword$1() { + super(1); + } + + public final TrackNetworkMetadataReceiver invoke(Void r1) { + return new TrackNetworkActionForgotPassword(); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreAuthentication$logout$1.java b/app/src/main/java/com/discord/stores/StoreAuthentication$logout$1.java index dfa186d968..0384edd61b 100644 --- a/app/src/main/java/com/discord/stores/StoreAuthentication$logout$1.java +++ b/app/src/main/java/com/discord/stores/StoreAuthentication$logout$1.java @@ -1,16 +1,18 @@ package com.discord.stores; -import j0.k.b; -import rx.Observable; +import com.discord.analytics.generated.events.network_action.TrackNetworkActionUserLogout; +import com.discord.analytics.generated.traits.TrackNetworkMetadataReceiver; +import d0.z.d.o; +import kotlin.jvm.functions.Function1; /* compiled from: StoreAuthentication.kt */ -public final class StoreAuthentication$logout$1 implements b> { - public final /* synthetic */ StoreAuthentication this$0; +public final class StoreAuthentication$logout$1 extends o implements Function1 { + public static final StoreAuthentication$logout$1 INSTANCE = new StoreAuthentication$logout$1(); - public StoreAuthentication$logout$1(StoreAuthentication storeAuthentication) { - this.this$0 = storeAuthentication; + public StoreAuthentication$logout$1() { + super(1); } - public final Observable call(Void r1) { - return StoreAuthentication.access$getFingerprintSnapshotOrGenerate(this.this$0); + public final TrackNetworkMetadataReceiver invoke(Void r1) { + return new TrackNetworkActionUserLogout(); } } diff --git a/app/src/main/java/com/discord/stores/StoreAuthentication$logout$2.java b/app/src/main/java/com/discord/stores/StoreAuthentication$logout$2.java index 4e19204c39..514207e2a7 100644 --- a/app/src/main/java/com/discord/stores/StoreAuthentication$logout$2.java +++ b/app/src/main/java/com/discord/stores/StoreAuthentication$logout$2.java @@ -1,28 +1,16 @@ package com.discord.stores; -import d0.z.d.o; -import kotlin.Unit; -import kotlin.jvm.functions.Function1; +import j0.k.b; +import rx.Observable; /* compiled from: StoreAuthentication.kt */ -public final class StoreAuthentication$logout$2 extends o implements Function1 { +public final class StoreAuthentication$logout$2 implements b> { public final /* synthetic */ StoreAuthentication this$0; - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public StoreAuthentication$logout$2(StoreAuthentication storeAuthentication) { - super(1); this.this$0 = storeAuthentication; } - /* 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] */ - @Override // kotlin.jvm.functions.Function1 - public /* bridge */ /* synthetic */ Unit invoke(String str) { - invoke(str); - return Unit.a; - } - - public final void invoke(String str) { - StoreStream.Companion.getNux().clearNux(); - this.this$0.setAuthed(null); + public final Observable call(Void r1) { + return StoreAuthentication.access$getFingerprintSnapshotOrGenerate(this.this$0); } } diff --git a/app/src/main/java/com/discord/stores/StoreAuthentication$logout$3.java b/app/src/main/java/com/discord/stores/StoreAuthentication$logout$3.java index 511ff762d9..e30ffc9025 100644 --- a/app/src/main/java/com/discord/stores/StoreAuthentication$logout$3.java +++ b/app/src/main/java/com/discord/stores/StoreAuthentication$logout$3.java @@ -1,12 +1,10 @@ package com.discord.stores; -import com.discord.utilities.error.Error; -import d0.z.d.m; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: StoreAuthentication.kt */ -public final class StoreAuthentication$logout$3 extends o implements Function1 { +public final class StoreAuthentication$logout$3 extends o implements Function1 { public final /* synthetic */ StoreAuthentication this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ @@ -18,13 +16,13 @@ public final class StoreAuthentication$logout$3 extends o implements Function1 { + public final /* synthetic */ StoreAuthentication this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public StoreAuthentication$logout$4(StoreAuthentication storeAuthentication) { + super(1); + this.this$0 = storeAuthentication; + } + + /* 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] */ + @Override // kotlin.jvm.functions.Function1 + public /* bridge */ /* synthetic */ Unit invoke(Error error) { + invoke(error); + return Unit.a; + } + + public final void invoke(Error error) { + m.checkNotNullParameter(error, "it"); + this.this$0.setAuthed(null); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreAuthentication.java b/app/src/main/java/com/discord/stores/StoreAuthentication.java index af3a1b6ff3..a7c869d52a 100644 --- a/app/src/main/java/com/discord/stores/StoreAuthentication.java +++ b/app/src/main/java/com/discord/stores/StoreAuthentication.java @@ -258,7 +258,7 @@ public final class StoreAuthentication extends Store { public final Observable forgotPassword(String str, String str2) { m.checkNotNullParameter(str, "login"); - return ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().forgotPassword(new RestAPIParams.ForgotPassword(str, str2)), false, 1, null); + return ObservableExtensionsKt.restSubscribeOn$default(RestCallStateKt.logNetworkAction(RestAPI.Companion.getApi().forgotPassword(new RestAPIParams.ForgotPassword(str, str2)), StoreAuthentication$forgotPassword$1.INSTANCE), false, 1, null); } public final Observable getAgeGateError() { @@ -387,9 +387,9 @@ public final class StoreAuthentication extends Store { public final void logout() { PublishSubject publishSubject = this.userInitiatedAuthEventSubject; publishSubject.j.onNext(Boolean.FALSE); - Observable z2 = ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().logout(new RestAPIParams.UserDevices(StoreStream.Companion.getNotifications().getPushToken())), false, 1, null).z(new StoreAuthentication$logout$1(this)); + Observable z2 = ObservableExtensionsKt.restSubscribeOn$default(RestCallStateKt.logNetworkAction(RestAPI.Companion.getApi().logout(new RestAPIParams.UserDevices(StoreStream.Companion.getNotifications().getPushToken())), StoreAuthentication$logout$1.INSTANCE), false, 1, null).z(new StoreAuthentication$logout$2(this)); m.checkNotNullExpressionValue(z2, "RestAPI\n .api\n …intSnapshotOrGenerate() }"); - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(z2, 0, false, 3, null), (Context) null, "logout", (Function1) null, new StoreAuthentication$logout$2(this), new StoreAuthentication$logout$3(this), (Function0) null, (Function0) null, 101, (Object) null); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.takeSingleUntilTimeout$default(z2, 0, false, 3, null), (Context) null, "logout", (Function1) null, new StoreAuthentication$logout$3(this), new StoreAuthentication$logout$4(this), (Function0) null, (Function0) null, 101, (Object) null); } public final Observable observeIsAuthed$app_productionCanaryRelease() { diff --git a/app/src/main/java/com/discord/stores/StoreContactSync$backgroundUploadContacts$1.java b/app/src/main/java/com/discord/stores/StoreContactSync$backgroundUploadContacts$1.java new file mode 100644 index 0000000000..fc6052aa88 --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreContactSync$backgroundUploadContacts$1.java @@ -0,0 +1,19 @@ +package com.discord.stores; + +import com.discord.analytics.generated.events.network_action.TrackNetworkActionUserContactsSync; +import com.discord.analytics.generated.traits.TrackNetworkMetadataReceiver; +import com.discord.api.friendsuggestions.BulkFriendSuggestions; +import d0.z.d.o; +import kotlin.jvm.functions.Function1; +/* compiled from: StoreContactSync.kt */ +public final class StoreContactSync$backgroundUploadContacts$1 extends o implements Function1 { + public static final StoreContactSync$backgroundUploadContacts$1 INSTANCE = new StoreContactSync$backgroundUploadContacts$1(); + + public StoreContactSync$backgroundUploadContacts$1() { + super(1); + } + + public final TrackNetworkMetadataReceiver invoke(BulkFriendSuggestions bulkFriendSuggestions) { + return new TrackNetworkActionUserContactsSync(); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreContactSync.java b/app/src/main/java/com/discord/stores/StoreContactSync.java index cfff230837..84c977c265 100644 --- a/app/src/main/java/com/discord/stores/StoreContactSync.java +++ b/app/src/main/java/com/discord/stores/StoreContactSync.java @@ -7,6 +7,7 @@ import com.discord.models.experiments.domain.Experiment; import com.discord.models.user.MeUser; import com.discord.restapi.RestAPIParams; import com.discord.stores.StoreNotices; +import com.discord.stores.utilities.RestCallStateKt; import com.discord.utilities.contacts.ContactsFetcher; import com.discord.utilities.persister.Persister; import com.discord.utilities.rest.RestAPI; @@ -69,7 +70,7 @@ public final class StoreContactSync extends StoreV2 { for (String str : fetchContacts) { arrayList.add(new RestAPIParams.ContactEntry(str, str, g0.mapOf(new Pair("number", str)))); } - this.restAPI.uploadContacts(new RestAPIParams.UploadContacts(arrayList, true, AllowedInSuggestionsType.ANYONE_WITH_CONTACT_INFO)); + RestCallStateKt.logNetworkAction(this.restAPI.uploadContacts(new RestAPIParams.UploadContacts(arrayList, true, AllowedInSuggestionsType.ANYONE_WITH_CONTACT_INFO)), StoreContactSync$backgroundUploadContacts$1.INSTANCE); setContactSyncUploadTimestamp(this.clock.currentTimeMillis()); } diff --git a/app/src/main/java/com/discord/stores/StoreInstantInvites$fetchInviteIfNotLoaded$1.java b/app/src/main/java/com/discord/stores/StoreInstantInvites$fetchInviteIfNotLoaded$1.java index 52785e3a99..07235c42b9 100644 --- a/app/src/main/java/com/discord/stores/StoreInstantInvites$fetchInviteIfNotLoaded$1.java +++ b/app/src/main/java/com/discord/stores/StoreInstantInvites$fetchInviteIfNotLoaded$1.java @@ -1,9 +1,16 @@ package com.discord.stores; import android.content.Context; +import com.discord.analytics.generated.events.network_action.TrackNetworkActionInviteResolve; +import com.discord.analytics.generated.traits.TrackNetworkMetadataReceiver; +import com.discord.api.channel.Channel; +import com.discord.api.guild.Guild; import com.discord.api.guildscheduledevent.GuildScheduledEvent; +import com.discord.api.user.User; import com.discord.models.domain.ModelInvite; +import com.discord.restapi.RestAPIAbortCodes; import com.discord.stores.StoreInstantInvites; +import com.discord.stores.utilities.RestCallStateKt; import com.discord.utilities.analytics.AnalyticsTracker; import com.discord.utilities.error.Error; import com.discord.utilities.rx.ObservableExtensionsKt; @@ -17,22 +24,44 @@ public final class StoreInstantInvites$fetchInviteIfNotLoaded$1 extends o implem public final /* synthetic */ Long $eventId; public final /* synthetic */ String $inviteCode; public final /* synthetic */ String $inviteKey; + public final /* synthetic */ Boolean $inviteResolved; public final /* synthetic */ String $location; public final /* synthetic */ StoreInstantInvites this$0; /* compiled from: StoreInstantInvites.kt */ /* renamed from: com.discord.stores.StoreInstantInvites$fetchInviteIfNotLoaded$1$1 reason: invalid class name */ - public static final class AnonymousClass1 extends o implements Function1 { + public static final class AnonymousClass1 extends o implements Function1 { + public final /* synthetic */ StoreInstantInvites$fetchInviteIfNotLoaded$1 this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public AnonymousClass1(StoreInstantInvites$fetchInviteIfNotLoaded$1 storeInstantInvites$fetchInviteIfNotLoaded$1) { + super(1); + this.this$0 = storeInstantInvites$fetchInviteIfNotLoaded$1; + } + + public final TrackNetworkMetadataReceiver invoke(ModelInvite modelInvite) { + User inviter; + Channel channel; + Channel channel2; + Guild guild; + StoreInstantInvites$fetchInviteIfNotLoaded$1 storeInstantInvites$fetchInviteIfNotLoaded$1 = this.this$0; + return new TrackNetworkActionInviteResolve(storeInstantInvites$fetchInviteIfNotLoaded$1.$inviteResolved, storeInstantInvites$fetchInviteIfNotLoaded$1.$inviteCode, Boolean.valueOf(StoreStream.Companion.getAuthentication().isAuthed()), (modelInvite == null || (guild = modelInvite.getGuild()) == null) ? null : Long.valueOf(guild.p()), (modelInvite == null || (channel2 = modelInvite.getChannel()) == null) ? null : Long.valueOf(channel2.h()), (modelInvite == null || (channel = modelInvite.getChannel()) == null) ? null : Long.valueOf((long) channel.A()), (modelInvite == null || (inviter = modelInvite.getInviter()) == null) ? null : Long.valueOf(inviter.i()), modelInvite != null ? Long.valueOf((long) modelInvite.getApproximateMemberCount()) : null, modelInvite != null ? Long.valueOf((long) modelInvite.getApproximatePresenceCount()) : null, modelInvite != null ? modelInvite.getInviteType() : null, null, modelInvite != null ? Boolean.valueOf(m.areEqual(modelInvite.code, String.valueOf((int) RestAPIAbortCodes.USER_BANNED))) : null, null); + } + } + + /* compiled from: StoreInstantInvites.kt */ + /* renamed from: com.discord.stores.StoreInstantInvites$fetchInviteIfNotLoaded$1$2 reason: invalid class name */ + public static final class AnonymousClass2 extends o implements Function1 { public final /* synthetic */ StoreInstantInvites$fetchInviteIfNotLoaded$1 this$0; /* compiled from: StoreInstantInvites.kt */ - /* renamed from: com.discord.stores.StoreInstantInvites$fetchInviteIfNotLoaded$1$1$1 reason: invalid class name */ + /* renamed from: com.discord.stores.StoreInstantInvites$fetchInviteIfNotLoaded$1$2$1 reason: invalid class name */ public static final class AnonymousClass1 extends o implements Function0 { public final /* synthetic */ ModelInvite $it; - public final /* synthetic */ AnonymousClass1 this$0; + public final /* synthetic */ AnonymousClass2 this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public AnonymousClass1(AnonymousClass1 r1, ModelInvite modelInvite) { + public AnonymousClass1(AnonymousClass2 r1, ModelInvite modelInvite) { super(0); this.this$0 = r1; this.$it = modelInvite; @@ -56,7 +85,7 @@ public final class StoreInstantInvites$fetchInviteIfNotLoaded$1 extends o implem } /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public AnonymousClass1(StoreInstantInvites$fetchInviteIfNotLoaded$1 storeInstantInvites$fetchInviteIfNotLoaded$1) { + public AnonymousClass2(StoreInstantInvites$fetchInviteIfNotLoaded$1 storeInstantInvites$fetchInviteIfNotLoaded$1) { super(1); this.this$0 = storeInstantInvites$fetchInviteIfNotLoaded$1; } @@ -80,17 +109,17 @@ public final class StoreInstantInvites$fetchInviteIfNotLoaded$1 extends o implem } /* compiled from: StoreInstantInvites.kt */ - /* renamed from: com.discord.stores.StoreInstantInvites$fetchInviteIfNotLoaded$1$2 reason: invalid class name */ - public static final class AnonymousClass2 extends o implements Function1 { + /* renamed from: com.discord.stores.StoreInstantInvites$fetchInviteIfNotLoaded$1$3 reason: invalid class name */ + public static final class AnonymousClass3 extends o implements Function1 { public final /* synthetic */ StoreInstantInvites$fetchInviteIfNotLoaded$1 this$0; /* compiled from: StoreInstantInvites.kt */ - /* renamed from: com.discord.stores.StoreInstantInvites$fetchInviteIfNotLoaded$1$2$1 reason: invalid class name */ + /* renamed from: com.discord.stores.StoreInstantInvites$fetchInviteIfNotLoaded$1$3$1 reason: invalid class name */ public static final class AnonymousClass1 extends o implements Function0 { - public final /* synthetic */ AnonymousClass2 this$0; + public final /* synthetic */ AnonymousClass3 this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public AnonymousClass1(AnonymousClass2 r1) { + public AnonymousClass1(AnonymousClass3 r1) { super(0); this.this$0 = r1; } @@ -107,12 +136,12 @@ public final class StoreInstantInvites$fetchInviteIfNotLoaded$1 extends o implem } /* compiled from: StoreInstantInvites.kt */ - /* renamed from: com.discord.stores.StoreInstantInvites$fetchInviteIfNotLoaded$1$2$2 reason: invalid class name */ + /* renamed from: com.discord.stores.StoreInstantInvites$fetchInviteIfNotLoaded$1$3$2 reason: invalid class name */ public static final class AnonymousClass2 extends o implements Function0 { - public final /* synthetic */ AnonymousClass2 this$0; + public final /* synthetic */ AnonymousClass3 this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public AnonymousClass2(AnonymousClass2 r1) { + public AnonymousClass2(AnonymousClass3 r1) { super(0); this.this$0 = r1; } @@ -129,7 +158,7 @@ public final class StoreInstantInvites$fetchInviteIfNotLoaded$1 extends o implem } /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public AnonymousClass2(StoreInstantInvites$fetchInviteIfNotLoaded$1 storeInstantInvites$fetchInviteIfNotLoaded$1) { + public AnonymousClass3(StoreInstantInvites$fetchInviteIfNotLoaded$1 storeInstantInvites$fetchInviteIfNotLoaded$1) { super(1); this.this$0 = storeInstantInvites$fetchInviteIfNotLoaded$1; } @@ -166,12 +195,13 @@ public final class StoreInstantInvites$fetchInviteIfNotLoaded$1 extends o implem } /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public StoreInstantInvites$fetchInviteIfNotLoaded$1(StoreInstantInvites storeInstantInvites, String str, String str2, Long l, String str3) { + public StoreInstantInvites$fetchInviteIfNotLoaded$1(StoreInstantInvites storeInstantInvites, String str, String str2, Long l, Boolean bool, String str3) { super(0); this.this$0 = storeInstantInvites; this.$inviteKey = str; this.$inviteCode = str2; this.$eventId = l; + this.$inviteResolved = bool; this.$location = str3; } @@ -184,7 +214,7 @@ public final class StoreInstantInvites$fetchInviteIfNotLoaded$1 extends o implem String str = this.$inviteKey; m.checkNotNullExpressionValue(str, "inviteKey"); StoreInstantInvites.access$setChatInvites(storeInstantInvites, str, StoreInstantInvites.InviteState.Loading.INSTANCE); - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(StoreInstantInvites.access$getRestAPI$p(this.this$0).getInviteCode(this.$inviteCode, true, this.$eventId), false, 1, null), this.this$0.getClass(), (Context) null, (Function1) null, new AnonymousClass2(this), (Function0) null, (Function0) null, new AnonymousClass1(this), 54, (Object) null); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(RestCallStateKt.logNetworkAction(StoreInstantInvites.access$getRestAPI$p(this.this$0).getInviteCode(this.$inviteCode, true, this.$eventId), new AnonymousClass1(this)), false, 1, null), this.this$0.getClass(), (Context) null, (Function1) null, new AnonymousClass3(this), (Function0) null, (Function0) null, new AnonymousClass2(this), 54, (Object) null); } } } diff --git a/app/src/main/java/com/discord/stores/StoreInstantInvites$observeInvites$1.java b/app/src/main/java/com/discord/stores/StoreInstantInvites$observeInvites$1.java deleted file mode 100644 index 7b7fbc3a73..0000000000 --- a/app/src/main/java/com/discord/stores/StoreInstantInvites$observeInvites$1.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.discord.stores; - -import com.discord.models.domain.ModelInvite; -import d0.z.d.o; -import java.util.Map; -import kotlin.jvm.functions.Function0; -/* compiled from: StoreInstantInvites.kt */ -public final class StoreInstantInvites$observeInvites$1 extends o implements Function0> { - public final /* synthetic */ long $guildId; - public final /* synthetic */ StoreInstantInvites this$0; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public StoreInstantInvites$observeInvites$1(StoreInstantInvites storeInstantInvites, long j) { - super(0); - this.this$0 = storeInstantInvites; - this.$guildId = j; - } - - /* Return type fixed from 'java.util.Map' to match base method */ - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public final Map mo1invoke() { - return this.this$0.getInvites(this.$guildId); - } -} diff --git a/app/src/main/java/com/discord/stores/StoreInstantInvites.java b/app/src/main/java/com/discord/stores/StoreInstantInvites.java index 8d1cc4c156..f6b5f4aca5 100644 --- a/app/src/main/java/com/discord/stores/StoreInstantInvites.java +++ b/app/src/main/java/com/discord/stores/StoreInstantInvites.java @@ -180,14 +180,17 @@ public final class StoreInstantInvites extends StoreV2 { storeInstantInvites.setChatInvites(str, inviteState); } - public static /* synthetic */ void fetchInviteIfNotLoaded$default(StoreInstantInvites storeInstantInvites, String str, Long l, String str2, int i, Object obj) { + public static /* synthetic */ void fetchInviteIfNotLoaded$default(StoreInstantInvites storeInstantInvites, String str, Long l, String str2, Boolean bool, int i, Object obj) { if ((i & 2) != 0) { l = null; } if ((i & 4) != 0) { str2 = null; } - storeInstantInvites.fetchInviteIfNotLoaded(str, l, str2); + if ((i & 8) != 0) { + bool = null; + } + storeInstantInvites.fetchInviteIfNotLoaded(str, l, str2, bool); } /* JADX DEBUG: Type inference failed for r0v0. Raw type applied. Possible types: java.util.Map>, java.util.Map> */ @@ -234,9 +237,9 @@ public final class StoreInstantInvites extends StoreV2 { ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.getGuildInvites(j), false, 1, null), StoreInstantInvites.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreInstantInvites$fetchGuildInvites$1(this), 62, (Object) null); } - public final void fetchInviteIfNotLoaded(String str, Long l, String str2) { + public final void fetchInviteIfNotLoaded(String str, Long l, String str2, Boolean bool) { m.checkNotNullParameter(str, "inviteCode"); - this.dispatcher.schedule(new StoreInstantInvites$fetchInviteIfNotLoaded$1(this, ModelInvite.getInviteStoreKey(str, l), str, l, str2)); + this.dispatcher.schedule(new StoreInstantInvites$fetchInviteIfNotLoaded$1(this, ModelInvite.getInviteStoreKey(str, l), str, l, bool, str2)); } public final Map getInvites(long j) { @@ -255,12 +258,6 @@ public final class StoreInstantInvites extends StoreV2 { return r; } - public final Observable> observeInvites(long j) { - Observable> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreInstantInvites$observeInvites$1(this, j), 14, null).r(); - m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()"); - return r; - } - public final Observable> observeKnownInvites() { Observable> r = ObservationDeck.connectRx$default(this.observationDeck, new ObservationDeck.UpdateSource[]{this}, false, null, null, new StoreInstantInvites$observeKnownInvites$1(this), 14, null).r(); m.checkNotNullExpressionValue(r, "observationDeck.connectR… }.distinctUntilChanged()"); diff --git a/app/src/main/java/com/discord/stores/StoreRtcConnection.java b/app/src/main/java/com/discord/stores/StoreRtcConnection.java index e57352521a..dea150e59c 100644 --- a/app/src/main/java/com/discord/stores/StoreRtcConnection.java +++ b/app/src/main/java/com/discord/stores/StoreRtcConnection.java @@ -3,7 +3,6 @@ package com.discord.stores; import a0.a.a.b; import android.content.Context; import android.util.Log; -import c.a.q.o0.e; import c.a.q.w; import c.d.b.a.a; import co.discord.media_engine.VideoInputDeviceDescription; @@ -108,25 +107,23 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr public void onConnecting() { } - @Override // com.discord.stores.StoreRtcConnection.Listener, c.a.q.o0.e.f + @Override // com.discord.stores.StoreRtcConnection.Listener public void onFirstFrameReceived(long j) { } - @Override // com.discord.stores.StoreRtcConnection.Listener, c.a.q.o0.e.f + @Override // com.discord.stores.StoreRtcConnection.Listener public void onFirstFrameSent() { } } /* compiled from: StoreRtcConnection.kt */ - public interface Listener extends e.f { + public interface Listener { void onConnected(); void onConnecting(); - @Override // c.a.q.o0.e.f /* synthetic */ void onFirstFrameReceived(long j); - @Override // c.a.q.o0.e.f /* synthetic */ void onFirstFrameSent(); } @@ -835,12 +832,12 @@ public final class StoreRtcConnection extends RtcConnection.b implements DebugPr this.stream.getVoiceChannelSelected$app_productionCanaryRelease().clear(); } - @Override // com.discord.rtcconnection.RtcConnection.b, c.a.q.o0.e.f + @Override // com.discord.rtcconnection.RtcConnection.b public void onFirstFrameReceived(long j) { this.listenerSubject.notify(new StoreRtcConnection$onFirstFrameReceived$1(j)); } - @Override // com.discord.rtcconnection.RtcConnection.b, c.a.q.o0.e.f + @Override // com.discord.rtcconnection.RtcConnection.b public void onFirstFrameSent() { this.listenerSubject.notify(StoreRtcConnection$onFirstFrameSent$1.INSTANCE); } diff --git a/app/src/main/java/com/discord/stores/StoreStreamRtcConnection.java b/app/src/main/java/com/discord/stores/StoreStreamRtcConnection.java index 8b12ab1368..bf9d729f66 100644 --- a/app/src/main/java/com/discord/stores/StoreStreamRtcConnection.java +++ b/app/src/main/java/com/discord/stores/StoreStreamRtcConnection.java @@ -1,7 +1,6 @@ package com.discord.stores; import c.a.q.j; -import c.a.q.o0.e; import c.a.q.w; import c.d.b.a.a; import com.discord.app.App; @@ -78,25 +77,23 @@ public final class StoreStreamRtcConnection extends StoreV2 implements DebugPrin public void onConnecting() { } - @Override // com.discord.stores.StoreStreamRtcConnection.Listener, c.a.q.o0.e.f + @Override // com.discord.stores.StoreStreamRtcConnection.Listener public void onFirstFrameReceived(long j) { } - @Override // com.discord.stores.StoreStreamRtcConnection.Listener, c.a.q.o0.e.f + @Override // com.discord.stores.StoreStreamRtcConnection.Listener public void onFirstFrameSent() { } } /* compiled from: StoreStreamRtcConnection.kt */ - public interface Listener extends e.f { + public interface Listener { void onConnected(); void onConnecting(); - @Override // c.a.q.o0.e.f /* synthetic */ void onFirstFrameReceived(long j); - @Override // c.a.q.o0.e.f /* synthetic */ void onFirstFrameSent(); } @@ -130,12 +127,12 @@ public final class StoreStreamRtcConnection extends StoreV2 implements DebugPrin } } - @Override // com.discord.rtcconnection.RtcConnection.b, c.a.q.o0.e.f + @Override // com.discord.rtcconnection.RtcConnection.b public void onFirstFrameReceived(long j) { StoreStreamRtcConnection.access$getListenerSubject$p(StoreStreamRtcConnection.this).notify(new StoreStreamRtcConnection$RtcConnectionListener$onFirstFrameReceived$1(j)); } - @Override // com.discord.rtcconnection.RtcConnection.b, c.a.q.o0.e.f + @Override // com.discord.rtcconnection.RtcConnection.b public void onFirstFrameSent() { StoreStreamRtcConnection.access$getListenerSubject$p(StoreStreamRtcConnection.this).notify(StoreStreamRtcConnection$RtcConnectionListener$onFirstFrameSent$1.INSTANCE); } diff --git a/app/src/main/java/com/discord/utilities/collections/ListenerCollectionSubject$notifyAsync$1.java b/app/src/main/java/com/discord/utilities/collections/ListenerCollectionSubject$notifyAsync$1.java deleted file mode 100644 index 9fdd3758d5..0000000000 --- a/app/src/main/java/com/discord/utilities/collections/ListenerCollectionSubject$notifyAsync$1.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.discord.utilities.collections; - -import kotlin.jvm.functions.Function1; -/* compiled from: ListenerCollection.kt */ -public final class ListenerCollectionSubject$notifyAsync$1 implements Runnable { - public final /* synthetic */ Function1 $action; - public final /* synthetic */ ListenerCollectionSubject this$0; - - public ListenerCollectionSubject$notifyAsync$1(ListenerCollectionSubject listenerCollectionSubject, Function1 function1) { - this.this$0 = listenerCollectionSubject; - this.$action = function1; - } - - @Override // java.lang.Runnable - public final void run() { - this.this$0.notify(this.$action); - } -} diff --git a/app/src/main/java/com/discord/utilities/collections/ListenerCollectionSubject$threadPool$2.java b/app/src/main/java/com/discord/utilities/collections/ListenerCollectionSubject$threadPool$2.java deleted file mode 100644 index 7db6eb24c1..0000000000 --- a/app/src/main/java/com/discord/utilities/collections/ListenerCollectionSubject$threadPool$2.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.discord.utilities.collections; - -import com.discord.utilities.threading.PriorityThreadFactory; -import d0.z.d.o; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import kotlin.jvm.functions.Function0; -/* compiled from: ListenerCollection.kt */ -public final class ListenerCollectionSubject$threadPool$2 extends o implements Function0 { - public static final ListenerCollectionSubject$threadPool$2 INSTANCE = new ListenerCollectionSubject$threadPool$2(); - - public ListenerCollectionSubject$threadPool$2() { - super(0); - } - - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public final ExecutorService mo1invoke() { - return Executors.newCachedThreadPool(new PriorityThreadFactory(2)); - } -} diff --git a/app/src/main/java/com/discord/utilities/collections/ListenerCollectionSubject.java b/app/src/main/java/com/discord/utilities/collections/ListenerCollectionSubject.java index 23cfac5b6d..8dae7b519f 100644 --- a/app/src/main/java/com/discord/utilities/collections/ListenerCollectionSubject.java +++ b/app/src/main/java/com/discord/utilities/collections/ListenerCollectionSubject.java @@ -1,30 +1,19 @@ package com.discord.utilities.collections; import android.util.Log; -import androidx.annotation.AnyThread; -import d0.g; import d0.z.d.m; import java.util.concurrent.CopyOnWriteArraySet; -import java.util.concurrent.ExecutorService; -import kotlin.Lazy; import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: ListenerCollection.kt */ public final class ListenerCollectionSubject implements ListenerCollection { private final CopyOnWriteArraySet listeners = new CopyOnWriteArraySet<>(); - private final Lazy threadPool$delegate = g.lazy(ListenerCollectionSubject$threadPool$2.INSTANCE); - - private final ExecutorService getThreadPool() { - return (ExecutorService) this.threadPool$delegate.getValue(); - } @Override // com.discord.utilities.collections.ListenerCollection - @AnyThread public void add(T t) { this.listeners.add(t); } - @AnyThread public final void clear() { this.listeners.clear(); } @@ -40,13 +29,7 @@ public final class ListenerCollectionSubject implements ListenerCollection } } - public final void notifyAsync(Function1 function1) { - m.checkNotNullParameter(function1, "action"); - getThreadPool().execute(new ListenerCollectionSubject$notifyAsync$1(this, function1)); - } - @Override // com.discord.utilities.collections.ListenerCollection - @AnyThread public boolean remove(T t) { return this.listeners.remove(t); } diff --git a/app/src/main/java/com/discord/utilities/fcm/NotificationData.java b/app/src/main/java/com/discord/utilities/fcm/NotificationData.java index 0dcf877b4b..2cb11ff88f 100644 --- a/app/src/main/java/com/discord/utilities/fcm/NotificationData.java +++ b/app/src/main/java/com/discord/utilities/fcm/NotificationData.java @@ -290,6 +290,7 @@ public final class NotificationData { public static final /* synthetic */ int[] $EnumSwitchMapping$2; public static final /* synthetic */ int[] $EnumSwitchMapping$3; public static final /* synthetic */ int[] $EnumSwitchMapping$4; + public static final /* synthetic */ int[] $EnumSwitchMapping$5; static { GuildScheduledEventEntityType.values(); @@ -297,22 +298,40 @@ public final class NotificationData { $EnumSwitchMapping$0 = iArr; GuildScheduledEventEntityType guildScheduledEventEntityType = GuildScheduledEventEntityType.STAGE_INSTANCE; iArr[guildScheduledEventEntityType.ordinal()] = 1; + GuildScheduledEventEntityType guildScheduledEventEntityType2 = GuildScheduledEventEntityType.VOICE; + iArr[guildScheduledEventEntityType2.ordinal()] = 2; + GuildScheduledEventEntityType guildScheduledEventEntityType3 = GuildScheduledEventEntityType.EXTERNAL; + iArr[guildScheduledEventEntityType3.ordinal()] = 3; GuildScheduledEventEntityType.values(); int[] iArr2 = new int[5]; $EnumSwitchMapping$1 = iArr2; iArr2[guildScheduledEventEntityType.ordinal()] = 1; + iArr2[guildScheduledEventEntityType2.ordinal()] = 2; + iArr2[guildScheduledEventEntityType3.ordinal()] = 3; GuildScheduledEventEntityType.values(); int[] iArr3 = new int[5]; $EnumSwitchMapping$2 = iArr3; iArr3[guildScheduledEventEntityType.ordinal()] = 1; + iArr3[guildScheduledEventEntityType2.ordinal()] = 2; + iArr3[guildScheduledEventEntityType3.ordinal()] = 3; GuildScheduledEventEntityType.values(); int[] iArr4 = new int[5]; $EnumSwitchMapping$3 = iArr4; iArr4[guildScheduledEventEntityType.ordinal()] = 1; + iArr4[guildScheduledEventEntityType2.ordinal()] = 2; + iArr4[guildScheduledEventEntityType3.ordinal()] = 3; GuildScheduledEventEntityType.values(); int[] iArr5 = new int[5]; $EnumSwitchMapping$4 = iArr5; iArr5[guildScheduledEventEntityType.ordinal()] = 1; + iArr5[guildScheduledEventEntityType2.ordinal()] = 2; + iArr5[guildScheduledEventEntityType3.ordinal()] = 3; + GuildScheduledEventEntityType.values(); + int[] iArr6 = new int[5]; + $EnumSwitchMapping$5 = iArr6; + iArr6[guildScheduledEventEntityType.ordinal()] = 1; + iArr6[guildScheduledEventEntityType2.ordinal()] = 2; + iArr6[guildScheduledEventEntityType3.ordinal()] = 3; } } @@ -435,20 +454,20 @@ public final class NotificationData { return putExtra; } - /* JADX WARNING: Code restructure failed: missing block: B:11:0x0042, code lost: - if (r0.equals(com.discord.utilities.fcm.NotificationData.TYPE_RELATIONSHIP_ADD) != false) goto L_0x0044; + /* JADX WARNING: Code restructure failed: missing block: B:11:0x0043, code lost: + if (r0.equals(com.discord.utilities.fcm.NotificationData.TYPE_RELATIONSHIP_ADD) != false) goto L_0x0045; */ - /* JADX WARNING: Code restructure failed: missing block: B:13:0x004a, code lost: - if (r8.channel.A() == 1) goto L_0x005c; + /* JADX WARNING: Code restructure failed: missing block: B:13:0x004b, code lost: + if (r8.channel.A() == 1) goto L_0x005d; */ - /* JADX WARNING: Code restructure failed: missing block: B:28:?, code lost: + /* JADX WARNING: Code restructure failed: missing block: B:33:?, code lost: return com.discord.utilities.intent.IntentUtils.RouteBuilders.selectChannel$default(r8.channel.h(), r8.guildId, null, 4, null); */ - /* JADX WARNING: Code restructure failed: missing block: B:29:?, code lost: + /* JADX WARNING: Code restructure failed: missing block: B:34:?, code lost: return com.discord.utilities.intent.IntentUtils.RouteBuilders.selectChannel$default(r8.channel.h(), 0, null, 4, null); */ /* JADX WARNING: Code restructure failed: missing block: B:3:0x0012, code lost: - if (r0.equals(com.discord.utilities.fcm.NotificationData.TYPE_MESSAGE_CREATE) != false) goto L_0x0044; + if (r0.equals(com.discord.utilities.fcm.NotificationData.TYPE_MESSAGE_CREATE) != false) goto L_0x0045; */ private final Intent getContentIntentInternal() { String str = this.type; @@ -456,7 +475,16 @@ public final class NotificationData { case -1489275252: if (str.equals(TYPE_GUILD_SCHEDULED_EVENT_UPDATE)) { GuildScheduledEventEntityType guildScheduledEventEntityType = this.guildScheduledEventEntityType; - return (guildScheduledEventEntityType != null && guildScheduledEventEntityType.ordinal() == 1) ? IntentUtils.RouteBuilders.INSTANCE.connectVoice(this.channel.h()) : new Intent("android.intent.action.VIEW", IntentUtils.RouteBuilders.Uris.INSTANCE.getApp()); + if (guildScheduledEventEntityType != null) { + int ordinal = guildScheduledEventEntityType.ordinal(); + if (ordinal == 1 || ordinal == 2) { + return IntentUtils.RouteBuilders.INSTANCE.connectVoice(this.channel.h()); + } + if (ordinal == 3) { + return IntentUtils.RouteBuilders.selectGuild(this.guildId); + } + } + return new Intent("android.intent.action.VIEW", IntentUtils.RouteBuilders.Uris.INSTANCE.getApp()); } return IntentUtils.RouteBuilders.selectChannel$default(this.channel.h(), this.guildId, null, 4, null); case -1327124998: @@ -503,6 +531,7 @@ public final class NotificationData { } public final boolean canDisplayInApp() { + int ordinal; if (m.areEqual(this.type, TYPE_STAGE_INSTANCE_CREATE)) { return true; } @@ -510,7 +539,7 @@ public final class NotificationData { return this.channel.h() == -1; } GuildScheduledEventEntityType guildScheduledEventEntityType = this.guildScheduledEventEntityType; - return guildScheduledEventEntityType != null && guildScheduledEventEntityType.ordinal() == 1; + return guildScheduledEventEntityType != null && ((ordinal = guildScheduledEventEntityType.ordinal()) == 1 || ordinal == 2 || ordinal == 3); } public final NotificationData copyForDirectReply(Message message) { @@ -579,7 +608,11 @@ public final class NotificationData { String str = this.type; switch (str.hashCode()) { case -1489275252: - return (!str.equals(TYPE_GUILD_SCHEDULED_EVENT_UPDATE) || (guildScheduledEventEntityType = this.guildScheduledEventEntityType) == null || guildScheduledEventEntityType.ordinal() != 1) ? "" : b.h(context, R.string.guild_scheduled_event_stage_start_body, new Object[]{this.stageInstanceTopic, this.userUsername}, null, 4); + if (!str.equals(TYPE_GUILD_SCHEDULED_EVENT_UPDATE) || (guildScheduledEventEntityType = this.guildScheduledEventEntityType) == null) { + return ""; + } + int ordinal = guildScheduledEventEntityType.ordinal(); + return (ordinal == 1 || ordinal == 2) ? b.h(context, R.string.guild_scheduled_event_stage_start_body, new Object[]{this.stageInstanceTopic, this.userUsername}, null, 4) : ordinal != 3 ? "" : b.h(context, R.string.guild_scheduled_event_external_start_body, new Object[]{this.stageInstanceTopic}, null, 4); case -1327124998: if (!str.equals(TYPE_RELATIONSHIP_ADD)) { return ""; @@ -818,10 +851,17 @@ public final class NotificationData { String str = this.type; switch (str.hashCode()) { case -1489275252: - if (!str.equals(TYPE_GUILD_SCHEDULED_EVENT_UPDATE) || (guildScheduledEventEntityType = this.guildScheduledEventEntityType) == null || guildScheduledEventEntityType.ordinal() != 1) { + if (!str.equals(TYPE_GUILD_SCHEDULED_EVENT_UPDATE) || (guildScheduledEventEntityType = this.guildScheduledEventEntityType) == null) { return ""; } - return this.type + this.channel.h(); + int ordinal = guildScheduledEventEntityType.ordinal(); + if (ordinal == 1 || ordinal == 2) { + return this.type + this.channel.h(); + } else if (ordinal != 3) { + return ""; + } else { + return this.type + this.guildId; + } case -1327124998: if (!str.equals(TYPE_RELATIONSHIP_ADD)) { return ""; @@ -1088,7 +1128,11 @@ public final class NotificationData { String str2 = this.type; switch (str2.hashCode()) { case -1489275252: - return (!str2.equals(TYPE_GUILD_SCHEDULED_EVENT_UPDATE) || (guildScheduledEventEntityType = this.guildScheduledEventEntityType) == null || guildScheduledEventEntityType.ordinal() != 1) ? "" : b.h(context, R.string.guild_scheduled_event_stage_start_title, new Object[]{this.guildName}, null, 4); + if (!str2.equals(TYPE_GUILD_SCHEDULED_EVENT_UPDATE) || (guildScheduledEventEntityType = this.guildScheduledEventEntityType) == null) { + return ""; + } + int ordinal = guildScheduledEventEntityType.ordinal(); + return (ordinal == 1 || ordinal == 2 || ordinal == 3) ? b.h(context, R.string.guild_scheduled_event_stage_start_title, new Object[]{this.guildName}, null, 4) : ""; case -1327124998: if (!str2.equals(TYPE_RELATIONSHIP_ADD) || (str = this.userUsername) == null) { return ""; @@ -1143,10 +1187,15 @@ public final class NotificationData { } public final boolean isValid() { + GuildScheduledEventEntityType guildScheduledEventEntityType; String str = this.type; switch (str.hashCode()) { case -1489275252: - if (!str.equals(TYPE_GUILD_SCHEDULED_EVENT_UPDATE) || this.guildScheduledEventEntityType != GuildScheduledEventEntityType.STAGE_INSTANCE) { + if (!str.equals(TYPE_GUILD_SCHEDULED_EVENT_UPDATE) || (guildScheduledEventEntityType = this.guildScheduledEventEntityType) == null) { + return false; + } + int ordinal = guildScheduledEventEntityType.ordinal(); + if (ordinal != 1 && ordinal != 2 && ordinal != 3) { return false; } break; diff --git a/app/src/main/java/com/discord/utilities/intent/IntentUtils.java b/app/src/main/java/com/discord/utilities/intent/IntentUtils.java index 770b3f4155..2380d6f49d 100644 --- a/app/src/main/java/com/discord/utilities/intent/IntentUtils.java +++ b/app/src/main/java/com/discord/utilities/intent/IntentUtils.java @@ -106,6 +106,11 @@ public final class IntentUtils { return selectChannel(j, j2, l); } + public static final Intent selectGuild(long j) { + String valueOf = (j == 0 || j == -1) ? "@me" : Long.valueOf(j); + return new Intent("android.intent.action.VIEW", Uri.parse("discord://app/channels/" + valueOf)); + } + public static final Intent selectUserProfile(long j) { return new Intent("android.intent.action.VIEW", Uri.parse("discord://app/users/" + j)); } 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 aaf0add16a..cd47d19b44 100644 --- a/app/src/main/java/com/discord/utilities/rest/RestAPI.java +++ b/app/src/main/java/com/discord/utilities/rest/RestAPI.java @@ -717,14 +717,14 @@ public final class RestAPI implements RestAPIInterface { @Override // com.discord.restapi.RestAPIInterface @o("guilds") - public Observable createGuild(@i0.f0.a RestAPIParams.CreateGuild createGuild) { + public Observable> createGuild(@i0.f0.a RestAPIParams.CreateGuild createGuild) { m.checkNotNullParameter(createGuild, "body"); return this._api.createGuild(createGuild); } @Override // com.discord.restapi.RestAPIInterface @o("guilds/{guildId}/channels") - public Observable createGuildChannel(@s("guildId") long j, @i0.f0.a RestAPIParams.CreateGuildChannel createGuildChannel) { + public Observable> createGuildChannel(@s("guildId") long j, @i0.f0.a RestAPIParams.CreateGuildChannel createGuildChannel) { m.checkNotNullParameter(createGuildChannel, "body"); return this._api.createGuildChannel(j, createGuildChannel); } @@ -1020,7 +1020,7 @@ public final class RestAPI implements RestAPIInterface { @Override // com.discord.restapi.RestAPIInterface @o("auth/forgot") - public Observable forgotPassword(@i0.f0.a RestAPIParams.ForgotPassword forgotPassword) { + public Observable> forgotPassword(@i0.f0.a RestAPIParams.ForgotPassword forgotPassword) { m.checkNotNullParameter(forgotPassword, "body"); return this._api.forgotPassword(forgotPassword); } @@ -1342,7 +1342,7 @@ public final class RestAPI implements RestAPIInterface { @Override // com.discord.restapi.RestAPIInterface @f("invites/{code}") - public Observable getInviteCode(@s("code") String str, @t("with_counts") boolean z2, @t("guild_scheduled_event_id") Long l) { + public Observable> getInviteCode(@s("code") String str, @t("with_counts") boolean z2, @t("guild_scheduled_event_id") Long l) { m.checkNotNullParameter(str, ModelAuditLogEntry.CHANGE_KEY_CODE); return this._api.getInviteCode(str, z2, l); } @@ -1629,7 +1629,7 @@ public final class RestAPI implements RestAPIInterface { @Override // com.discord.restapi.RestAPIInterface @o("auth/logout") - public Observable logout(@i0.f0.a RestAPIParams.UserDevices userDevices) { + public Observable> logout(@i0.f0.a RestAPIParams.UserDevices userDevices) { m.checkNotNullParameter(userDevices, "body"); return this._api.logout(userDevices); } @@ -1671,7 +1671,7 @@ public final class RestAPI implements RestAPIInterface { @Override // com.discord.restapi.RestAPIInterface @o("phone-verifications/verify") - public Observable phoneVerificationsVerify(@i0.f0.a RestAPIParams.VerificationCode verificationCode) { + public Observable> phoneVerificationsVerify(@i0.f0.a RestAPIParams.VerificationCode verificationCode) { m.checkNotNullParameter(verificationCode, "body"); return this._api.phoneVerificationsVerify(verificationCode); } @@ -2295,7 +2295,7 @@ public final class RestAPI implements RestAPIInterface { @Override // com.discord.restapi.RestAPIInterface @p("users/@me/connections/contacts/@me/external-friend-list-entries") - public Observable uploadContacts(@i0.f0.a RestAPIParams.UploadContacts uploadContacts) { + public Observable> uploadContacts(@i0.f0.a RestAPIParams.UploadContacts uploadContacts) { m.checkNotNullParameter(uploadContacts, "uploadContacts"); return this._api.uploadContacts(uploadContacts); } diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLandingViewModel.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLandingViewModel.java index 8fb99bbfea..e60dc0216d 100644 --- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthLandingViewModel.java +++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthLandingViewModel.java @@ -544,7 +544,7 @@ public final class WidgetAuthLandingViewModel extends AppViewModel { StoreInviteSettings.InviteCode inviteCode = storeState.getInviteCode(); StoreState storeState2 = this.mostRecentStoreState; if ((!m.areEqual(storeState2 != null ? storeState2.getInviteCode() : null, inviteCode)) && inviteCode != null) { - StoreInstantInvites.fetchInviteIfNotLoaded$default(this.storeInstantInvites, inviteCode.getInviteCode(), null, null, 6, null); + StoreInstantInvites.fetchInviteIfNotLoaded$default(this.storeInstantInvites, inviteCode.getInviteCode(), null, null, null, 14, null); } ModelInvite invite = storeState.getInvite(); StoreGuildTemplates.GuildTemplateState guildTemplateState = storeState.getGuildTemplateState(); diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$evaluateCode$1.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$evaluateCode$1.java index abce253e10..f66481ff35 100644 --- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$evaluateCode$1.java +++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$evaluateCode$1.java @@ -1,41 +1,19 @@ package com.discord.widgets.auth; -import android.content.Intent; -import com.discord.app.AppActivity; +import com.discord.analytics.generated.events.network_action.TrackNetworkActionUserVerifyPhone; +import com.discord.analytics.generated.traits.TrackNetworkMetadataReceiver; import com.discord.models.domain.ModelPhoneVerificationToken; -import d0.z.d.m; import d0.z.d.o; -import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: WidgetAuthPhoneVerify.kt */ -public final class WidgetAuthPhoneVerify$evaluateCode$1 extends o implements Function1 { - public final /* synthetic */ WidgetAuthPhoneVerify this$0; +public final class WidgetAuthPhoneVerify$evaluateCode$1 extends o implements Function1 { + public static final WidgetAuthPhoneVerify$evaluateCode$1 INSTANCE = new WidgetAuthPhoneVerify$evaluateCode$1(); - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetAuthPhoneVerify$evaluateCode$1(WidgetAuthPhoneVerify widgetAuthPhoneVerify) { + public WidgetAuthPhoneVerify$evaluateCode$1() { super(1); - this.this$0 = widgetAuthPhoneVerify; } - /* 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] */ - @Override // kotlin.jvm.functions.Function1 - public /* bridge */ /* synthetic */ Unit invoke(ModelPhoneVerificationToken modelPhoneVerificationToken) { - invoke(modelPhoneVerificationToken); - return Unit.a; - } - - public final void invoke(ModelPhoneVerificationToken modelPhoneVerificationToken) { - m.checkNotNullParameter(modelPhoneVerificationToken, "it"); - Intent intent = new Intent(); - intent.putExtra("RESULT_EXTRA_TOKEN", modelPhoneVerificationToken.getToken()); - AppActivity appActivity = this.this$0.getAppActivity(); - if (appActivity != null) { - appActivity.setResult(-1, intent); - } - AppActivity appActivity2 = this.this$0.getAppActivity(); - if (appActivity2 != null) { - appActivity2.finish(); - } + public final TrackNetworkMetadataReceiver invoke(ModelPhoneVerificationToken modelPhoneVerificationToken) { + return new TrackNetworkActionUserVerifyPhone(); } } diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$evaluateCode$2.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$evaluateCode$2.java index fe5c8d7798..0816bfd0e6 100644 --- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$evaluateCode$2.java +++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$evaluateCode$2.java @@ -1,14 +1,14 @@ package com.discord.widgets.auth; -import com.discord.models.domain.ModelAuditLogEntry; -import com.discord.utilities.auth.RegistrationFlowRepo; -import com.discord.utilities.error.Error; +import android.content.Intent; +import com.discord.app.AppActivity; +import com.discord.models.domain.ModelPhoneVerificationToken; import d0.z.d.m; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: WidgetAuthPhoneVerify.kt */ -public final class WidgetAuthPhoneVerify$evaluateCode$2 extends o implements Function1 { +public final class WidgetAuthPhoneVerify$evaluateCode$2 extends o implements Function1 { public final /* synthetic */ WidgetAuthPhoneVerify this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ @@ -20,14 +20,22 @@ public final class WidgetAuthPhoneVerify$evaluateCode$2 extends o implements Fun /* 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] */ @Override // kotlin.jvm.functions.Function1 - public /* bridge */ /* synthetic */ Unit invoke(Error error) { - invoke(error); + public /* bridge */ /* synthetic */ Unit invoke(ModelPhoneVerificationToken modelPhoneVerificationToken) { + invoke(modelPhoneVerificationToken); return Unit.a; } - public final void invoke(Error error) { - m.checkNotNullParameter(error, "it"); - RegistrationFlowRepo.Companion.getINSTANCE().trackTransition("Phone Verification", "response_error", d0.t.m.listOf(ModelAuditLogEntry.CHANGE_KEY_CODE)); - WidgetAuthPhoneVerify.access$getBinding$p(this.this$0).f1712c.b(); + public final void invoke(ModelPhoneVerificationToken modelPhoneVerificationToken) { + m.checkNotNullParameter(modelPhoneVerificationToken, "it"); + Intent intent = new Intent(); + intent.putExtra("RESULT_EXTRA_TOKEN", modelPhoneVerificationToken.getToken()); + AppActivity appActivity = this.this$0.getAppActivity(); + if (appActivity != null) { + appActivity.setResult(-1, intent); + } + AppActivity appActivity2 = this.this$0.getAppActivity(); + if (appActivity2 != null) { + appActivity2.finish(); + } } } diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$evaluateCode$3.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$evaluateCode$3.java new file mode 100644 index 0000000000..96540a776c --- /dev/null +++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify$evaluateCode$3.java @@ -0,0 +1,33 @@ +package com.discord.widgets.auth; + +import com.discord.models.domain.ModelAuditLogEntry; +import com.discord.utilities.auth.RegistrationFlowRepo; +import com.discord.utilities.error.Error; +import d0.z.d.m; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; +/* compiled from: WidgetAuthPhoneVerify.kt */ +public final class WidgetAuthPhoneVerify$evaluateCode$3 extends o implements Function1 { + public final /* synthetic */ WidgetAuthPhoneVerify this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public WidgetAuthPhoneVerify$evaluateCode$3(WidgetAuthPhoneVerify widgetAuthPhoneVerify) { + super(1); + this.this$0 = widgetAuthPhoneVerify; + } + + /* 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] */ + @Override // kotlin.jvm.functions.Function1 + public /* bridge */ /* synthetic */ Unit invoke(Error error) { + invoke(error); + return Unit.a; + } + + public final void invoke(Error error) { + m.checkNotNullParameter(error, "it"); + RegistrationFlowRepo.Companion.getINSTANCE().trackTransition("Phone Verification", "response_error", d0.t.m.listOf(ModelAuditLogEntry.CHANGE_KEY_CODE)); + WidgetAuthPhoneVerify.access$getBinding$p(this.this$0).f1712c.b(); + } +} diff --git a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify.java b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify.java index 0058afb4b3..0fc5485b7f 100644 --- a/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify.java +++ b/app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify.java @@ -29,6 +29,7 @@ import com.discord.databinding.WidgetAuthPhoneVerifyBinding; import com.discord.models.experiments.domain.Experiment; import com.discord.restapi.RestAPIParams; import com.discord.stores.StoreStream; +import com.discord.stores.utilities.RestCallStateKt; import com.discord.utilities.auth.RegistrationFlowRepo; import com.discord.utilities.rest.RestAPI; import com.discord.utilities.rx.ObservableExtensionsKt; @@ -211,7 +212,7 @@ public final class WidgetAuthPhoneVerify extends AppFragment { if (str2 == null) { m.throwUninitializedPropertyAccessException("phone"); } - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(api.phoneVerificationsVerify(new RestAPIParams.VerificationCode(str2, str)), false, 1, null), this, null, 2, null), getBinding().g, 0, 2, null), WidgetAuthPhoneVerify.class, getContext(), (Function1) null, new WidgetAuthPhoneVerify$evaluateCode$2(this), (Function0) null, (Function0) null, new WidgetAuthPhoneVerify$evaluateCode$1(this), 52, (Object) null); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestCallStateKt.logNetworkAction(api.phoneVerificationsVerify(new RestAPIParams.VerificationCode(str2, str)), WidgetAuthPhoneVerify$evaluateCode$1.INSTANCE), false, 1, null), this, null, 2, null), getBinding().g, 0, 2, null), WidgetAuthPhoneVerify.class, getContext(), (Function1) null, new WidgetAuthPhoneVerify$evaluateCode$3(this), (Function0) null, (Function0) null, new WidgetAuthPhoneVerify$evaluateCode$2(this), 52, (Object) null); } private final WidgetAuthPhoneVerifyBinding getBinding() { diff --git a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$configureUI$1.java b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$configureUI$1.java index 5b7eb7b9b0..abae5dcf46 100644 --- a/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$configureUI$1.java +++ b/app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$configureUI$1.java @@ -3,14 +3,20 @@ package com.discord.widgets.channels; import android.content.Context; import android.view.MenuItem; import com.discord.R; +import com.discord.analytics.generated.events.network_action.TrackNetworkActionChannelCreate; +import com.discord.analytics.generated.traits.TrackNetworkMetadataReceiver; import com.discord.api.channel.Channel; +import com.discord.api.permission.PermissionOverwrite; import com.discord.restapi.RestAPIParams; +import com.discord.stores.utilities.RestCallStateKt; import com.discord.utilities.rest.RestAPI; import com.discord.utilities.rx.ObservableExtensionsKt; import com.discord.utilities.view.extensions.ViewExtensions; import com.google.android.material.textfield.TextInputLayout; import d0.z.d.k; import d0.z.d.m; +import d0.z.d.o; +import java.util.List; import kotlin.Unit; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; @@ -21,8 +27,25 @@ public final class WidgetCreateChannel$configureUI$1 implements Action2< /* compiled from: WidgetCreateChannel.kt */ /* renamed from: com.discord.widgets.channels.WidgetCreateChannel$configureUI$1$1 reason: invalid class name */ - public static final /* synthetic */ class AnonymousClass1 extends k implements Function1 { - public AnonymousClass1(WidgetCreateChannel widgetCreateChannel) { + public static final class AnonymousClass1 extends o implements Function1 { + public final /* synthetic */ WidgetCreateChannel$configureUI$1 this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public AnonymousClass1(WidgetCreateChannel$configureUI$1 widgetCreateChannel$configureUI$1) { + super(1); + this.this$0 = widgetCreateChannel$configureUI$1; + } + + public final TrackNetworkMetadataReceiver invoke(Channel channel) { + List s2; + return new TrackNetworkActionChannelCreate((channel == null || (s2 = channel.s()) == null) ? null : Boolean.valueOf(!s2.isEmpty()), channel != null ? Long.valueOf((long) channel.A()) : null, channel != null ? Long.valueOf(channel.h()) : null, channel != null ? Long.valueOf(channel.r()) : null, Long.valueOf(WidgetCreateChannel.access$getGuildId$p(this.this$0.this$0))); + } + } + + /* compiled from: WidgetCreateChannel.kt */ + /* renamed from: com.discord.widgets.channels.WidgetCreateChannel$configureUI$1$2 reason: invalid class name */ + public static final /* synthetic */ class AnonymousClass2 extends k implements Function1 { + public AnonymousClass2(WidgetCreateChannel widgetCreateChannel) { super(1, widgetCreateChannel, WidgetCreateChannel.class, "onChannelCreated", "onChannelCreated(Lcom/discord/api/channel/Channel;)V", 0); } @@ -52,7 +75,7 @@ public final class WidgetCreateChannel$configureUI$1 implements Action2< int access$getChannelType$p = WidgetCreateChannel.access$getChannelType$p(this.this$0); TextInputLayout textInputLayout = WidgetCreateChannel.access$getBinding$p(this.this$0).d; m.checkNotNullExpressionValue(textInputLayout, "binding.createChannelNameLayout"); - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(api.createGuildChannel(access$getGuildId$p, new RestAPIParams.CreateGuildChannel(access$getChannelType$p, null, ViewExtensions.getTextOrEmpty(textInputLayout), WidgetCreateChannel.access$getCategoryId$p(this.this$0), WidgetCreateChannel.access$getPermissionOverwrites(this.this$0), null)), false, 1, null), this.this$0, null, 2, null), this.this$0.getClass(), this.this$0.getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass1(this.this$0), 60, (Object) null); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestCallStateKt.logNetworkAction(api.createGuildChannel(access$getGuildId$p, new RestAPIParams.CreateGuildChannel(access$getChannelType$p, null, ViewExtensions.getTextOrEmpty(textInputLayout), WidgetCreateChannel.access$getCategoryId$p(this.this$0), WidgetCreateChannel.access$getPermissionOverwrites(this.this$0), null)), new AnonymousClass1(this)), false, 1, null), this.this$0, null, 2, null), this.this$0.getClass(), this.this$0.getContext(), (Function1) null, (Function1) null, (Function0) null, (Function0) null, new AnonymousClass2(this.this$0), 60, (Object) null); } } } diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1.java index 3f74f2bc42..c131c1f3ef 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1.java @@ -20,8 +20,8 @@ import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function3; /* compiled from: WidgetChannelListModel.kt */ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1 extends o implements Function3 { - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$3 $areAllChildThreadsRead$3$inlined; - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$4 $areAnyChildThreadsSelected$4$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$4 $areAllChildThreadsRead$4$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$5 $areAnyChildThreadsSelected$5$inlined; public final /* synthetic */ Set $channelsWithActiveThreads$inlined; public final /* synthetic */ Set $collapsedCategories$inlined; public final /* synthetic */ HashSet $forceViewCategories$inlined; @@ -29,7 +29,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ List $guildScheduledEvents$inlined; public final /* synthetic */ HashSet $hiddenChannelsIds$inlined; public final /* synthetic */ boolean $isCategoryMuted; - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$2 $isThreadUnread$2$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$3 $isThreadUnread$3$inlined; public final /* synthetic */ ArrayList $items$inlined; public final /* synthetic */ Map $mentionCounts$inlined; public final /* synthetic */ Channel $selectedChannel$inlined; @@ -38,7 +38,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ Map $stageChannels$inlined; public final /* synthetic */ Map $stageInstances$inlined; public final /* synthetic */ Map $threadParentMap$inlined; - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$1 $tryRemoveEmptyCategory$1$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$2 $tryRemoveEmptyCategory$2$inlined; public final /* synthetic */ Set $unreadChannelIds$inlined; public final /* synthetic */ Map $voiceStates$inlined; @@ -67,9 +67,9 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo } long h = channel.h(); Channel channel2 = this.this$0.$selectedChannel$inlined; - boolean z2 = (channel2 != null && (h > channel2.h() ? 1 : (h == channel2.h() ? 0 : -1)) == 0) || this.this$0.$areAnyChildThreadsSelected$4$inlined.invoke(channel.h()); + boolean z2 = (channel2 != null && (h > channel2.h() ? 1 : (h == channel2.h() ? 0 : -1)) == 0) || this.this$0.$areAnyChildThreadsSelected$5$inlined.invoke(channel.h()); boolean contains = this.this$0.$collapsedCategories$inlined.contains(Long.valueOf(channel.r())); - return (this.this$0.$hiddenChannelsIds$inlined.contains(Long.valueOf(this.$textChannel.r())) || (!z2 && !this.this$0.$isThreadUnread$2$inlined.invoke(this.$textChannel) && (contains || m.areEqual(this.$isParentMuted, Boolean.TRUE)))) ? 1 : null; + return (this.this$0.$hiddenChannelsIds$inlined.contains(Long.valueOf(this.$textChannel.r())) || (!z2 && !this.this$0.$isThreadUnread$3$inlined.invoke(this.$textChannel) && (contains || m.areEqual(this.$isParentMuted, Boolean.TRUE)))) ? 1 : null; } } @@ -106,8 +106,8 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo Boolean bool = 1; boolean z2 = this.$mentionCount <= 0; boolean contains = this.this$0.$collapsedCategories$inlined.contains(Long.valueOf(this.$textChannel.r())); - boolean z3 = this.$channelSelected || this.this$0.$areAnyChildThreadsSelected$4$inlined.invoke(this.$textChannel.h()); - boolean invoke = this.this$0.$areAllChildThreadsRead$3$inlined.invoke(this.$textChannel.h()); + boolean z3 = this.$channelSelected || this.this$0.$areAnyChildThreadsSelected$5$inlined.invoke(this.$textChannel.h()); + boolean invoke = this.this$0.$areAllChildThreadsRead$4$inlined.invoke(this.$textChannel.h()); boolean z4 = (contains && z2 && (this.this$0.$isCategoryMuted || this.$isMuted || !this.$unread)) || (this.$isMuted && this.this$0.$guild$inlined.getHideMutedChannels()); if (z3 || !invoke || !z4) { bool = 0; @@ -120,7 +120,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo } /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1(boolean z2, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, Channel channel, Map map, Set set, long j, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, Set set2, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, long j2, Map map2, Set set3, List list, Map map3, Map map4, Map map5, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$1 widgetChannelListModel$Companion$guildListBuilder$1) { + public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1(boolean z2, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, Channel channel, Map map, Set set, long j, WidgetChannelListModel$Companion$guildListBuilder$5 widgetChannelListModel$Companion$guildListBuilder$5, Set set2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, long j2, Map map2, Set set3, List list, Map map3, Map map4, Map map5, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2) { super(3); this.$isCategoryMuted = z2; this.$guild$inlined = guildChannelsInfo; @@ -129,11 +129,11 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo this.$mentionCounts$inlined = map; this.$unreadChannelIds$inlined = set; this.$selectedGuildId$inlined = j; - this.$areAnyChildThreadsSelected$4$inlined = widgetChannelListModel$Companion$guildListBuilder$4; + this.$areAnyChildThreadsSelected$5$inlined = widgetChannelListModel$Companion$guildListBuilder$5; this.$collapsedCategories$inlined = set2; - this.$isThreadUnread$2$inlined = widgetChannelListModel$Companion$guildListBuilder$2; + this.$isThreadUnread$3$inlined = widgetChannelListModel$Companion$guildListBuilder$3; this.$hiddenChannelsIds$inlined = hashSet2; - this.$areAllChildThreadsRead$3$inlined = widgetChannelListModel$Companion$guildListBuilder$3; + this.$areAllChildThreadsRead$4$inlined = widgetChannelListModel$Companion$guildListBuilder$4; this.$selectedVoiceChannelId$inlined = j2; this.$voiceStates$inlined = map2; this.$channelsWithActiveThreads$inlined = set3; @@ -142,7 +142,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo this.$stageChannels$inlined = map4; this.$threadParentMap$inlined = map5; this.$items$inlined = arrayList; - this.$tryRemoveEmptyCategory$1$inlined = widgetChannelListModel$Companion$guildListBuilder$1; + this.$tryRemoveEmptyCategory$2$inlined = widgetChannelListModel$Companion$guildListBuilder$2; } public static /* synthetic */ WidgetChannelListModel.Companion.TextLikeChannelData invoke$default(WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1, Channel channel, boolean z2, Boolean bool, int i, Object obj) { diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.java index 42589f1c69..023e54f3cd 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2.java @@ -20,8 +20,8 @@ import java.util.Set; import kotlin.jvm.functions.Function1; /* compiled from: WidgetChannelListModel.kt */ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2 extends o implements Function1 { - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$3 $areAllChildThreadsRead$3$inlined; - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$4 $areAnyChildThreadsSelected$4$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$4 $areAllChildThreadsRead$4$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$5 $areAnyChildThreadsSelected$5$inlined; public final /* synthetic */ Channel $channel; public final /* synthetic */ long $channelId; public final /* synthetic */ Set $channelsWithActiveThreads$inlined; @@ -30,7 +30,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ GuildChannelsInfo $guild$inlined; public final /* synthetic */ List $guildScheduledEvents$inlined; public final /* synthetic */ HashSet $hiddenChannelsIds$inlined; - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$2 $isThreadUnread$2$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$3 $isThreadUnread$3$inlined; public final /* synthetic */ ArrayList $items$inlined; public final /* synthetic */ Map $mentionCounts$inlined; public final /* synthetic */ Long $permissions; @@ -40,12 +40,12 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ Map $stageChannels$inlined; public final /* synthetic */ Map $stageInstances$inlined; public final /* synthetic */ Map $threadParentMap$inlined; - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$1 $tryRemoveEmptyCategory$1$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$2 $tryRemoveEmptyCategory$2$inlined; public final /* synthetic */ Set $unreadChannelIds$inlined; public final /* synthetic */ Map $voiceStates$inlined; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2(long j, Channel channel, Long l, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, Channel channel2, Map map, Set set, long j2, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, Set set2, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, long j3, Map map2, Set set3, List list, Map map3, Map map4, Map map5, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$1 widgetChannelListModel$Companion$guildListBuilder$1) { + public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2(long j, Channel channel, Long l, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, Channel channel2, Map map, Set set, long j2, WidgetChannelListModel$Companion$guildListBuilder$5 widgetChannelListModel$Companion$guildListBuilder$5, Set set2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, long j3, Map map2, Set set3, List list, Map map3, Map map4, Map map5, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2) { super(1); this.$channelId = j; this.$channel = channel; @@ -56,11 +56,11 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo this.$mentionCounts$inlined = map; this.$unreadChannelIds$inlined = set; this.$selectedGuildId$inlined = j2; - this.$areAnyChildThreadsSelected$4$inlined = widgetChannelListModel$Companion$guildListBuilder$4; + this.$areAnyChildThreadsSelected$5$inlined = widgetChannelListModel$Companion$guildListBuilder$5; this.$collapsedCategories$inlined = set2; - this.$isThreadUnread$2$inlined = widgetChannelListModel$Companion$guildListBuilder$2; + this.$isThreadUnread$3$inlined = widgetChannelListModel$Companion$guildListBuilder$3; this.$hiddenChannelsIds$inlined = hashSet2; - this.$areAllChildThreadsRead$3$inlined = widgetChannelListModel$Companion$guildListBuilder$3; + this.$areAllChildThreadsRead$4$inlined = widgetChannelListModel$Companion$guildListBuilder$4; this.$selectedVoiceChannelId$inlined = j3; this.$voiceStates$inlined = map2; this.$channelsWithActiveThreads$inlined = set3; @@ -69,7 +69,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo this.$stageChannels$inlined = map4; this.$threadParentMap$inlined = map5; this.$items$inlined = arrayList; - this.$tryRemoveEmptyCategory$1$inlined = widgetChannelListModel$Companion$guildListBuilder$1; + this.$tryRemoveEmptyCategory$2$inlined = widgetChannelListModel$Companion$guildListBuilder$2; } public final WidgetChannelListModel.Companion.VocalChannelData invoke(Channel channel) { diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3.java index a54d4f5a09..969916429b 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3.java @@ -14,8 +14,8 @@ import java.util.Set; import kotlin.jvm.functions.Function0; /* compiled from: WidgetChannelListModel.kt */ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3 extends o implements Function0 { - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$3 $areAllChildThreadsRead$3$inlined; - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$4 $areAnyChildThreadsSelected$4$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$4 $areAllChildThreadsRead$4$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$5 $areAnyChildThreadsSelected$5$inlined; public final /* synthetic */ Channel $channel; public final /* synthetic */ Set $channelsWithActiveThreads$inlined; public final /* synthetic */ Set $collapsedCategories$inlined; @@ -24,7 +24,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ GuildChannelsInfo $guild$inlined; public final /* synthetic */ List $guildScheduledEvents$inlined; public final /* synthetic */ HashSet $hiddenChannelsIds$inlined; - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$2 $isThreadUnread$2$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$3 $isThreadUnread$3$inlined; public final /* synthetic */ ArrayList $items$inlined; public final /* synthetic */ Map $mentionCounts$inlined; public final /* synthetic */ boolean $muted; @@ -35,12 +35,12 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ Map $stageChannels$inlined; public final /* synthetic */ Map $stageInstances$inlined; public final /* synthetic */ Map $threadParentMap$inlined; - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$1 $tryRemoveEmptyCategory$1$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$2 $tryRemoveEmptyCategory$2$inlined; public final /* synthetic */ Set $unreadChannelIds$inlined; public final /* synthetic */ Map $voiceStates$inlined; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3(Channel channel, Long l, WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1, boolean z2, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, Channel channel2, Map map, Set set, long j, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, Set set2, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, long j2, Map map2, Set set3, List list, Map map3, Map map4, Map map5, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$1 widgetChannelListModel$Companion$guildListBuilder$1) { + public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$3(Channel channel, Long l, WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1, boolean z2, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, Channel channel2, Map map, Set set, long j, WidgetChannelListModel$Companion$guildListBuilder$5 widgetChannelListModel$Companion$guildListBuilder$5, Set set2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, long j2, Map map2, Set set3, List list, Map map3, Map map4, Map map5, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2) { super(0); this.$channel = channel; this.$permissions = l; @@ -52,11 +52,11 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo this.$mentionCounts$inlined = map; this.$unreadChannelIds$inlined = set; this.$selectedGuildId$inlined = j; - this.$areAnyChildThreadsSelected$4$inlined = widgetChannelListModel$Companion$guildListBuilder$4; + this.$areAnyChildThreadsSelected$5$inlined = widgetChannelListModel$Companion$guildListBuilder$5; this.$collapsedCategories$inlined = set2; - this.$isThreadUnread$2$inlined = widgetChannelListModel$Companion$guildListBuilder$2; + this.$isThreadUnread$3$inlined = widgetChannelListModel$Companion$guildListBuilder$3; this.$hiddenChannelsIds$inlined = hashSet2; - this.$areAllChildThreadsRead$3$inlined = widgetChannelListModel$Companion$guildListBuilder$3; + this.$areAllChildThreadsRead$4$inlined = widgetChannelListModel$Companion$guildListBuilder$4; this.$selectedVoiceChannelId$inlined = j2; this.$voiceStates$inlined = map2; this.$channelsWithActiveThreads$inlined = set3; @@ -65,7 +65,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo this.$stageChannels$inlined = map4; this.$threadParentMap$inlined = map5; this.$items$inlined = arrayList; - this.$tryRemoveEmptyCategory$1$inlined = widgetChannelListModel$Companion$guildListBuilder$1; + this.$tryRemoveEmptyCategory$2$inlined = widgetChannelListModel$Companion$guildListBuilder$2; } @Override // kotlin.jvm.functions.Function0 diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4.java index 227eca287d..3d5cd19eb1 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4.java @@ -16,8 +16,8 @@ import java.util.Set; import kotlin.jvm.functions.Function1; /* compiled from: WidgetChannelListModel.kt */ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4 extends o implements Function1 { - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$3 $areAllChildThreadsRead$3$inlined; - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$4 $areAnyChildThreadsSelected$4$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$4 $areAllChildThreadsRead$4$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$5 $areAnyChildThreadsSelected$5$inlined; public final /* synthetic */ Set $channelsWithActiveThreads$inlined; public final /* synthetic */ Set $collapsedCategories$inlined; public final /* synthetic */ HashSet $forceViewCategories$inlined; @@ -25,7 +25,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ GuildChannelsInfo $guild$inlined; public final /* synthetic */ List $guildScheduledEvents$inlined; public final /* synthetic */ HashSet $hiddenChannelsIds$inlined; - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$2 $isThreadUnread$2$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$3 $isThreadUnread$3$inlined; public final /* synthetic */ ArrayList $items$inlined; public final /* synthetic */ Map $mentionCounts$inlined; public final /* synthetic */ Channel $selectedChannel$inlined; @@ -34,12 +34,12 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ Map $stageChannels$inlined; public final /* synthetic */ Map $stageInstances$inlined; public final /* synthetic */ Map $threadParentMap$inlined; - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$1 $tryRemoveEmptyCategory$1$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$2 $tryRemoveEmptyCategory$2$inlined; public final /* synthetic */ Set $unreadChannelIds$inlined; public final /* synthetic */ Map $voiceStates$inlined; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4(WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, Channel channel, Map map, Set set, long j, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, Set set2, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, long j2, Map map2, Set set3, List list, Map map3, Map map4, Map map5, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$1 widgetChannelListModel$Companion$guildListBuilder$1) { + public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4(WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, Channel channel, Map map, Set set, long j, WidgetChannelListModel$Companion$guildListBuilder$5 widgetChannelListModel$Companion$guildListBuilder$5, Set set2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, long j2, Map map2, Set set3, List list, Map map3, Map map4, Map map5, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2) { super(1); this.$getTextLikeChannelData$1 = widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$1; this.$guild$inlined = guildChannelsInfo; @@ -48,11 +48,11 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo this.$mentionCounts$inlined = map; this.$unreadChannelIds$inlined = set; this.$selectedGuildId$inlined = j; - this.$areAnyChildThreadsSelected$4$inlined = widgetChannelListModel$Companion$guildListBuilder$4; + this.$areAnyChildThreadsSelected$5$inlined = widgetChannelListModel$Companion$guildListBuilder$5; this.$collapsedCategories$inlined = set2; - this.$isThreadUnread$2$inlined = widgetChannelListModel$Companion$guildListBuilder$2; + this.$isThreadUnread$3$inlined = widgetChannelListModel$Companion$guildListBuilder$3; this.$hiddenChannelsIds$inlined = hashSet2; - this.$areAllChildThreadsRead$3$inlined = widgetChannelListModel$Companion$guildListBuilder$3; + this.$areAllChildThreadsRead$4$inlined = widgetChannelListModel$Companion$guildListBuilder$4; this.$selectedVoiceChannelId$inlined = j2; this.$voiceStates$inlined = map2; this.$channelsWithActiveThreads$inlined = set3; @@ -61,7 +61,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo this.$stageChannels$inlined = map4; this.$threadParentMap$inlined = map5; this.$items$inlined = arrayList; - this.$tryRemoveEmptyCategory$1$inlined = widgetChannelListModel$Companion$guildListBuilder$1; + this.$tryRemoveEmptyCategory$2$inlined = widgetChannelListModel$Companion$guildListBuilder$2; } public final ChannelListItemThread invoke(Channel channel) { diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$5.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$5.java index 841ea2b893..9d968d443d 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$5.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$5.java @@ -21,8 +21,8 @@ import java.util.Set; import kotlin.jvm.functions.Function0; /* compiled from: WidgetChannelListModel.kt */ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$5 extends o implements Function0 { - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$3 $areAllChildThreadsRead$3$inlined; - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$4 $areAnyChildThreadsSelected$4$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$4 $areAllChildThreadsRead$4$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$5 $areAnyChildThreadsSelected$5$inlined; public final /* synthetic */ Channel $channel; public final /* synthetic */ Set $channelsWithActiveThreads$inlined; public final /* synthetic */ Set $collapsedCategories$inlined; @@ -31,7 +31,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ GuildChannelsInfo $guild$inlined; public final /* synthetic */ List $guildScheduledEvents$inlined; public final /* synthetic */ HashSet $hiddenChannelsIds$inlined; - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$2 $isThreadUnread$2$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$3 $isThreadUnread$3$inlined; public final /* synthetic */ ArrayList $items$inlined; public final /* synthetic */ Map $mentionCounts$inlined; public final /* synthetic */ Long $permissions; @@ -41,12 +41,12 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ Map $stageChannels$inlined; public final /* synthetic */ Map $stageInstances$inlined; public final /* synthetic */ Map $threadParentMap$inlined; - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$1 $tryRemoveEmptyCategory$1$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$2 $tryRemoveEmptyCategory$2$inlined; public final /* synthetic */ Set $unreadChannelIds$inlined; public final /* synthetic */ Map $voiceStates$inlined; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$5(WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2, Channel channel, Long l, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, Channel channel2, Map map, Set set, long j, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, Set set2, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, long j2, Map map2, Set set3, List list, Map map3, Map map4, Map map5, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$1 widgetChannelListModel$Companion$guildListBuilder$1) { + public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$5(WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2, Channel channel, Long l, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, Channel channel2, Map map, Set set, long j, WidgetChannelListModel$Companion$guildListBuilder$5 widgetChannelListModel$Companion$guildListBuilder$5, Set set2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, long j2, Map map2, Set set3, List list, Map map3, Map map4, Map map5, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2) { super(0); this.$getVocalChannelData$2 = widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2; this.$channel = channel; @@ -57,11 +57,11 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo this.$mentionCounts$inlined = map; this.$unreadChannelIds$inlined = set; this.$selectedGuildId$inlined = j; - this.$areAnyChildThreadsSelected$4$inlined = widgetChannelListModel$Companion$guildListBuilder$4; + this.$areAnyChildThreadsSelected$5$inlined = widgetChannelListModel$Companion$guildListBuilder$5; this.$collapsedCategories$inlined = set2; - this.$isThreadUnread$2$inlined = widgetChannelListModel$Companion$guildListBuilder$2; + this.$isThreadUnread$3$inlined = widgetChannelListModel$Companion$guildListBuilder$3; this.$hiddenChannelsIds$inlined = hashSet2; - this.$areAllChildThreadsRead$3$inlined = widgetChannelListModel$Companion$guildListBuilder$3; + this.$areAllChildThreadsRead$4$inlined = widgetChannelListModel$Companion$guildListBuilder$4; this.$selectedVoiceChannelId$inlined = j2; this.$voiceStates$inlined = map2; this.$channelsWithActiveThreads$inlined = set3; @@ -70,7 +70,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo this.$stageChannels$inlined = map4; this.$threadParentMap$inlined = map5; this.$items$inlined = arrayList; - this.$tryRemoveEmptyCategory$1$inlined = widgetChannelListModel$Companion$guildListBuilder$1; + this.$tryRemoveEmptyCategory$2$inlined = widgetChannelListModel$Companion$guildListBuilder$2; } /* JADX DEBUG: Multi-variable search result rejected for r3v1, resolved type: java.lang.Object */ diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$6.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$6.java index f229a674c9..630a6016e8 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$6.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$6.java @@ -16,8 +16,8 @@ import java.util.Set; import kotlin.jvm.functions.Function0; /* compiled from: WidgetChannelListModel.kt */ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$6 extends o implements Function0 { - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$3 $areAllChildThreadsRead$3$inlined; - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$4 $areAnyChildThreadsSelected$4$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$4 $areAllChildThreadsRead$4$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$5 $areAnyChildThreadsSelected$5$inlined; public final /* synthetic */ Channel $channel; public final /* synthetic */ Set $channelsWithActiveThreads$inlined; public final /* synthetic */ Set $collapsedCategories$inlined; @@ -26,7 +26,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ GuildChannelsInfo $guild$inlined; public final /* synthetic */ List $guildScheduledEvents$inlined; public final /* synthetic */ HashSet $hiddenChannelsIds$inlined; - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$2 $isThreadUnread$2$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$3 $isThreadUnread$3$inlined; public final /* synthetic */ ArrayList $items$inlined; public final /* synthetic */ Map $mentionCounts$inlined; public final /* synthetic */ Long $permissions; @@ -36,12 +36,12 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ Map $stageChannels$inlined; public final /* synthetic */ Map $stageInstances$inlined; public final /* synthetic */ Map $threadParentMap$inlined; - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$1 $tryRemoveEmptyCategory$1$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$2 $tryRemoveEmptyCategory$2$inlined; public final /* synthetic */ Set $unreadChannelIds$inlined; public final /* synthetic */ Map $voiceStates$inlined; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$6(WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2, Channel channel, Long l, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, Channel channel2, Map map, Set set, long j, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, Set set2, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, long j2, Map map2, Set set3, List list, Map map3, Map map4, Map map5, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$1 widgetChannelListModel$Companion$guildListBuilder$1) { + public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$6(WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2, Channel channel, Long l, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, Channel channel2, Map map, Set set, long j, WidgetChannelListModel$Companion$guildListBuilder$5 widgetChannelListModel$Companion$guildListBuilder$5, Set set2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, long j2, Map map2, Set set3, List list, Map map3, Map map4, Map map5, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2) { super(0); this.$getVocalChannelData$2 = widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$2; this.$channel = channel; @@ -52,11 +52,11 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo this.$mentionCounts$inlined = map; this.$unreadChannelIds$inlined = set; this.$selectedGuildId$inlined = j; - this.$areAnyChildThreadsSelected$4$inlined = widgetChannelListModel$Companion$guildListBuilder$4; + this.$areAnyChildThreadsSelected$5$inlined = widgetChannelListModel$Companion$guildListBuilder$5; this.$collapsedCategories$inlined = set2; - this.$isThreadUnread$2$inlined = widgetChannelListModel$Companion$guildListBuilder$2; + this.$isThreadUnread$3$inlined = widgetChannelListModel$Companion$guildListBuilder$3; this.$hiddenChannelsIds$inlined = hashSet2; - this.$areAllChildThreadsRead$3$inlined = widgetChannelListModel$Companion$guildListBuilder$3; + this.$areAllChildThreadsRead$4$inlined = widgetChannelListModel$Companion$guildListBuilder$4; this.$selectedVoiceChannelId$inlined = j2; this.$voiceStates$inlined = map2; this.$channelsWithActiveThreads$inlined = set3; @@ -65,7 +65,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo this.$stageChannels$inlined = map4; this.$threadParentMap$inlined = map5; this.$items$inlined = arrayList; - this.$tryRemoveEmptyCategory$1$inlined = widgetChannelListModel$Companion$guildListBuilder$1; + this.$tryRemoveEmptyCategory$2$inlined = widgetChannelListModel$Companion$guildListBuilder$2; } @Override // kotlin.jvm.functions.Function0 diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$7.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$7.java index 352e950947..770ba8c17f 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$7.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$7.java @@ -16,15 +16,15 @@ import java.util.Set; import kotlin.jvm.functions.Function1; /* compiled from: WidgetChannelListModel.kt */ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$7 extends o implements Function1> { - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$3 $areAllChildThreadsRead$3$inlined; - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$4 $areAnyChildThreadsSelected$4$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$4 $areAllChildThreadsRead$4$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$5 $areAnyChildThreadsSelected$5$inlined; public final /* synthetic */ Set $channelsWithActiveThreads$inlined; public final /* synthetic */ Set $collapsedCategories$inlined; public final /* synthetic */ HashSet $forceViewCategories$inlined; public final /* synthetic */ GuildChannelsInfo $guild$inlined; public final /* synthetic */ List $guildScheduledEvents$inlined; public final /* synthetic */ HashSet $hiddenChannelsIds$inlined; - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$2 $isThreadUnread$2$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$3 $isThreadUnread$3$inlined; public final /* synthetic */ ArrayList $items$inlined; public final /* synthetic */ Map $mentionCounts$inlined; public final /* synthetic */ Channel $selectedChannel$inlined; @@ -34,12 +34,12 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ Map $stageInstances$inlined; public final /* synthetic */ Map $threadParentMap$inlined; public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4 $toChannelListItemThread$4; - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$1 $tryRemoveEmptyCategory$1$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$2 $tryRemoveEmptyCategory$2$inlined; public final /* synthetic */ Set $unreadChannelIds$inlined; public final /* synthetic */ Map $voiceStates$inlined; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$7(WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, Channel channel, Map map, Set set, long j, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, Set set2, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, long j2, Map map2, Set set3, List list, Map map3, Map map4, Map map5, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$1 widgetChannelListModel$Companion$guildListBuilder$1) { + public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$7(WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4 widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, Channel channel, Map map, Set set, long j, WidgetChannelListModel$Companion$guildListBuilder$5 widgetChannelListModel$Companion$guildListBuilder$5, Set set2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, long j2, Map map2, Set set3, List list, Map map3, Map map4, Map map5, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2) { super(1); this.$toChannelListItemThread$4 = widgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$4; this.$guild$inlined = guildChannelsInfo; @@ -48,11 +48,11 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo this.$mentionCounts$inlined = map; this.$unreadChannelIds$inlined = set; this.$selectedGuildId$inlined = j; - this.$areAnyChildThreadsSelected$4$inlined = widgetChannelListModel$Companion$guildListBuilder$4; + this.$areAnyChildThreadsSelected$5$inlined = widgetChannelListModel$Companion$guildListBuilder$5; this.$collapsedCategories$inlined = set2; - this.$isThreadUnread$2$inlined = widgetChannelListModel$Companion$guildListBuilder$2; + this.$isThreadUnread$3$inlined = widgetChannelListModel$Companion$guildListBuilder$3; this.$hiddenChannelsIds$inlined = hashSet2; - this.$areAllChildThreadsRead$3$inlined = widgetChannelListModel$Companion$guildListBuilder$3; + this.$areAllChildThreadsRead$4$inlined = widgetChannelListModel$Companion$guildListBuilder$4; this.$selectedVoiceChannelId$inlined = j2; this.$voiceStates$inlined = map2; this.$channelsWithActiveThreads$inlined = set3; @@ -61,7 +61,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo this.$stageChannels$inlined = map4; this.$threadParentMap$inlined = map5; this.$items$inlined = arrayList; - this.$tryRemoveEmptyCategory$1$inlined = widgetChannelListModel$Companion$guildListBuilder$1; + this.$tryRemoveEmptyCategory$2$inlined = widgetChannelListModel$Companion$guildListBuilder$2; } public final Collection invoke(Channel channel) { @@ -80,14 +80,14 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo list = n.emptyList(); } int size = list.size(); - WidgetChannelListModel$Companion$guildListBuilder$5$7$1 widgetChannelListModel$Companion$guildListBuilder$5$7$1 = WidgetChannelListModel$Companion$guildListBuilder$5$7$1.INSTANCE; + WidgetChannelListModel$Companion$guildListBuilder$6$7$1 widgetChannelListModel$Companion$guildListBuilder$6$7$1 = WidgetChannelListModel$Companion$guildListBuilder$6$7$1.INSTANCE; int i = 0; for (Object obj : list) { int i2 = i + 1; if (i < 0) { n.throwIndexOverflow(); } - ((ChannelListItemThread) obj).setSpineType(WidgetChannelListModel$Companion$guildListBuilder$5$7$1.INSTANCE.invoke(i, size)); + ((ChannelListItemThread) obj).setSpineType(WidgetChannelListModel$Companion$guildListBuilder$6$7$1.INSTANCE.invoke(i, size)); i = i2; } return list; diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$8.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$8.java index cfe71d4ce7..ed5df55234 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$8.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$8.java @@ -16,8 +16,8 @@ import java.util.Set; import kotlin.jvm.functions.Function0; /* compiled from: WidgetChannelListModel.kt */ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$8 extends o implements Function0> { - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$3 $areAllChildThreadsRead$3$inlined; - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$4 $areAnyChildThreadsSelected$4$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$4 $areAllChildThreadsRead$4$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$5 $areAnyChildThreadsSelected$5$inlined; public final /* synthetic */ long $channelId; public final /* synthetic */ Set $channelsWithActiveThreads$inlined; public final /* synthetic */ Set $collapsedCategories$inlined; @@ -25,7 +25,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ GuildChannelsInfo $guild$inlined; public final /* synthetic */ List $guildScheduledEvents$inlined; public final /* synthetic */ HashSet $hiddenChannelsIds$inlined; - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$2 $isThreadUnread$2$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$3 $isThreadUnread$3$inlined; public final /* synthetic */ ArrayList $items$inlined; public final /* synthetic */ Map $mentionCounts$inlined; public final /* synthetic */ Channel $selectedChannel$inlined; @@ -34,12 +34,12 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo public final /* synthetic */ Map $stageChannels$inlined; public final /* synthetic */ Map $stageInstances$inlined; public final /* synthetic */ Map $threadParentMap$inlined; - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$1 $tryRemoveEmptyCategory$1$inlined; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$2 $tryRemoveEmptyCategory$2$inlined; public final /* synthetic */ Set $unreadChannelIds$inlined; public final /* synthetic */ Map $voiceStates$inlined; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$8(long j, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, Channel channel, Map map, Set set, long j2, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, Set set2, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, long j3, Map map2, Set set3, List list, Map map3, Map map4, Map map5, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$1 widgetChannelListModel$Companion$guildListBuilder$1) { + public WidgetChannelListModel$Companion$guildListBuilder$$inlined$forEach$lambda$8(long j, GuildChannelsInfo guildChannelsInfo, HashSet hashSet, Channel channel, Map map, Set set, long j2, WidgetChannelListModel$Companion$guildListBuilder$5 widgetChannelListModel$Companion$guildListBuilder$5, Set set2, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3, HashSet hashSet2, WidgetChannelListModel$Companion$guildListBuilder$4 widgetChannelListModel$Companion$guildListBuilder$4, long j3, Map map2, Set set3, List list, Map map3, Map map4, Map map5, ArrayList arrayList, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2) { super(0); this.$channelId = j; this.$guild$inlined = guildChannelsInfo; @@ -48,11 +48,11 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo this.$mentionCounts$inlined = map; this.$unreadChannelIds$inlined = set; this.$selectedGuildId$inlined = j2; - this.$areAnyChildThreadsSelected$4$inlined = widgetChannelListModel$Companion$guildListBuilder$4; + this.$areAnyChildThreadsSelected$5$inlined = widgetChannelListModel$Companion$guildListBuilder$5; this.$collapsedCategories$inlined = set2; - this.$isThreadUnread$2$inlined = widgetChannelListModel$Companion$guildListBuilder$2; + this.$isThreadUnread$3$inlined = widgetChannelListModel$Companion$guildListBuilder$3; this.$hiddenChannelsIds$inlined = hashSet2; - this.$areAllChildThreadsRead$3$inlined = widgetChannelListModel$Companion$guildListBuilder$3; + this.$areAllChildThreadsRead$4$inlined = widgetChannelListModel$Companion$guildListBuilder$4; this.$selectedVoiceChannelId$inlined = j3; this.$voiceStates$inlined = map2; this.$channelsWithActiveThreads$inlined = set3; @@ -61,7 +61,7 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$$inlined$fo this.$stageChannels$inlined = map4; this.$threadParentMap$inlined = map5; this.$items$inlined = arrayList; - this.$tryRemoveEmptyCategory$1$inlined = widgetChannelListModel$Companion$guildListBuilder$1; + this.$tryRemoveEmptyCategory$2$inlined = widgetChannelListModel$Companion$guildListBuilder$2; } /* Return type fixed from 'java.util.Collection' to match base method */ diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1.java deleted file mode 100644 index d6903b665c..0000000000 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$1.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.discord.widgets.channels.list; - -import com.discord.widgets.channels.list.items.ChannelListItem; -import com.discord.widgets.channels.list.items.ChannelListItemCategory; -import d0.t.u; -import d0.z.d.o; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import kotlin.Unit; -import kotlin.jvm.functions.Function0; -/* compiled from: WidgetChannelListModel.kt */ -public final class WidgetChannelListModel$Companion$guildListBuilder$1 extends o implements Function0 { - public final /* synthetic */ Set $collapsedCategories; - public final /* synthetic */ HashSet $forceViewCategories; - public final /* synthetic */ ArrayList $items; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChannelListModel$Companion$guildListBuilder$1(ArrayList arrayList, HashSet hashSet, Set set) { - super(0); - this.$items = arrayList; - this.$forceViewCategories = hashSet; - this.$collapsedCategories = set; - } - - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public final void mo1invoke() { - ChannelListItem channelListItem = (ChannelListItem) u.lastOrNull((List) this.$items); - if (channelListItem != null && channelListItem.getType() == 8 && (channelListItem instanceof ChannelListItemCategory)) { - long h = ((ChannelListItemCategory) channelListItem).getChannel().h(); - if (!this.$forceViewCategories.contains(Long.valueOf(h)) && !this.$collapsedCategories.contains(Long.valueOf(h))) { - ArrayList arrayList = this.$items; - arrayList.remove(arrayList.size() - 1); - } - } - } -} diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$2.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$2.java index a3c53b9ad3..e9ec466f70 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$2.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$2.java @@ -1,29 +1,39 @@ package com.discord.widgets.channels.list; -import com.discord.api.channel.Channel; -import d0.z.d.m; +import com.discord.widgets.channels.list.items.ChannelListItem; +import com.discord.widgets.channels.list.items.ChannelListItemCategory; +import d0.t.u; import d0.z.d.o; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; import java.util.Set; -import kotlin.jvm.functions.Function1; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; /* compiled from: WidgetChannelListModel.kt */ -public final class WidgetChannelListModel$Companion$guildListBuilder$2 extends o implements Function1 { - public final /* synthetic */ Set $unreadChannelIds; +public final class WidgetChannelListModel$Companion$guildListBuilder$2 extends o implements Function0 { + public final /* synthetic */ Set $collapsedCategories; + public final /* synthetic */ HashSet $forceViewCategories; + public final /* synthetic */ ArrayList $items; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChannelListModel$Companion$guildListBuilder$2(Set set) { - super(1); - this.$unreadChannelIds = set; + public WidgetChannelListModel$Companion$guildListBuilder$2(ArrayList arrayList, HashSet hashSet, Set set) { + super(0); + this.$items = arrayList; + this.$forceViewCategories = hashSet; + this.$collapsedCategories = set; } - /* 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] */ - @Override // kotlin.jvm.functions.Function1 - public /* bridge */ /* synthetic */ Boolean invoke(Channel channel) { - return Boolean.valueOf(invoke(channel)); - } - - public final boolean invoke(Channel channel) { - m.checkNotNullParameter(channel, "thread"); - return this.$unreadChannelIds.contains(Long.valueOf(channel.h())); + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + ChannelListItem channelListItem = (ChannelListItem) u.lastOrNull((List) this.$items); + if (channelListItem != null && channelListItem.getType() == 8 && (channelListItem instanceof ChannelListItemCategory)) { + long h = ((ChannelListItemCategory) channelListItem).getChannel().h(); + if (!this.$forceViewCategories.contains(Long.valueOf(h)) && !this.$collapsedCategories.contains(Long.valueOf(h))) { + ArrayList arrayList = this.$items; + arrayList.remove(arrayList.size() - 1); + } + } } } diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$3.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$3.java index 48b7f68717..708644ae39 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$3.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$3.java @@ -1,39 +1,29 @@ package com.discord.widgets.channels.list; import com.discord.api.channel.Channel; +import d0.z.d.m; import d0.z.d.o; -import java.util.Collection; -import java.util.Map; +import java.util.Set; import kotlin.jvm.functions.Function1; /* compiled from: WidgetChannelListModel.kt */ -public final class WidgetChannelListModel$Companion$guildListBuilder$3 extends o implements Function1 { - public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$2 $isThreadUnread$2; - public final /* synthetic */ Map $threadParentMap; +public final class WidgetChannelListModel$Companion$guildListBuilder$3 extends o implements Function1 { + public final /* synthetic */ Set $unreadChannelIds; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChannelListModel$Companion$guildListBuilder$3(Map map, WidgetChannelListModel$Companion$guildListBuilder$2 widgetChannelListModel$Companion$guildListBuilder$2) { + public WidgetChannelListModel$Companion$guildListBuilder$3(Set set) { super(1); - this.$threadParentMap = map; - this.$isThreadUnread$2 = widgetChannelListModel$Companion$guildListBuilder$2; + this.$unreadChannelIds = set; } /* 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] */ @Override // kotlin.jvm.functions.Function1 - public /* bridge */ /* synthetic */ Boolean invoke(Long l) { - return Boolean.valueOf(invoke(l.longValue())); + public /* bridge */ /* synthetic */ Boolean invoke(Channel channel) { + return Boolean.valueOf(invoke(channel)); } - public final boolean invoke(long j) { - Collection collection = (Collection) this.$threadParentMap.get(Long.valueOf(j)); - if (collection == null) { - return true; - } - for (Channel channel : collection) { - if (this.$isThreadUnread$2.invoke(channel)) { - return false; - } - } - return true; + public final boolean invoke(Channel channel) { + m.checkNotNullParameter(channel, "thread"); + return this.$unreadChannelIds.contains(Long.valueOf(channel.h())); } } diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$4.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$4.java index e9ab23f7bc..786edd9c5e 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$4.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$4.java @@ -7,14 +7,14 @@ import java.util.Map; import kotlin.jvm.functions.Function1; /* compiled from: WidgetChannelListModel.kt */ public final class WidgetChannelListModel$Companion$guildListBuilder$4 extends o implements Function1 { - public final /* synthetic */ Channel $selectedChannel; + public final /* synthetic */ WidgetChannelListModel$Companion$guildListBuilder$3 $isThreadUnread$3; public final /* synthetic */ Map $threadParentMap; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetChannelListModel$Companion$guildListBuilder$4(Map map, Channel channel) { + public WidgetChannelListModel$Companion$guildListBuilder$4(Map map, WidgetChannelListModel$Companion$guildListBuilder$3 widgetChannelListModel$Companion$guildListBuilder$3) { super(1); this.$threadParentMap = map; - this.$selectedChannel = channel; + this.$isThreadUnread$3 = widgetChannelListModel$Companion$guildListBuilder$3; } /* Return type fixed from 'java.lang.Object' to match base method */ @@ -27,15 +27,13 @@ public final class WidgetChannelListModel$Companion$guildListBuilder$4 extends o public final boolean invoke(long j) { Collection collection = (Collection) this.$threadParentMap.get(Long.valueOf(j)); if (collection == null) { - return false; + return true; } for (Channel channel : collection) { - long h = channel.h(); - Channel channel2 = this.$selectedChannel; - if (channel2 != null && h == channel2.h()) { - return true; + if (this.$isThreadUnread$3.invoke(channel)) { + return false; } } - return false; + return true; } } diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$5.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$5.java new file mode 100644 index 0000000000..09aa244b13 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$5.java @@ -0,0 +1,41 @@ +package com.discord.widgets.channels.list; + +import com.discord.api.channel.Channel; +import d0.z.d.o; +import java.util.Collection; +import java.util.Map; +import kotlin.jvm.functions.Function1; +/* compiled from: WidgetChannelListModel.kt */ +public final class WidgetChannelListModel$Companion$guildListBuilder$5 extends o implements Function1 { + public final /* synthetic */ Channel $selectedChannel; + public final /* synthetic */ Map $threadParentMap; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public WidgetChannelListModel$Companion$guildListBuilder$5(Map map, Channel channel) { + super(1); + this.$threadParentMap = map; + this.$selectedChannel = channel; + } + + /* 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] */ + @Override // kotlin.jvm.functions.Function1 + public /* bridge */ /* synthetic */ Boolean invoke(Long l) { + return Boolean.valueOf(invoke(l.longValue())); + } + + public final boolean invoke(long j) { + Collection collection = (Collection) this.$threadParentMap.get(Long.valueOf(j)); + if (collection == null) { + return false; + } + for (Channel channel : collection) { + long h = channel.h(); + Channel channel2 = this.$selectedChannel; + if (channel2 != null && h == channel2.h()) { + return true; + } + } + return false; + } +} diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$5$7$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$6$7$1.java similarity index 84% rename from app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$5$7$1.java rename to app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$6$7$1.java index 00e4c06aa7..1263bb7a91 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$5$7$1.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$guildListBuilder$6$7$1.java @@ -4,10 +4,10 @@ import com.discord.widgets.channels.list.WidgetChannelListModel; import d0.z.d.o; import kotlin.jvm.functions.Function2; /* compiled from: WidgetChannelListModel.kt */ -public final class WidgetChannelListModel$Companion$guildListBuilder$5$7$1 extends o implements Function2 { - public static final WidgetChannelListModel$Companion$guildListBuilder$5$7$1 INSTANCE = new WidgetChannelListModel$Companion$guildListBuilder$5$7$1(); +public final class WidgetChannelListModel$Companion$guildListBuilder$6$7$1 extends o implements Function2 { + public static final WidgetChannelListModel$Companion$guildListBuilder$6$7$1 INSTANCE = new WidgetChannelListModel$Companion$guildListBuilder$6$7$1(); - public WidgetChannelListModel$Companion$guildListBuilder$5$7$1() { + public WidgetChannelListModel$Companion$guildListBuilder$6$7$1() { super(2); } diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel.java index 38b572f6de..3b7804874b 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelListModel.java @@ -452,7 +452,7 @@ public final class WidgetChannelListModel { */ private final java.util.List guildListBuilder(long r146, com.discord.utilities.channel.GuildChannelsInfo r148, java.util.Map r149, java.util.Map> r150, java.util.Set r151, com.discord.api.channel.Channel r152, long r153, java.util.Map> r155, java.util.Map r156, java.util.Set r157, java.util.Set r158, java.util.Map r159, java.util.Map r160, java.util.List r161, boolean r162) { /* - // Method dump skipped, instructions count: 1198 + // Method dump skipped, instructions count: 1225 */ throw new UnsupportedOperationException("Method not decompiled: com.discord.widgets.channels.list.WidgetChannelListModel.Companion.guildListBuilder(long, com.discord.utilities.channel.GuildChannelsInfo, java.util.Map, java.util.Map, java.util.Set, com.discord.api.channel.Channel, long, java.util.Map, java.util.Map, java.util.Set, java.util.Set, java.util.Map, java.util.Map, java.util.List, boolean):java.util.List"); } diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$7.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$7.java index 8e059cdb12..b02cbaef29 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$7.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$7.java @@ -1,14 +1,13 @@ package com.discord.widgets.channels.list; import androidx.fragment.app.FragmentManager; -import com.discord.api.channel.Channel; import com.discord.widgets.guildscheduledevent.WidgetGuildScheduledEventListBottomSheet; import d0.z.d.m; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: WidgetChannelsList.kt */ -public final class WidgetChannelsList$onViewBound$7 extends o implements Function1 { +public final class WidgetChannelsList$onViewBound$7 extends o implements Function1 { public final /* synthetic */ WidgetChannelsList this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ @@ -20,16 +19,15 @@ public final class WidgetChannelsList$onViewBound$7 extends o implements Functio /* 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] */ @Override // kotlin.jvm.functions.Function1 - public /* bridge */ /* synthetic */ Unit invoke(Channel channel) { - invoke(channel); + public /* bridge */ /* synthetic */ Unit invoke(Long l) { + invoke(l.longValue()); return Unit.a; } - public final void invoke(Channel channel) { - m.checkNotNullParameter(channel, "channel"); + public final void invoke(long j) { WidgetGuildScheduledEventListBottomSheet.Companion companion = WidgetGuildScheduledEventListBottomSheet.Companion; FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager(); m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager"); - WidgetGuildScheduledEventListBottomSheet.Companion.show$default(companion, parentFragmentManager, channel.f(), null, 4, null); + WidgetGuildScheduledEventListBottomSheet.Companion.show$default(companion, parentFragmentManager, j, null, 4, null); } } diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemGuildScheduledEvents$onConfigure$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemGuildScheduledEvents$onConfigure$1.java index b8d1074680..fa3ca773f0 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemGuildScheduledEvents$onConfigure$1.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemGuildScheduledEvents$onConfigure$1.java @@ -15,6 +15,6 @@ public final class WidgetChannelsListAdapter$ItemGuildScheduledEvents$onConfigur @Override // android.view.View.OnClickListener public final void onClick(View view) { - WidgetChannelsListAdapter.ItemGuildScheduledEvents.access$getAdapter$p(this.this$0).getOnViewGuildScheduledEvents().invoke(this.$item.getChannel()); + WidgetChannelsListAdapter.ItemGuildScheduledEvents.access$getAdapter$p(this.this$0).getOnViewGuildScheduledEvents().invoke(Long.valueOf(this.$item.getGuildId())); } } diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onViewGuildScheduledEvents$1.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onViewGuildScheduledEvents$1.java index 4c03d6d623..bbac183124 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onViewGuildScheduledEvents$1.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter$onViewGuildScheduledEvents$1.java @@ -1,12 +1,10 @@ package com.discord.widgets.channels.list; -import com.discord.api.channel.Channel; -import d0.z.d.m; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: WidgetChannelsListAdapter.kt */ -public final class WidgetChannelsListAdapter$onViewGuildScheduledEvents$1 extends o implements Function1 { +public final class WidgetChannelsListAdapter$onViewGuildScheduledEvents$1 extends o implements Function1 { public static final WidgetChannelsListAdapter$onViewGuildScheduledEvents$1 INSTANCE = new WidgetChannelsListAdapter$onViewGuildScheduledEvents$1(); public WidgetChannelsListAdapter$onViewGuildScheduledEvents$1() { @@ -16,12 +14,11 @@ public final class WidgetChannelsListAdapter$onViewGuildScheduledEvents$1 extend /* 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] */ @Override // kotlin.jvm.functions.Function1 - public /* bridge */ /* synthetic */ Unit invoke(Channel channel) { - invoke(channel); + public /* bridge */ /* synthetic */ Unit invoke(Long l) { + invoke(l.longValue()); return Unit.a; } - public final void invoke(Channel channel) { - m.checkNotNullParameter(channel, "it"); + public final void invoke(long j) { } } diff --git a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter.java b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter.java index 8bc9e7d02c..88035c46c8 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter.java +++ b/app/src/main/java/com/discord/widgets/channels/list/WidgetChannelsListAdapter.java @@ -104,7 +104,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple onSelectInvite = WidgetChannelsListAdapter$onSelectInvite$1.INSTANCE; private Function2 onSelectUserOptions = WidgetChannelsListAdapter$onSelectUserOptions$1.INSTANCE; private Function0 onViewGuildRoleSubscriptions = WidgetChannelsListAdapter$onViewGuildRoleSubscriptions$1.INSTANCE; - private Function1 onViewGuildScheduledEvents = WidgetChannelsListAdapter$onViewGuildScheduledEvents$1.INSTANCE; + private Function1 onViewGuildScheduledEvents = WidgetChannelsListAdapter$onViewGuildScheduledEvents$1.INSTANCE; private long selectedGuildId; /* compiled from: WidgetChannelsListAdapter.kt */ @@ -1190,6 +1190,9 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple, kotlin.jvm.functions.Function1 */ - public final Function1 getOnViewGuildScheduledEvents() { + /* JADX DEBUG: Type inference failed for r0v0. Raw type applied. Possible types: kotlin.jvm.functions.Function1, kotlin.jvm.functions.Function1 */ + public final Function1 getOnViewGuildScheduledEvents() { return this.onViewGuildScheduledEvents; } @@ -1781,7 +1785,7 @@ public final class WidgetChannelsListAdapter extends MGRecyclerAdapterSimple function1) { + public final void setOnViewGuildScheduledEvents(Function1 function1) { m.checkNotNullParameter(function1, ""); this.onViewGuildScheduledEvents = function1; } diff --git a/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemGuildScheduledEvents.java b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemGuildScheduledEvents.java index d9f75acb34..6fc4880ea2 100644 --- a/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemGuildScheduledEvents.java +++ b/app/src/main/java/com/discord/widgets/channels/list/items/ChannelListItemGuildScheduledEvents.java @@ -1,48 +1,46 @@ package com.discord.widgets.channels.list.items; +import a0.a.a.b; import c.d.b.a.a; -import com.discord.api.channel.Channel; import com.discord.api.guildscheduledevent.GuildScheduledEvent; import d0.z.d.m; import java.util.List; /* compiled from: ChannelListItemGuildScheduledEvents.kt */ public final class ChannelListItemGuildScheduledEvents implements ChannelListItem { - private final Channel channel; private final List data; + private final long guildId; private final String key = String.valueOf(getType()); private final int type = 19; - public ChannelListItemGuildScheduledEvents(List list, Channel channel) { + public ChannelListItemGuildScheduledEvents(List list, long j) { m.checkNotNullParameter(list, "data"); - m.checkNotNullParameter(channel, "channel"); this.data = list; - this.channel = channel; + this.guildId = j; } /* JADX DEBUG: Multi-variable search result rejected for r0v0, resolved type: com.discord.widgets.channels.list.items.ChannelListItemGuildScheduledEvents */ /* JADX WARN: Multi-variable type inference failed */ - public static /* synthetic */ ChannelListItemGuildScheduledEvents copy$default(ChannelListItemGuildScheduledEvents channelListItemGuildScheduledEvents, List list, Channel channel, int i, Object obj) { + public static /* synthetic */ ChannelListItemGuildScheduledEvents copy$default(ChannelListItemGuildScheduledEvents channelListItemGuildScheduledEvents, List list, long j, int i, Object obj) { if ((i & 1) != 0) { list = channelListItemGuildScheduledEvents.data; } if ((i & 2) != 0) { - channel = channelListItemGuildScheduledEvents.channel; + j = channelListItemGuildScheduledEvents.guildId; } - return channelListItemGuildScheduledEvents.copy(list, channel); + return channelListItemGuildScheduledEvents.copy(list, j); } public final List component1() { return this.data; } - public final Channel component2() { - return this.channel; + public final long component2() { + return this.guildId; } - public final ChannelListItemGuildScheduledEvents copy(List list, Channel channel) { + public final ChannelListItemGuildScheduledEvents copy(List list, long j) { m.checkNotNullParameter(list, "data"); - m.checkNotNullParameter(channel, "channel"); - return new ChannelListItemGuildScheduledEvents(list, channel); + return new ChannelListItemGuildScheduledEvents(list, j); } public boolean equals(Object obj) { @@ -53,17 +51,17 @@ public final class ChannelListItemGuildScheduledEvents implements ChannelListIte return false; } ChannelListItemGuildScheduledEvents channelListItemGuildScheduledEvents = (ChannelListItemGuildScheduledEvents) obj; - return m.areEqual(this.data, channelListItemGuildScheduledEvents.data) && m.areEqual(this.channel, channelListItemGuildScheduledEvents.channel); - } - - public final Channel getChannel() { - return this.channel; + return m.areEqual(this.data, channelListItemGuildScheduledEvents.data) && this.guildId == channelListItemGuildScheduledEvents.guildId; } public final List getData() { return this.data; } + public final long getGuildId() { + return this.guildId; + } + @Override // com.discord.widgets.channels.list.items.ChannelListItem, com.discord.utilities.mg_recycler.MGRecyclerDataPayload, com.discord.utilities.recycler.DiffKeyProvider public String getKey() { return this.key; @@ -76,21 +74,13 @@ public final class ChannelListItemGuildScheduledEvents implements ChannelListIte public int hashCode() { List list = this.data; - int i = 0; - int hashCode = (list != null ? list.hashCode() : 0) * 31; - Channel channel = this.channel; - if (channel != null) { - i = channel.hashCode(); - } - return hashCode + i; + return b.a(this.guildId) + ((list != null ? list.hashCode() : 0) * 31); } public String toString() { StringBuilder P = a.P("ChannelListItemGuildScheduledEvents(data="); P.append(this.data); - P.append(", channel="); - P.append(this.channel); - P.append(")"); - return P.toString(); + P.append(", guildId="); + return a.A(P, this.guildId, ")"); } } diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite.java index 77a5d26c29..490589ab69 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemInvite.java @@ -951,7 +951,7 @@ public final class WidgetChatListAdapterItemInvite extends WidgetChatListAdapter m.throwUninitializedPropertyAccessException("item"); } String eventId = inviteEntry2.getEventId(); - instantInvites.fetchInviteIfNotLoaded(inviteCode, eventId != null ? SnowflakeUtils.INSTANCE.toSnowflake(eventId) : null, "Invite Button Embed"); + StoreInstantInvites.fetchInviteIfNotLoaded$default(instantInvites, inviteCode, eventId != null ? SnowflakeUtils.INSTANCE.toSnowflake(eventId) : null, "Invite Button Embed", null, 8, null); ModelProvider modelProvider = ModelProvider.INSTANCE; InviteEntry inviteEntry3 = this.item; if (inviteEntry3 == null) { diff --git a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite.java b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite.java index 540cd8bb3c..8d6a09c179 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite.java +++ b/app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemStageInvite.java @@ -434,7 +434,7 @@ public final class WidgetChatListAdapterItemStageInvite extends WidgetChatListAd if (stageInviteEntry == null) { m.throwUninitializedPropertyAccessException("item"); } - StoreInstantInvites.fetchInviteIfNotLoaded$default(instantInvites, stageInviteEntry.getInviteCode(), null, "Invite Button Embed", 2, null); + StoreInstantInvites.fetchInviteIfNotLoaded$default(instantInvites, stageInviteEntry.getInviteCode(), null, "Invite Button Embed", null, 10, null); Model.Companion companion = Model.Companion; StageInviteEntry stageInviteEntry2 = this.item; if (stageInviteEntry2 == null) { diff --git a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel$onContactsFetched$1.java b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel$onContactsFetched$1.java index 607c57a21d..878c8809c1 100644 --- a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel$onContactsFetched$1.java +++ b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel$onContactsFetched$1.java @@ -1,30 +1,19 @@ package com.discord.widgets.contact_sync; +import com.discord.analytics.generated.events.network_action.TrackNetworkActionUserContactsSync; +import com.discord.analytics.generated.traits.TrackNetworkMetadataReceiver; import com.discord.api.friendsuggestions.BulkFriendSuggestions; -import d0.z.d.m; import d0.z.d.o; -import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: WidgetContactSyncViewModel.kt */ -public final class WidgetContactSyncViewModel$onContactsFetched$1 extends o implements Function1 { - public final /* synthetic */ WidgetContactSyncViewModel this$0; +public final class WidgetContactSyncViewModel$onContactsFetched$1 extends o implements Function1 { + public static final WidgetContactSyncViewModel$onContactsFetched$1 INSTANCE = new WidgetContactSyncViewModel$onContactsFetched$1(); - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public WidgetContactSyncViewModel$onContactsFetched$1(WidgetContactSyncViewModel widgetContactSyncViewModel) { + public WidgetContactSyncViewModel$onContactsFetched$1() { super(1); - this.this$0 = widgetContactSyncViewModel; } - /* 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] */ - @Override // kotlin.jvm.functions.Function1 - public /* bridge */ /* synthetic */ Unit invoke(BulkFriendSuggestions bulkFriendSuggestions) { - invoke(bulkFriendSuggestions); - return Unit.a; - } - - public final void invoke(BulkFriendSuggestions bulkFriendSuggestions) { - m.checkNotNullParameter(bulkFriendSuggestions, "it"); - WidgetContactSyncViewModel.access$handleFriendSuggestions(this.this$0, bulkFriendSuggestions); + public final TrackNetworkMetadataReceiver invoke(BulkFriendSuggestions bulkFriendSuggestions) { + return new TrackNetworkActionUserContactsSync(); } } diff --git a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel$onContactsFetched$2.java b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel$onContactsFetched$2.java index 47960d977c..7b8c159a25 100644 --- a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel$onContactsFetched$2.java +++ b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel$onContactsFetched$2.java @@ -1,12 +1,12 @@ package com.discord.widgets.contact_sync; -import com.discord.utilities.error.Error; +import com.discord.api.friendsuggestions.BulkFriendSuggestions; import d0.z.d.m; import d0.z.d.o; import kotlin.Unit; import kotlin.jvm.functions.Function1; /* compiled from: WidgetContactSyncViewModel.kt */ -public final class WidgetContactSyncViewModel$onContactsFetched$2 extends o implements Function1 { +public final class WidgetContactSyncViewModel$onContactsFetched$2 extends o implements Function1 { public final /* synthetic */ WidgetContactSyncViewModel this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ @@ -18,13 +18,13 @@ public final class WidgetContactSyncViewModel$onContactsFetched$2 extends o impl /* 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] */ @Override // kotlin.jvm.functions.Function1 - public /* bridge */ /* synthetic */ Unit invoke(Error error) { - invoke(error); + public /* bridge */ /* synthetic */ Unit invoke(BulkFriendSuggestions bulkFriendSuggestions) { + invoke(bulkFriendSuggestions); return Unit.a; } - public final void invoke(Error error) { - m.checkNotNullParameter(error, "it"); - WidgetContactSyncViewModel.access$handleUploadError(this.this$0, error); + public final void invoke(BulkFriendSuggestions bulkFriendSuggestions) { + m.checkNotNullParameter(bulkFriendSuggestions, "it"); + WidgetContactSyncViewModel.access$handleFriendSuggestions(this.this$0, bulkFriendSuggestions); } } diff --git a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel$onContactsFetched$3.java b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel$onContactsFetched$3.java new file mode 100644 index 0000000000..3b8a9d1eb7 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel$onContactsFetched$3.java @@ -0,0 +1,30 @@ +package com.discord.widgets.contact_sync; + +import com.discord.utilities.error.Error; +import d0.z.d.m; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function1; +/* compiled from: WidgetContactSyncViewModel.kt */ +public final class WidgetContactSyncViewModel$onContactsFetched$3 extends o implements Function1 { + public final /* synthetic */ WidgetContactSyncViewModel this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public WidgetContactSyncViewModel$onContactsFetched$3(WidgetContactSyncViewModel widgetContactSyncViewModel) { + super(1); + this.this$0 = widgetContactSyncViewModel; + } + + /* 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] */ + @Override // kotlin.jvm.functions.Function1 + public /* bridge */ /* synthetic */ Unit invoke(Error error) { + invoke(error); + return Unit.a; + } + + public final void invoke(Error error) { + m.checkNotNullParameter(error, "it"); + WidgetContactSyncViewModel.access$handleUploadError(this.this$0, error); + } +} diff --git a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel.java b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel.java index eaeb1a4934..61a553d039 100644 --- a/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel.java +++ b/app/src/main/java/com/discord/widgets/contact_sync/WidgetContactSyncViewModel.java @@ -1240,7 +1240,7 @@ public final class WidgetContactSyncViewModel extends AppViewModel { } RestAPIParams.UploadContacts uploadContacts = new RestAPIParams.UploadContacts(arrayList, false, AllowedInSuggestionsType.ANYONE_WITH_CONTACT_INFO); StoreStream.Companion.getContactSync().setContactSyncUploadTimestamp(ClockFactory.get().currentTimeMillis()); - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(this.restAPI.uploadContacts(uploadContacts), false, 1, null), this, null, 2, null), WidgetContactSyncViewModel.class, (Context) null, (Function1) null, new WidgetContactSyncViewModel$onContactsFetched$2(this), (Function0) null, (Function0) null, new WidgetContactSyncViewModel$onContactsFetched$1(this), 54, (Object) null); + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestCallStateKt.logNetworkAction(this.restAPI.uploadContacts(uploadContacts), WidgetContactSyncViewModel$onContactsFetched$1.INSTANCE), false, 1, null), this, null, 2, null), WidgetContactSyncViewModel.class, (Context) null, (Function1) null, new WidgetContactSyncViewModel$onContactsFetched$3(this), (Function0) null, (Function0) null, new WidgetContactSyncViewModel$onContactsFetched$2(this), 54, (Object) null); } } diff --git a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$createGuild$createGuildRequestObservable$1.java b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$createGuild$createGuildRequestObservable$1.java new file mode 100644 index 0000000000..2e9a58b545 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel$createGuild$createGuildRequestObservable$1.java @@ -0,0 +1,21 @@ +package com.discord.widgets.guilds.create; + +import com.discord.analytics.generated.events.network_action.TrackNetworkActionGuildCreate; +import com.discord.analytics.generated.traits.TrackNetworkMetadataReceiver; +import com.discord.api.guild.Guild; +import d0.z.d.o; +import kotlin.jvm.functions.Function1; +/* compiled from: WidgetGuildCreateViewModel.kt */ +public final class WidgetGuildCreateViewModel$createGuild$createGuildRequestObservable$1 extends o implements Function1 { + public final /* synthetic */ WidgetGuildCreateViewModel this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public WidgetGuildCreateViewModel$createGuild$createGuildRequestObservable$1(WidgetGuildCreateViewModel widgetGuildCreateViewModel) { + super(1); + this.this$0 = widgetGuildCreateViewModel; + } + + public final TrackNetworkMetadataReceiver invoke(Guild guild) { + return new TrackNetworkActionGuildCreate(WidgetGuildCreateViewModel.access$getStockGuildTemplate$p(this.this$0).name(), null); + } +} diff --git a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.java b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.java index fe89f93e41..03fefee637 100644 --- a/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.java +++ b/app/src/main/java/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.java @@ -15,6 +15,7 @@ import com.discord.stores.StoreGuildSelected; import com.discord.stores.StoreGuildTemplates; import com.discord.stores.StoreStream; import com.discord.stores.StoreUser; +import com.discord.stores.utilities.RestCallStateKt; import com.discord.utilities.analytics.AnalyticsTracker; import com.discord.utilities.rest.RestAPI; import com.discord.utilities.rx.ObservableExtensionsKt; @@ -588,6 +589,10 @@ public final class WidgetGuildCreateViewModel extends AppViewModel { } } + public static final /* synthetic */ StockGuildTemplate access$getStockGuildTemplate$p(WidgetGuildCreateViewModel widgetGuildCreateViewModel) { + return widgetGuildCreateViewModel.stockGuildTemplate; + } + public static final /* synthetic */ void access$handleGuildCreateFailure(WidgetGuildCreateViewModel widgetGuildCreateViewModel) { widgetGuildCreateViewModel.handleGuildCreateFailure(); } @@ -645,7 +650,7 @@ public final class WidgetGuildCreateViewModel extends AppViewModel { StockGuildTemplate stockGuildTemplate = this.stockGuildTemplate; Resources resources = context.getResources(); m.checkNotNullExpressionValue(resources, "context.resources"); - observable = restAPI.createGuild(new RestAPIParams.CreateGuild(guildName, guildIconUri, stockGuildTemplate.getChannels(resources), Long.valueOf(this.stockGuildTemplate.getSystemChannelId()))); + observable = RestCallStateKt.logNetworkAction(restAPI.createGuild(new RestAPIParams.CreateGuild(guildName, guildIconUri, stockGuildTemplate.getChannels(resources), Long.valueOf(this.stockGuildTemplate.getSystemChannelId()))), new WidgetGuildCreateViewModel$createGuild$createGuildRequestObservable$1(this)); } ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn(observable, false), this, null, 2, null), WidgetGuildCreateViewModel.class, (Context) null, (Function1) null, new WidgetGuildCreateViewModel$createGuild$2(this), (Function0) null, (Function0) null, new WidgetGuildCreateViewModel$createGuild$1(this), 54, (Object) null); updateViewState(ViewState.Initialized.copy$default(initialized, null, 0, null, null, null, true, null, 95, null)); diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite.java b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite.java index a1da60f2c9..0c1634a375 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite.java @@ -127,7 +127,7 @@ public final class WidgetGuildInvite extends AppFragment { return new j0.l.e.j(null); } StoreStream.Companion companion = StoreStream.Companion; - companion.getInstantInvites().fetchInviteIfNotLoaded(inviteCode.getInviteCode(), inviteCode.getEventId(), inviteCode.getSource()); + companion.getInstantInvites().fetchInviteIfNotLoaded(inviteCode.getInviteCode(), inviteCode.getEventId(), inviteCode.getSource(), Boolean.valueOf(this.inviteResolved)); return companion.getInstantInvites().observeInvite(ModelInvite.getInviteStoreKey(inviteCode.getInviteCode(), inviteCode.getEventId())).x(WidgetGuildInvite$getResolvedInviteOrDefault$1.INSTANCE); } diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildEventPromptListView.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildEventPromptListView.java index 322dfb3986..4977a22155 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildEventPromptListView.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildEventPromptListView.java @@ -4,7 +4,6 @@ import android.content.Context; import android.util.AttributeSet; import android.view.LayoutInflater; import android.widget.LinearLayout; -import c.a.k.b; import c.d.b.a.a; import com.discord.R; import com.discord.api.guildscheduledevent.GuildScheduledEvent; @@ -139,7 +138,8 @@ public final class GuildEventPromptListView extends LinearLayout { public final void configure(ScheduledEventData scheduledEventData, Function0 function0, Function0 function02) { GuildEventPromptView guildEventPromptView = this.binding.d; - int i = 8; + boolean z2 = true; + int i = 0; guildEventPromptView.setVisibility(function02 != null ? 0 : 8); String string = guildEventPromptView.getContext().getString(R.string.stage_channel_start_title); m.checkNotNullExpressionValue(string, "context.getString(R.stri…tage_channel_start_title)"); @@ -156,8 +156,11 @@ public final class GuildEventPromptListView extends LinearLayout { guildEventPromptView2.configure(R.drawable.ic_event_20dp, R.color.brand_new_500, string3, string4); guildEventPromptView2.setOnClickListener(new GuildEventPromptListView$configure$$inlined$apply$lambda$2(function0)); GuildEventPromptView guildEventPromptView3 = this.binding.f1631c; - if (scheduledEventData != null) { - i = 0; + if (scheduledEventData == null) { + z2 = false; + } + if (!z2) { + i = 8; } guildEventPromptView3.setVisibility(i); if (scheduledEventData != null) { @@ -165,9 +168,7 @@ public final class GuildEventPromptListView extends LinearLayout { String h = guildScheduledEvent.h(); Context context = guildEventPromptView3.getContext(); m.checkNotNullExpressionValue(context, "context"); - Context context2 = guildEventPromptView3.getContext(); - m.checkNotNullExpressionValue(context2, "context"); - guildEventPromptView3.configure(R.drawable.ic_event_20dp, R.color.status_green_600, h, b.h(context, R.string.guild_event_start_prompt_description, new Object[]{GuildScheduledEventUtilitiesKt.getEventStartingTimeString(guildScheduledEvent, context2)}, null, 4)); + guildEventPromptView3.configure(R.drawable.ic_event_20dp, R.color.status_green_600, h, GuildScheduledEventUtilitiesKt.getEventStartingTimeString(guildScheduledEvent, context)); guildEventPromptView3.setOnClickListener(new GuildEventPromptListView$configure$$inlined$apply$lambda$3(scheduledEventData)); } } diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventBottomButtonView$configure$5.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventBottomButtonView$configure$5.java new file mode 100644 index 0000000000..f596ca5ecd --- /dev/null +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventBottomButtonView$configure$5.java @@ -0,0 +1,18 @@ +package com.discord.widgets.guildscheduledevent; + +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +/* compiled from: GuildScheduledEventBottomButtonView.kt */ +public final class GuildScheduledEventBottomButtonView$configure$5 extends o implements Function0 { + public static final GuildScheduledEventBottomButtonView$configure$5 INSTANCE = new GuildScheduledEventBottomButtonView$configure$5(); + + public GuildScheduledEventBottomButtonView$configure$5() { + super(0); + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + } +} diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventBottomButtonView$configureInterestedButton$$inlined$apply$lambda$1.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventBottomButtonView$configureInterestedButton$$inlined$apply$lambda$1.java index cb78c15f8f..13d53d9d21 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventBottomButtonView$configureInterestedButton$$inlined$apply$lambda$1.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventBottomButtonView$configureInterestedButton$$inlined$apply$lambda$1.java @@ -6,20 +6,24 @@ import kotlin.jvm.functions.Function0; /* compiled from: GuildScheduledEventBottomButtonView.kt */ public final class GuildScheduledEventBottomButtonView$configureInterestedButton$$inlined$apply$lambda$1 implements View.OnClickListener { public final /* synthetic */ boolean $isRsvped$inlined; + public final /* synthetic */ Function0 $onEndEventButtonClicked$inlined; public final /* synthetic */ Function0 $onJoinButtonClicked$inlined; public final /* synthetic */ Function0 $onRsvpButtonClicked$inlined; public final /* synthetic */ GuildScheduledEventBottomButtonView.VisibilityInfo $visibilityInfo$inlined; - public GuildScheduledEventBottomButtonView$configureInterestedButton$$inlined$apply$lambda$1(GuildScheduledEventBottomButtonView.VisibilityInfo visibilityInfo, boolean z2, Function0 function0, Function0 function02) { + public GuildScheduledEventBottomButtonView$configureInterestedButton$$inlined$apply$lambda$1(GuildScheduledEventBottomButtonView.VisibilityInfo visibilityInfo, boolean z2, Function0 function0, Function0 function02, Function0 function03) { this.$visibilityInfo$inlined = visibilityInfo; this.$isRsvped$inlined = z2; - this.$onJoinButtonClicked$inlined = function0; - this.$onRsvpButtonClicked$inlined = function02; + this.$onEndEventButtonClicked$inlined = function0; + this.$onJoinButtonClicked$inlined = function02; + this.$onRsvpButtonClicked$inlined = function03; } @Override // android.view.View.OnClickListener public final void onClick(View view) { - if (this.$visibilityInfo$inlined.isEventActive()) { + if (this.$visibilityInfo$inlined.isEventEndable()) { + this.$onEndEventButtonClicked$inlined.mo1invoke(); + } else if (this.$visibilityInfo$inlined.isEventActive()) { this.$onJoinButtonClicked$inlined.mo1invoke(); } else { this.$onRsvpButtonClicked$inlined.mo1invoke(); diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventBottomButtonView.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventBottomButtonView.java index 767f1f797e..3bb791e9c8 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventBottomButtonView.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventBottomButtonView.java @@ -10,6 +10,7 @@ import c.a.k.b; import c.d.b.a.a; import com.discord.R; import com.discord.api.guildscheduledevent.GuildScheduledEvent; +import com.discord.api.guildscheduledevent.GuildScheduledEventEntityType; import com.discord.api.guildscheduledevent.GuildScheduledEventStatus; import com.discord.databinding.GuildScheduledEventBottomButtonViewBinding; import com.discord.utilities.color.ColorCompat; @@ -32,6 +33,7 @@ public final class GuildScheduledEventBottomButtonView extends ConstraintLayout private final boolean isAnyButtonVisible; private final boolean isEventActive; private final boolean isEventComplete; + private final boolean isEventEndable; private final boolean isShareVisible; private final boolean isStartEventVisible; private final boolean primaryInteractionButtonVisible; @@ -49,12 +51,14 @@ public final class GuildScheduledEventBottomButtonView extends ConstraintLayout boolean z6 = guildScheduledEvent.k() == GuildScheduledEventStatus.COMPLETED; this.isEventComplete = z6; this.primaryInteractionButtonVisible = z2; - boolean isStartable = !z4 ? false : eventTiming.isStartable(); + boolean isStartable = (!z4 || z6) ? false : eventTiming.isStartable(); this.isStartEventVisible = isStartable; - this.isEventActive = eventTiming == GuildScheduledEventTiming.LIVE; - boolean z7 = z3 && !z6; - this.isShareVisible = z7; - if (!z2 && !isStartable && !z7) { + boolean z7 = eventTiming == GuildScheduledEventTiming.LIVE; + this.isEventActive = z7; + this.isEventEndable = z7 && guildScheduledEvent.e() == GuildScheduledEventEntityType.EXTERNAL; + boolean z8 = z3 && !z6; + this.isShareVisible = z8; + if (!z2 && !isStartable && !z8) { z5 = false; } this.isAnyButtonVisible = z5; @@ -171,6 +175,10 @@ public final class GuildScheduledEventBottomButtonView extends ConstraintLayout return this.isEventComplete; } + public final boolean isEventEndable() { + return this.isEventEndable; + } + public final boolean isShareVisible() { return this.isShareVisible; } @@ -220,7 +228,7 @@ public final class GuildScheduledEventBottomButtonView extends ConstraintLayout this.binding = a; } - public static /* synthetic */ void configure$default(GuildScheduledEventBottomButtonView guildScheduledEventBottomButtonView, GuildScheduledEvent guildScheduledEvent, boolean z2, boolean z3, boolean z4, boolean z5, Function0 function0, Function0 function02, Function0 function03, Function0 function04, int i, Object obj) { + public static /* synthetic */ void configure$default(GuildScheduledEventBottomButtonView guildScheduledEventBottomButtonView, GuildScheduledEvent guildScheduledEvent, boolean z2, boolean z3, boolean z4, boolean z5, Function0 function0, Function0 function02, Function0 function03, Function0 function04, Function0 function05, int i, Object obj) { boolean z6 = false; boolean z7 = (i & 2) != 0 ? false : z2; boolean z8 = (i & 4) != 0 ? false : z3; @@ -228,29 +236,38 @@ public final class GuildScheduledEventBottomButtonView extends ConstraintLayout if ((i & 16) == 0) { z6 = z5; } - guildScheduledEventBottomButtonView.configure(guildScheduledEvent, z7, z8, z9, z6, (i & 32) != 0 ? GuildScheduledEventBottomButtonView$configure$1.INSTANCE : function0, (i & 64) != 0 ? GuildScheduledEventBottomButtonView$configure$2.INSTANCE : function02, (i & 128) != 0 ? GuildScheduledEventBottomButtonView$configure$3.INSTANCE : function03, (i & 256) != 0 ? GuildScheduledEventBottomButtonView$configure$4.INSTANCE : function04); + guildScheduledEventBottomButtonView.configure(guildScheduledEvent, z7, z8, z9, z6, (i & 32) != 0 ? GuildScheduledEventBottomButtonView$configure$1.INSTANCE : function0, (i & 64) != 0 ? GuildScheduledEventBottomButtonView$configure$2.INSTANCE : function02, (i & 128) != 0 ? GuildScheduledEventBottomButtonView$configure$3.INSTANCE : function03, (i & 256) != 0 ? GuildScheduledEventBottomButtonView$configure$4.INSTANCE : function04, (i & 512) != 0 ? GuildScheduledEventBottomButtonView$configure$5.INSTANCE : function05); } - private final void configureInterestedButton(VisibilityInfo visibilityInfo, boolean z2, Function0 function0, Function0 function02) { + private final void configureInterestedButton(VisibilityInfo visibilityInfo, boolean z2, Function0 function0, Function0 function02, Function0 function03) { ImageView imageView = this.binding.f1633c; int i = 8; imageView.setVisibility(visibilityInfo.getPrimaryInteractionButtonVisible() ? 0 : 8); - imageView.setImageResource(visibilityInfo.isEventActive() ? R.drawable.bg_guild_scheduled_event_list_item_interested_button_active : z2 ? R.drawable.bg_guild_scheduled_event_list_item_interested_button_interested : R.drawable.bg_guild_scheduled_event_list_item_interested_button_default); - imageView.setOnClickListener(new GuildScheduledEventBottomButtonView$configureInterestedButton$$inlined$apply$lambda$1(visibilityInfo, z2, function02, function0)); + boolean isEventEndable = visibilityInfo.isEventEndable(); + int i2 = R.drawable.bg_guild_scheduled_event_list_item_interested_button_default; + if (!isEventEndable && !visibilityInfo.isEventComplete()) { + if (visibilityInfo.isEventActive()) { + i2 = R.drawable.bg_guild_scheduled_event_list_item_interested_button_active; + } else if (z2) { + i2 = R.drawable.bg_guild_scheduled_event_list_item_interested_button_interested; + } + } + imageView.setImageResource(i2); + imageView.setOnClickListener(new GuildScheduledEventBottomButtonView$configureInterestedButton$$inlined$apply$lambda$1(visibilityInfo, z2, function03, function02, function0)); imageView.setEnabled(!visibilityInfo.isEventComplete()); TextView textView = this.binding.d; if (visibilityInfo.getPrimaryInteractionButtonVisible()) { i = 0; } textView.setVisibility(i); - int color = (!z2 || visibilityInfo.isEventActive() || visibilityInfo.isEventComplete()) ? visibilityInfo.isEventComplete() ? ColorCompat.getColor(textView.getContext(), (int) R.color.white_alpha_40) : ColorCompat.getColor(textView.getContext(), (int) R.color.white) : ColorCompat.getThemedColor(textView.getContext(), (int) R.attr.colorControlBrandForegroundNew); - int i2 = (visibilityInfo.isEventActive() || visibilityInfo.isEventComplete()) ? 0 : z2 ? R.drawable.ic_check_brand_16dp : R.drawable.ic_bell_16dp; - int i3 = visibilityInfo.isEventActive() ? R.string.stage_channel_join_button : visibilityInfo.isEventComplete() ? R.string.guild_event_invite_completed : R.string.stage_instance_interested_label; - DrawableCompat.setCompoundDrawablesCompat$default(textView, i2, 0, 0, 0, 14, (Object) null); + int color = (!z2 || visibilityInfo.isEventActive() || visibilityInfo.isEventComplete() || visibilityInfo.isEventEndable()) ? visibilityInfo.isEventComplete() ? ColorCompat.getColor(textView.getContext(), (int) R.color.white_alpha_40) : ColorCompat.getColor(textView.getContext(), (int) R.color.white) : ColorCompat.getThemedColor(textView.getContext(), (int) R.attr.colorControlBrandForegroundNew); + int i3 = (visibilityInfo.isEventActive() || visibilityInfo.isEventEndable() || visibilityInfo.isEventComplete()) ? 0 : z2 ? R.drawable.ic_check_brand_16dp : R.drawable.ic_bell_16dp; + int i4 = visibilityInfo.isEventEndable() ? R.string.end_event : visibilityInfo.isEventActive() ? R.string.stage_channel_join_button : visibilityInfo.isEventComplete() ? R.string.guild_event_invite_completed : R.string.stage_instance_interested_label; + DrawableCompat.setCompoundDrawablesCompat$default(textView, i3, 0, 0, 0, 14, (Object) null); textView.setTextColor(color); Context context = textView.getContext(); m.checkNotNullExpressionValue(context, "context"); - textView.setText(b.h(context, i3, new Object[0], null, 4)); + textView.setText(b.h(context, i4, new Object[0], null, 4)); } private final void configureShareButton(VisibilityInfo visibilityInfo, Function0 function0) { @@ -273,24 +290,26 @@ public final class GuildScheduledEventBottomButtonView extends ConstraintLayout imageView.setOnClickListener(new GuildScheduledEventBottomButtonView$configureStartEventButton$$inlined$apply$lambda$1(visibilityInfo, function0)); } - public final void configure(GuildScheduledEvent guildScheduledEvent, boolean z2, boolean z3, boolean z4, boolean z5, Function0 function0, Function0 function02, Function0 function03, Function0 function04) { + public final void configure(GuildScheduledEvent guildScheduledEvent, boolean z2, boolean z3, boolean z4, boolean z5, Function0 function0, Function0 function02, Function0 function03, Function0 function04, Function0 function05) { m.checkNotNullParameter(guildScheduledEvent, "guildScheduledEvent"); m.checkNotNullParameter(function0, "onRsvpButtonClicked"); m.checkNotNullParameter(function02, "onStartEventButtonClicked"); m.checkNotNullParameter(function03, "onShareButtonClicked"); m.checkNotNullParameter(function04, "onJoinButtonClicked"); + m.checkNotNullParameter(function05, "onEndEventButtonClicked"); VisibilityInfo visibilityInfo = new VisibilityInfo(guildScheduledEvent, z3, z4, z5); configureStartEventButton(visibilityInfo, function02); - configureInterestedButton(visibilityInfo, z2, function0, function04); + configureInterestedButton(visibilityInfo, z2, function0, function04, function05); configureShareButton(visibilityInfo, function03); } - public final void configureForDetails(GuildScheduledEvent guildScheduledEvent, boolean z2, boolean z3, boolean z4, boolean z5, Function0 function0, Function0 function02, Function0 function03, Function0 function04, Function0 function05) { + public final void configureForDetails(GuildScheduledEvent guildScheduledEvent, boolean z2, boolean z3, boolean z4, boolean z5, Function0 function0, Function0 function02, Function0 function03, Function0 function04, Function0 function05, Function0 function06) { m.checkNotNullParameter(guildScheduledEvent, "guildScheduledEvent"); m.checkNotNullParameter(function0, "onStartEventButtonClicked"); m.checkNotNullParameter(function02, "onRsvpButtonClicked"); m.checkNotNullParameter(function03, "onShareButtonClicked"); m.checkNotNullParameter(function05, "onJoinButtonClicked"); + m.checkNotNullParameter(function06, "onEndEventButtonClicked"); boolean z6 = true; VisibilityInfo visibilityInfo = new VisibilityInfo(guildScheduledEvent, true, z3, z4); configureStartEventButton(visibilityInfo, function0); @@ -303,7 +322,7 @@ public final class GuildScheduledEventBottomButtonView extends ConstraintLayout m.checkNotNullExpressionValue(textView, "binding.interestedButtonText"); textView.setVisibility(8); } else { - configureInterestedButton(visibilityInfo, z2, function02, function05); + configureInterestedButton(visibilityInfo, z2, function02, function05, function06); } configureShareButton(visibilityInfo, function03); ImageView imageView2 = this.binding.b; diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView$configureInternal$5.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView$configureInternal$5.java index 20c634b4c4..c0989677b9 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView$configureInternal$5.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView$configureInternal$5.java @@ -1,17 +1,18 @@ package com.discord.widgets.guildscheduledevent; -import android.view.View; +import d0.z.d.o; +import kotlin.Unit; import kotlin.jvm.functions.Function0; /* compiled from: GuildScheduledEventItemView.kt */ -public final class GuildScheduledEventItemView$configureInternal$5 implements View.OnClickListener { - public final /* synthetic */ Function0 $onCardClicked; +public final class GuildScheduledEventItemView$configureInternal$5 extends o implements Function0 { + public static final GuildScheduledEventItemView$configureInternal$5 INSTANCE = new GuildScheduledEventItemView$configureInternal$5(); - public GuildScheduledEventItemView$configureInternal$5(Function0 function0) { - this.$onCardClicked = function0; + public GuildScheduledEventItemView$configureInternal$5() { + super(0); } - @Override // android.view.View.OnClickListener - public final void onClick(View view) { - this.$onCardClicked.mo1invoke(); + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { } } diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView$configureInternal$6.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView$configureInternal$6.java new file mode 100644 index 0000000000..ab7d0ee72c --- /dev/null +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView$configureInternal$6.java @@ -0,0 +1,17 @@ +package com.discord.widgets.guildscheduledevent; + +import android.view.View; +import kotlin.jvm.functions.Function0; +/* compiled from: GuildScheduledEventItemView.kt */ +public final class GuildScheduledEventItemView$configureInternal$6 implements View.OnClickListener { + public final /* synthetic */ Function0 $onCardClicked; + + public GuildScheduledEventItemView$configureInternal$6(Function0 function0) { + this.$onCardClicked = function0; + } + + @Override // android.view.View.OnClickListener + public final void onClick(View view) { + this.$onCardClicked.mo1invoke(); + } +} diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView.java index d24d63f4e4..94ddb9d17d 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventItemView.java @@ -131,11 +131,11 @@ public final class GuildScheduledEventItemView extends ConstraintLayout { guildScheduledEventItemView.configureInChatList(guildScheduledEvent, channel, guild, z2, z3, function0, (i & 64) != 0 ? GuildScheduledEventItemView$configureInChatList$1.INSTANCE : function02, (i & 128) != 0 ? GuildScheduledEventItemView$configureInChatList$2.INSTANCE : function03, function04); } - private final void configureInternal(GuildScheduledEvent guildScheduledEvent, GuildScheduledEventLocationInfo guildScheduledEventLocationInfo, Guild guild, boolean z2, boolean z3, boolean z4, boolean z5, Function0 function0, Function0 function02, Function0 function03, Function0 function04, Function0 function05) { + private final void configureInternal(GuildScheduledEvent guildScheduledEvent, GuildScheduledEventLocationInfo guildScheduledEventLocationInfo, Guild guild, boolean z2, boolean z3, boolean z4, boolean z5, Function0 function0, Function0 function02, Function0 function03, Function0 function04, Function0 function05, Function0 function06) { GuildScheduledEventBottomButtonView guildScheduledEventBottomButtonView = this.binding.b; m.checkNotNullExpressionValue(guildScheduledEventBottomButtonView, "binding.guildScheduledEventListItemButtomView"); guildScheduledEventBottomButtonView.setVisibility(new GuildScheduledEventBottomButtonView.VisibilityInfo(guildScheduledEvent, z3, z5, z4).isAnyButtonVisible() ? 0 : 8); - this.binding.b.configure(guildScheduledEvent, z2, z3, z5, z4, function02, function03, function04, function05); + this.binding.b.configure(guildScheduledEvent, z2, z3, z5, z4, function02, function03, function04, function05, function06); TextView textView = this.binding.j; m.checkNotNullExpressionValue(textView, "binding.guildScheduledEventListItemRsvpText"); Integer l = guildScheduledEvent.l(); @@ -147,12 +147,12 @@ public final class GuildScheduledEventItemView extends ConstraintLayout { configureDescription(guildScheduledEvent.c()); configureLocation(guildScheduledEventLocationInfo, guild); if (function0 != null) { - this.binding.a.setOnClickListener(new GuildScheduledEventItemView$configureInternal$5(function0)); + this.binding.a.setOnClickListener(new GuildScheduledEventItemView$configureInternal$6(function0)); } } - public static /* synthetic */ void configureInternal$default(GuildScheduledEventItemView guildScheduledEventItemView, GuildScheduledEvent guildScheduledEvent, GuildScheduledEventLocationInfo guildScheduledEventLocationInfo, Guild guild, boolean z2, boolean z3, boolean z4, boolean z5, Function0 function0, Function0 function02, Function0 function03, Function0 function04, Function0 function05, int i, Object obj) { - guildScheduledEventItemView.configureInternal(guildScheduledEvent, guildScheduledEventLocationInfo, guild, z2, z3, z4, z5, function0, (i & 256) != 0 ? GuildScheduledEventItemView$configureInternal$1.INSTANCE : function02, (i & 512) != 0 ? GuildScheduledEventItemView$configureInternal$2.INSTANCE : function03, (i & 1024) != 0 ? GuildScheduledEventItemView$configureInternal$3.INSTANCE : function04, (i & 2048) != 0 ? GuildScheduledEventItemView$configureInternal$4.INSTANCE : function05); + public static /* synthetic */ void configureInternal$default(GuildScheduledEventItemView guildScheduledEventItemView, GuildScheduledEvent guildScheduledEvent, GuildScheduledEventLocationInfo guildScheduledEventLocationInfo, Guild guild, boolean z2, boolean z3, boolean z4, boolean z5, Function0 function0, Function0 function02, Function0 function03, Function0 function04, Function0 function05, Function0 function06, int i, Object obj) { + guildScheduledEventItemView.configureInternal(guildScheduledEvent, guildScheduledEventLocationInfo, guild, z2, z3, z4, z5, function0, (i & 256) != 0 ? GuildScheduledEventItemView$configureInternal$1.INSTANCE : function02, (i & 512) != 0 ? GuildScheduledEventItemView$configureInternal$2.INSTANCE : function03, (i & 1024) != 0 ? GuildScheduledEventItemView$configureInternal$3.INSTANCE : function04, (i & 2048) != 0 ? GuildScheduledEventItemView$configureInternal$4.INSTANCE : function05, (i & 4096) != 0 ? GuildScheduledEventItemView$configureInternal$5.INSTANCE : function06); } private final void configureLocation(GuildScheduledEventLocationInfo guildScheduledEventLocationInfo, Guild guild) { @@ -264,7 +264,7 @@ public final class GuildScheduledEventItemView extends ConstraintLayout { m.checkNotNullParameter(function02, "rsvpButtonClickListener"); m.checkNotNullParameter(function03, "joinServerButtonClickListener"); m.checkNotNullParameter(function04, "shareButtonClickListener"); - configureInternal$default(this, guildScheduledEvent, GuildScheduledEventLocationInfo.Companion.buildLocationInfo(guildScheduledEvent, channel), guild, z3, true, false, true, function0, function02, function03, function04, null, 2048, null); + configureInternal$default(this, guildScheduledEvent, GuildScheduledEventLocationInfo.Companion.buildLocationInfo(guildScheduledEvent, channel), guild, z3, true, false, true, function0, function02, function03, function04, null, null, 6144, null); ConstraintLayout constraintLayout = this.binding.a; m.checkNotNullExpressionValue(constraintLayout, "binding.root"); constraintLayout.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.bg_guild_scheduled_event_list_item_secondary)); @@ -295,21 +295,22 @@ public final class GuildScheduledEventItemView extends ConstraintLayout { textView4.setVisibility(i); } - public final void configureInEventList(GuildScheduledEventListItem.Event event, Function0 function0, Function0 function02, Function0 function03, Function0 function04, Function0 function05) { + public final void configureInEventList(GuildScheduledEventListItem.Event event, Function0 function0, Function0 function02, Function0 function03, Function0 function04, Function0 function05, Function0 function06) { m.checkNotNullParameter(event, "item"); m.checkNotNullParameter(function0, "cardClickListener"); m.checkNotNullParameter(function02, "rsvpButtonClickListener"); m.checkNotNullParameter(function03, "eventStartButtonClickListener"); m.checkNotNullParameter(function04, "shareButtonClickListener"); m.checkNotNullParameter(function05, "joinButtonClickListener"); - configureInternal(event.getEvent(), GuildScheduledEventLocationInfo.Companion.buildLocationInfo(event.getEvent(), event.getChannel()), null, event.isRsvped(), true, event.getCanStartEvent(), event.getCanShare(), function0, function02, function03, function04, function05); + m.checkNotNullParameter(function06, "endEventButtonClickListener"); + configureInternal(event.getEvent(), GuildScheduledEventLocationInfo.Companion.buildLocationInfo(event.getEvent(), event.getChannel()), null, event.isRsvped(), true, event.getCanStartEvent(), event.getCanShare(), function0, function02, function03, function04, function05, function06); } public final void configureInVoiceChannel(GuildScheduledEvent guildScheduledEvent, boolean z2, boolean z3, Function0 function0, Function0 function02) { m.checkNotNullParameter(guildScheduledEvent, "guildScheduledEvent"); m.checkNotNullParameter(function0, "onCardClicked"); m.checkNotNullParameter(function02, "onStartEventButtonClicked"); - configureInternal(guildScheduledEvent, null, null, false, false, z2, false, function0, GuildScheduledEventItemView$configureInVoiceChannel$1.INSTANCE, function02, GuildScheduledEventItemView$configureInVoiceChannel$2.INSTANCE, GuildScheduledEventItemView$configureInVoiceChannel$3.INSTANCE); + configureInternal$default(this, guildScheduledEvent, null, null, false, false, z2, false, function0, GuildScheduledEventItemView$configureInVoiceChannel$1.INSTANCE, function02, GuildScheduledEventItemView$configureInVoiceChannel$2.INSTANCE, GuildScheduledEventItemView$configureInVoiceChannel$3.INSTANCE, null, 4096, null); ConstraintLayout constraintLayout = this.binding.a; m.checkNotNullExpressionValue(constraintLayout, "binding.root"); constraintLayout.setBackground(ContextCompat.getDrawable(getContext(), R.drawable.bg_guild_scheduled_event_list_item_secondary)); diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListAdapter$EventViewHolder$onConfigure$6.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListAdapter$EventViewHolder$onConfigure$6.java new file mode 100644 index 0000000000..4b1286d07f --- /dev/null +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListAdapter$EventViewHolder$onConfigure$6.java @@ -0,0 +1,51 @@ +package com.discord.widgets.guildscheduledevent; + +import android.content.Context; +import com.discord.utilities.rx.ObservableExtensionsKt; +import com.discord.widgets.guildscheduledevent.GuildScheduledEventListAdapter; +import com.discord.widgets.guildscheduledevent.GuildScheduledEventListItem; +import d0.z.d.m; +import d0.z.d.o; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; +import kotlin.jvm.functions.Function1; +/* compiled from: GuildScheduledEventListAdapter.kt */ +public final class GuildScheduledEventListAdapter$EventViewHolder$onConfigure$6 extends o implements Function0 { + public final /* synthetic */ GuildScheduledEventListItem.Event $item; + public final /* synthetic */ GuildScheduledEventListAdapter.EventViewHolder this$0; + + /* compiled from: GuildScheduledEventListAdapter.kt */ + /* renamed from: com.discord.widgets.guildscheduledevent.GuildScheduledEventListAdapter$EventViewHolder$onConfigure$6$1 reason: invalid class name */ + public static final class AnonymousClass1 extends o implements Function1 { + public static final AnonymousClass1 INSTANCE = new AnonymousClass1(); + + public AnonymousClass1() { + super(1); + } + + /* 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] */ + @Override // kotlin.jvm.functions.Function1 + public /* bridge */ /* synthetic */ Unit invoke(Unit unit) { + invoke(unit); + return Unit.a; + } + + public final void invoke(Unit unit) { + m.checkNotNullParameter(unit, "it"); + } + } + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public GuildScheduledEventListAdapter$EventViewHolder$onConfigure$6(GuildScheduledEventListAdapter.EventViewHolder eventViewHolder, GuildScheduledEventListItem.Event event) { + super(0); + this.this$0 = eventViewHolder; + this.$item = event; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(GuildScheduledEventAPI.INSTANCE.endEvent(this.$item.getEvent().g()), false, 1, null), this.this$0.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, AnonymousClass1.INSTANCE, 62, (Object) null); + } +} diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListAdapter.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListAdapter.java index dbaefa87ae..9bfd0c4989 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListAdapter.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventListAdapter.java @@ -45,7 +45,7 @@ public final class GuildScheduledEventListAdapter extends MGRecyclerAdapterSimpl m.checkNotNullParameter(guildScheduledEventListItem, "data"); super.onConfigure(i, (int) guildScheduledEventListItem); GuildScheduledEventListItem.Event event = (GuildScheduledEventListItem.Event) guildScheduledEventListItem; - this.binding.b.configureInEventList(event, new GuildScheduledEventListAdapter$EventViewHolder$onConfigure$1(this, event), new GuildScheduledEventListAdapter$EventViewHolder$onConfigure$2(this, event), new GuildScheduledEventListAdapter$EventViewHolder$onConfigure$3(this, event), new GuildScheduledEventListAdapter$EventViewHolder$onConfigure$4(this, event), new GuildScheduledEventListAdapter$EventViewHolder$onConfigure$5(this, event)); + this.binding.b.configureInEventList(event, new GuildScheduledEventListAdapter$EventViewHolder$onConfigure$1(this, event), new GuildScheduledEventListAdapter$EventViewHolder$onConfigure$2(this, event), new GuildScheduledEventListAdapter$EventViewHolder$onConfigure$3(this, event), new GuildScheduledEventListAdapter$EventViewHolder$onConfigure$4(this, event), new GuildScheduledEventListAdapter$EventViewHolder$onConfigure$5(this, event), new GuildScheduledEventListAdapter$EventViewHolder$onConfigure$6(this, event)); } } diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventModel.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventModel.java index 6322ef176f..8c06ace23b 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventModel.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventModel.java @@ -2,10 +2,13 @@ package com.discord.widgets.guildscheduledevent; import a0.a.a.b; import c.d.b.a.a; +import com.discord.api.guildscheduledevent.GuildScheduledEvent; import com.discord.api.guildscheduledevent.GuildScheduledEventEntityMetadata; import com.discord.api.guildscheduledevent.GuildScheduledEventEntityType; import com.discord.api.stageinstance.StageInstancePrivacyLevel; +import com.discord.api.utcdatetime.UtcDateTime; import com.discord.restapi.RestAPIParams; +import com.discord.utilities.time.TimeUtils; import d0.z.d.m; import java.io.Serializable; /* compiled from: GuildScheduledEventModel.kt */ @@ -221,19 +224,22 @@ public final class GuildScheduledEventModel implements Serializable { return a.E(P, this.userCount, ")"); } - public final RestAPIParams.UpdateGuildScheduledEventBody toUpdateRequestBody() { + public final RestAPIParams.UpdateGuildScheduledEventBody toUpdateRequestBody(GuildScheduledEvent guildScheduledEvent) { GuildScheduledEventPickerTime guildScheduledEventPickerTime; + m.checkNotNullParameter(guildScheduledEvent, "currentEvent"); String str = this.name; - String str2 = null; if (str == null) { return null; } GuildScheduledEventPickerDateTime guildScheduledEventPickerDateTime = GuildScheduledEventPickerDateTime.INSTANCE; - String utcDateString = guildScheduledEventPickerDateTime.toUtcDateString(this.startDate, this.startTime); + long millis = guildScheduledEventPickerDateTime.toMillis(this.startDate, this.startTime); GuildScheduledEventPickerDate guildScheduledEventPickerDate = this.endDate; - if (!(guildScheduledEventPickerDate == null || (guildScheduledEventPickerTime = this.endTime) == null)) { - str2 = guildScheduledEventPickerDateTime.toUtcDateString(guildScheduledEventPickerDate, guildScheduledEventPickerTime); - } - return new RestAPIParams.UpdateGuildScheduledEventBody(str, this.description, StageInstancePrivacyLevel.GUILD_ONLY, utcDateString, str2, this.channelId, this.entityMetadata, null, 128, null); + Long valueOf = (guildScheduledEventPickerDate == null || (guildScheduledEventPickerTime = this.endTime) == null) ? null : Long.valueOf(guildScheduledEventPickerDateTime.toMillis(guildScheduledEventPickerDate, guildScheduledEventPickerTime)); + Long l = this.channelId; + String str2 = this.description; + StageInstancePrivacyLevel stageInstancePrivacyLevel = StageInstancePrivacyLevel.GUILD_ONLY; + String uTCDateTime$default = guildScheduledEvent.j().g() == millis ? null : TimeUtils.toUTCDateTime$default(Long.valueOf(millis), null, 2, null); + UtcDateTime i = guildScheduledEvent.i(); + return new RestAPIParams.UpdateGuildScheduledEventBody(str, str2, stageInstancePrivacyLevel, uTCDateTime$default, m.areEqual(i != null ? Long.valueOf(i.g()) : null, valueOf) ? null : TimeUtils.toUTCDateTime$default(valueOf, null, 2, null), l, this.entityMetadata, null, 128, null); } } diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventPickerDateTime.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventPickerDateTime.java index 82bfa9e2e3..626f4b1d42 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventPickerDateTime.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventPickerDateTime.java @@ -13,7 +13,7 @@ public final class GuildScheduledEventPickerDateTime { } private final Pair toGuildScheduledEventPickerDateTime(Calendar calendar) { - return new Pair<>(new GuildScheduledEventPickerDate(calendar.get(1), calendar.get(2), calendar.get(5)), new GuildScheduledEventPickerTime(calendar.get(11), calendar.get(12))); + return new Pair<>(new GuildScheduledEventPickerDate(calendar.get(1), calendar.get(2), calendar.get(5)), new GuildScheduledEventPickerTime(calendar.get(11), calendar.get(12), calendar.get(13))); } public final Pair fromUtcDateTime(UtcDateTime utcDateTime) { @@ -35,7 +35,7 @@ public final class GuildScheduledEventPickerDateTime { m.checkNotNullParameter(guildScheduledEventPickerDate, "startDate"); m.checkNotNullParameter(guildScheduledEventPickerTime, "startTime"); Calendar instance = Calendar.getInstance(); - instance.set(guildScheduledEventPickerDate.getYear(), guildScheduledEventPickerDate.getMonth(), guildScheduledEventPickerDate.getDayOfMonth(), guildScheduledEventPickerTime.getHourOfDay(), guildScheduledEventPickerTime.getMinute()); + instance.set(guildScheduledEventPickerDate.getYear(), guildScheduledEventPickerDate.getMonth(), guildScheduledEventPickerDate.getDayOfMonth(), guildScheduledEventPickerTime.getHourOfDay(), guildScheduledEventPickerTime.getMinute(), guildScheduledEventPickerTime.getSecond()); instance.add(11, 1); m.checkNotNullExpressionValue(instance, "Calendar.getInstance().a…r.HOUR_OF_DAY, 1)\n }"); return toGuildScheduledEventPickerDateTime(instance); @@ -45,8 +45,9 @@ public final class GuildScheduledEventPickerDateTime { m.checkNotNullParameter(guildScheduledEventPickerDate, "date"); m.checkNotNullParameter(guildScheduledEventPickerTime, "time"); Calendar instance = Calendar.getInstance(); - instance.set(guildScheduledEventPickerDate.getYear(), guildScheduledEventPickerDate.getMonth(), guildScheduledEventPickerDate.getDayOfMonth(), guildScheduledEventPickerTime.getHourOfDay(), guildScheduledEventPickerTime.getMinute()); - m.checkNotNullExpressionValue(instance, "Calendar.getInstance().a…Day, time.minute)\n }"); + instance.set(guildScheduledEventPickerDate.getYear(), guildScheduledEventPickerDate.getMonth(), guildScheduledEventPickerDate.getDayOfMonth(), guildScheduledEventPickerTime.getHourOfDay(), guildScheduledEventPickerTime.getMinute(), guildScheduledEventPickerTime.getSecond()); + instance.clear(14); + m.checkNotNullExpressionValue(instance, "Calendar.getInstance().a…ndar.MILLISECOND)\n }"); return instance.getTimeInMillis(); } diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventPickerTime.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventPickerTime.java index 0c3084b159..28c0baf02c 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventPickerTime.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventPickerTime.java @@ -6,20 +6,25 @@ import java.io.Serializable; public final class GuildScheduledEventPickerTime implements Serializable { private final int hourOfDay; private final int minute; + private final int second; - public GuildScheduledEventPickerTime(int i, int i2) { + public GuildScheduledEventPickerTime(int i, int i2, int i3) { this.hourOfDay = i; this.minute = i2; + this.second = i3; } - public static /* synthetic */ GuildScheduledEventPickerTime copy$default(GuildScheduledEventPickerTime guildScheduledEventPickerTime, int i, int i2, int i3, Object obj) { - if ((i3 & 1) != 0) { + public static /* synthetic */ GuildScheduledEventPickerTime copy$default(GuildScheduledEventPickerTime guildScheduledEventPickerTime, int i, int i2, int i3, int i4, Object obj) { + if ((i4 & 1) != 0) { i = guildScheduledEventPickerTime.hourOfDay; } - if ((i3 & 2) != 0) { + if ((i4 & 2) != 0) { i2 = guildScheduledEventPickerTime.minute; } - return guildScheduledEventPickerTime.copy(i, i2); + if ((i4 & 4) != 0) { + i3 = guildScheduledEventPickerTime.second; + } + return guildScheduledEventPickerTime.copy(i, i2, i3); } public final int component1() { @@ -30,8 +35,12 @@ public final class GuildScheduledEventPickerTime implements Serializable { return this.minute; } - public final GuildScheduledEventPickerTime copy(int i, int i2) { - return new GuildScheduledEventPickerTime(i, i2); + public final int component3() { + return this.second; + } + + public final GuildScheduledEventPickerTime copy(int i, int i2, int i3) { + return new GuildScheduledEventPickerTime(i, i2, i3); } @Override // java.lang.Object @@ -43,7 +52,7 @@ public final class GuildScheduledEventPickerTime implements Serializable { return false; } GuildScheduledEventPickerTime guildScheduledEventPickerTime = (GuildScheduledEventPickerTime) obj; - return this.hourOfDay == guildScheduledEventPickerTime.hourOfDay && this.minute == guildScheduledEventPickerTime.minute; + return this.hourOfDay == guildScheduledEventPickerTime.hourOfDay && this.minute == guildScheduledEventPickerTime.minute && this.second == guildScheduledEventPickerTime.second; } public final int getHourOfDay() { @@ -54,9 +63,13 @@ public final class GuildScheduledEventPickerTime implements Serializable { return this.minute; } + public final int getSecond() { + return this.second; + } + @Override // java.lang.Object public int hashCode() { - return (this.hourOfDay * 31) + this.minute; + return (((this.hourOfDay * 31) + this.minute) * 31) + this.second; } @Override // java.lang.Object @@ -64,6 +77,8 @@ public final class GuildScheduledEventPickerTime implements Serializable { StringBuilder P = a.P("GuildScheduledEventPickerTime(hourOfDay="); P.append(this.hourOfDay); P.append(", minute="); - return a.z(P, this.minute, ")"); + P.append(this.minute); + P.append(", second="); + return a.z(P, this.second, ")"); } } diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventSettingsViewModel.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventSettingsViewModel.java index f5db81af32..950e581c2a 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventSettingsViewModel.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/GuildScheduledEventSettingsViewModel.java @@ -4,6 +4,7 @@ import c.d.b.a.a; import com.discord.api.guildscheduledevent.GuildScheduledEvent; import com.discord.api.guildscheduledevent.GuildScheduledEventEntityMetadata; import com.discord.api.guildscheduledevent.GuildScheduledEventEntityType; +import com.discord.api.utcdatetime.UtcDateTime; import com.discord.app.AppViewModel; import com.discord.models.domain.ModelAuditLogEntry; import com.discord.stores.StoreGuildScheduledEvents; @@ -44,52 +45,74 @@ public final class GuildScheduledEventSettingsViewModel extends AppViewModel b = null; - if (l == null || (findEventFromStore = storeGuildScheduledEvents.findEventFromStore(l.longValue(), Long.valueOf(j))) == null || (model = GuildScheduledEventModelKt.toModel(findEventFromStore)) == null) { + GuildScheduledEvent findEventFromStore = l != null ? storeGuildScheduledEvents.findEventFromStore(l.longValue(), Long.valueOf(j)) : null; + if (findEventFromStore == null || (model = GuildScheduledEventModelKt.toModel(findEventFromStore)) == null) { + guildScheduledEvent = findEventFromStore; guildScheduledEventEntityType2 = guildScheduledEventEntityType; } else { GuildScheduledEventEntityMetadata.Companion companion = GuildScheduledEventEntityMetadata.Companion; GuildScheduledEventEntityMetadata d = findEventFromStore.d(); + guildScheduledEvent = findEventFromStore; guildScheduledEventEntityType2 = guildScheduledEventEntityType; - guildScheduledEventModel = GuildScheduledEventModel.copy$default(model, 0, null, null, null, null, null, null, null, guildScheduledEventEntityType, companion.a(guildScheduledEventEntityType, d != null ? d.b() : b, str), null, 1279, null); + guildScheduledEventModel = GuildScheduledEventModel.copy$default(model, 0, null, l2, null, null, null, null, null, guildScheduledEventEntityType, companion.a(guildScheduledEventEntityType, d != null ? d.b() : b, str), null, 1275, null); } Pair generateAppropriateStartDateTime = GuildScheduledEventPickerDateTime.INSTANCE.generateAppropriateStartDateTime(); - updateViewState(new ViewState.Initialized(guildScheduledEventModel == null ? new GuildScheduledEventModel(j, null, l2, generateAppropriateStartDateTime.getFirst(), generateAppropriateStartDateTime.getSecond(), null, null, null, guildScheduledEventEntityType, GuildScheduledEventEntityMetadata.Companion.a(guildScheduledEventEntityType2, n.emptyList(), str), Integer.valueOf((int) SAMPLE_USER_COUNT)) : guildScheduledEventModel)); + updateViewState(new ViewState.Initialized(guildScheduledEventModel == null ? new GuildScheduledEventModel(j, null, l2, generateAppropriateStartDateTime.getFirst(), generateAppropriateStartDateTime.getSecond(), null, null, null, guildScheduledEventEntityType, GuildScheduledEventEntityMetadata.Companion.a(guildScheduledEventEntityType2, n.emptyList(), str), Integer.valueOf((int) SAMPLE_USER_COUNT)) : guildScheduledEventModel, guildScheduledEvent)); } /* JADX INFO: this call moved to the top of the method (can break code semantics) */ @@ -148,10 +174,29 @@ public final class GuildScheduledEventSettingsViewModel extends AppViewModel= ClockFactory.get().currentTimeMillis(); } @@ -212,11 +257,7 @@ public final class GuildScheduledEventSettingsViewModel extends AppViewModel { +public final class PreviewGuildScheduledEventViewModel$startEvent$1 extends o implements Function1 { public final /* synthetic */ PreviewGuildScheduledEventViewModel this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public PreviewGuildScheduledEventViewModel$startVoiceEvent$1(PreviewGuildScheduledEventViewModel previewGuildScheduledEventViewModel) { + public PreviewGuildScheduledEventViewModel$startEvent$1(PreviewGuildScheduledEventViewModel previewGuildScheduledEventViewModel) { super(1); this.this$0 = previewGuildScheduledEventViewModel; } diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$startVoiceEvent$2.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$startEvent$2.java similarity index 80% rename from app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$startVoiceEvent$2.java rename to app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$startEvent$2.java index 9fbbb848b0..c44f653620 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$startVoiceEvent$2.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel$startEvent$2.java @@ -6,12 +6,12 @@ import kotlin.Unit; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; /* compiled from: PreviewGuildScheduledEventViewModel.kt */ -public final class PreviewGuildScheduledEventViewModel$startVoiceEvent$2 extends o implements Function1 { +public final class PreviewGuildScheduledEventViewModel$startEvent$2 extends o implements Function1 { public final /* synthetic */ Function0 $onRequestSuccess; public final /* synthetic */ PreviewGuildScheduledEventViewModel this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public PreviewGuildScheduledEventViewModel$startVoiceEvent$2(PreviewGuildScheduledEventViewModel previewGuildScheduledEventViewModel, Function0 function0) { + public PreviewGuildScheduledEventViewModel$startEvent$2(PreviewGuildScheduledEventViewModel previewGuildScheduledEventViewModel, Function0 function0) { super(1); this.this$0 = previewGuildScheduledEventViewModel; this.$onRequestSuccess = function0; diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel.java index 3a85d3b8f1..7cf66a3524 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/PreviewGuildScheduledEventViewModel.java @@ -4,12 +4,14 @@ import android.content.Context; import c.d.b.a.a; import com.airbnb.lottie.parser.AnimatableValueParser; import com.discord.api.channel.Channel; +import com.discord.api.guildscheduledevent.GuildScheduledEvent; import com.discord.api.guildscheduledevent.GuildScheduledEventEntityType; import com.discord.api.permission.Permission; import com.discord.api.stageinstance.StageInstancePrivacyLevel; import com.discord.app.AppViewModel; import com.discord.restapi.RestAPIParams; import com.discord.stores.StoreChannels; +import com.discord.stores.StoreGuildScheduledEvents; import com.discord.stores.StorePermissions; import com.discord.stores.StoreStream; import com.discord.utilities.permissions.PermissionUtils; @@ -29,6 +31,7 @@ public final class PreviewGuildScheduledEventViewModel extends AppViewModel function0) { + long guildScheduledEventId; + GuildScheduledEvent findEventFromStore; + RestAPIParams.UpdateGuildScheduledEventBody updateRequestBody; WidgetPreviewGuildScheduledEvent.Companion.ExistingEventData existingEventData = this.existingEventData; - if (existingEventData != null) { - long guildScheduledEventId = existingEventData.getGuildScheduledEventId(); - RestAPIParams.UpdateGuildScheduledEventBody updateRequestBody = this.eventModel.toUpdateRequestBody(); - if (updateRequestBody != null) { - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().updateGuildScheduledEvent(guildScheduledEventId, updateRequestBody), false, 1, null), this, null, 2, null), PreviewGuildScheduledEventViewModel.class, context, (Function1) null, new PreviewGuildScheduledEventViewModel$editEvent$1(this), (Function0) null, (Function0) null, new PreviewGuildScheduledEventViewModel$editEvent$2(this, function0), 52, (Object) null); - } + if (existingEventData != null && (findEventFromStore = this.guildScheduledEventsStore.findEventFromStore((guildScheduledEventId = existingEventData.getGuildScheduledEventId()), Long.valueOf(this.eventModel.getGuildId()))) != null && (updateRequestBody = this.eventModel.toUpdateRequestBody(findEventFromStore)) != null) { + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().updateGuildScheduledEvent(guildScheduledEventId, updateRequestBody), false, 1, null), this, null, 2, null), PreviewGuildScheduledEventViewModel.class, context, (Function1) null, new PreviewGuildScheduledEventViewModel$editEvent$1(this), (Function0) null, (Function0) null, new PreviewGuildScheduledEventViewModel$editEvent$2(this, function0), 52, (Object) null); } } @@ -282,6 +285,13 @@ public final class PreviewGuildScheduledEventViewModel extends AppViewModel function0) { + WidgetPreviewGuildScheduledEvent.Companion.ExistingEventData existingEventData = this.existingEventData; + if (existingEventData != null) { + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(GuildScheduledEventAPI.INSTANCE.startEvent(existingEventData.getGuildScheduledEventId()), false, 1, null), this, null, 2, null), PreviewGuildScheduledEventViewModel.class, context, (Function1) null, new PreviewGuildScheduledEventViewModel$startEvent$1(this), (Function0) null, (Function0) null, new PreviewGuildScheduledEventViewModel$startEvent$2(this, function0), 52, (Object) null); + } + } + private final void startStageEvent(Context context, boolean z2, Function0 function0) { if (this.eventModel.getName() != null && this.eventModel.getChannelId() != null) { WidgetPreviewGuildScheduledEvent.Companion.ExistingEventData existingEventData = this.existingEventData; @@ -289,13 +299,6 @@ public final class PreviewGuildScheduledEventViewModel extends AppViewModel function0) { - WidgetPreviewGuildScheduledEvent.Companion.ExistingEventData existingEventData = this.existingEventData; - if (existingEventData != null) { - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(GuildScheduledEventAPI.INSTANCE.startEvent(existingEventData.getGuildScheduledEventId()), false, 1, null), this, null, 2, null), PreviewGuildScheduledEventViewModel.class, context, (Function1) null, new PreviewGuildScheduledEventViewModel$startVoiceEvent$1(this), (Function0) null, (Function0) null, new PreviewGuildScheduledEventViewModel$startVoiceEvent$2(this, function0), 52, (Object) null); - } - } - public final ViewState getCurrentViewState() { return this.currentViewState; } @@ -313,13 +316,10 @@ public final class PreviewGuildScheduledEventViewModel extends AppViewModel { + public final /* synthetic */ WidgetGuildScheduledEventDetailsBottomSheet this$0; + + /* compiled from: WidgetGuildScheduledEventDetailsBottomSheet.kt */ + /* renamed from: com.discord.widgets.guildscheduledevent.WidgetGuildScheduledEventDetailsBottomSheet$configureUi$7$1 reason: invalid class name */ + public static final class AnonymousClass1 extends o implements Function1 { + public static final AnonymousClass1 INSTANCE = new AnonymousClass1(); + + public AnonymousClass1() { + super(1); + } + + /* 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] */ + @Override // kotlin.jvm.functions.Function1 + public /* bridge */ /* synthetic */ Unit invoke(Unit unit) { + invoke(unit); + return Unit.a; + } + + public final void invoke(Unit unit) { + m.checkNotNullParameter(unit, "it"); + } + } + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public WidgetGuildScheduledEventDetailsBottomSheet$configureUi$7(WidgetGuildScheduledEventDetailsBottomSheet widgetGuildScheduledEventDetailsBottomSheet) { + super(0); + this.this$0 = widgetGuildScheduledEventDetailsBottomSheet; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(GuildScheduledEventAPI.INSTANCE.endEvent(WidgetGuildScheduledEventDetailsBottomSheet.access$getGuildScheduledEventId$p(this.this$0)), false, 1, null), this.this$0.getClass(), (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, AnonymousClass1.INSTANCE, 62, (Object) null); + } +} diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsBottomSheet.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsBottomSheet.java index 497bcc122b..815be327cb 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsBottomSheet.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsBottomSheet.java @@ -135,7 +135,7 @@ public final class WidgetGuildScheduledEventDetailsBottomSheet extends AppBottom GuildScheduledEventBottomButtonView guildScheduledEventBottomButtonView = getBinding().b; d0.z.d.m.checkNotNullExpressionValue(guildScheduledEventBottomButtonView, "binding.guildScheduledEventDetailsButtonView"); guildScheduledEventBottomButtonView.setVisibility(0); - getBinding().b.configureForDetails(initialized.getGuildScheduledEvent(), initialized.isRsvped(), initialized.getCanShare(), initialized.getCanStartEvent(), initialized.isDeveloperMode(), new WidgetGuildScheduledEventDetailsBottomSheet$configureUi$2(this, viewState), new WidgetGuildScheduledEventDetailsBottomSheet$configureUi$3(this), new WidgetGuildScheduledEventDetailsBottomSheet$configureUi$4(this, viewState), new WidgetGuildScheduledEventDetailsBottomSheet$configureUi$5(this, viewState), new WidgetGuildScheduledEventDetailsBottomSheet$configureUi$6(this, viewState)); + getBinding().b.configureForDetails(initialized.getGuildScheduledEvent(), initialized.isRsvped(), initialized.getCanShare(), initialized.getCanStartEvent(), initialized.isDeveloperMode(), new WidgetGuildScheduledEventDetailsBottomSheet$configureUi$2(this, viewState), new WidgetGuildScheduledEventDetailsBottomSheet$configureUi$3(this), new WidgetGuildScheduledEventDetailsBottomSheet$configureUi$4(this, viewState), new WidgetGuildScheduledEventDetailsBottomSheet$configureUi$5(this, viewState), new WidgetGuildScheduledEventDetailsBottomSheet$configureUi$6(this, viewState), new WidgetGuildScheduledEventDetailsBottomSheet$configureUi$7(this)); } private final long getGuildScheduledEventId() { diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsExtrasBottomSheet.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsExtrasBottomSheet.java index 27485b7a1b..3653c53a8c 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsExtrasBottomSheet.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsExtrasBottomSheet.java @@ -11,6 +11,7 @@ import c.a.d.f0; import c.a.d.h0; import c.d.b.a.a; import com.discord.R; +import com.discord.api.guildscheduledevent.GuildScheduledEventEntityType; import com.discord.app.AppBottomSheet; import com.discord.databinding.WidgetGuildScheduledEventDetailsExtrasBottomSheetBinding; import com.discord.utilities.guildscheduledevent.GuildScheduledEventTiming; @@ -114,7 +115,7 @@ public final class WidgetGuildScheduledEventDetailsExtrasBottomSheet extends App boolean z3 = eventTiming == GuildScheduledEventTiming.LIVE; TextView textView4 = getBinding().e; m.checkNotNullExpressionValue(textView4, "binding.endEvent"); - textView4.setVisibility(canStartEvent && z3 ? 0 : 8); + textView4.setVisibility(canStartEvent && z3 && initialized.getGuildScheduledEvent().e() != GuildScheduledEventEntityType.EXTERNAL ? 0 : 8); getBinding().e.setOnClickListener(new WidgetGuildScheduledEventDetailsExtrasBottomSheet$configureUi$4(this)); TextView textView5 = getBinding().b; m.checkNotNullExpressionValue(textView5, "binding.cancelEvent"); diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventLocationSelect.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventLocationSelect.java index 3d5f22878d..5f4f0dfbc9 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventLocationSelect.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventLocationSelect.java @@ -166,13 +166,13 @@ public final class WidgetGuildScheduledEventLocationSelect extends AppFragment { this.currentViewState = valid; CheckedSetting checkedSetting = getBinding().k; m.checkNotNullExpressionValue(checkedSetting, "binding.stageChannelOption"); - configureLocationOption(valid, checkedSetting, GuildScheduledEventEntityType.STAGE_INSTANCE, getDisabledMessageForChannelOption(valid.getAvailableStageChannelIds(), valid.getCanChangeEntityType())); + configureLocationOption(valid, checkedSetting, GuildScheduledEventEntityType.STAGE_INSTANCE, getDisabledMessageForChannelOption(valid.getAvailableStageChannelIds(), valid.getCanChangeChannel())); CheckedSetting checkedSetting2 = getBinding().n; m.checkNotNullExpressionValue(checkedSetting2, "binding.voiceChannelOption"); - configureLocationOption(valid, checkedSetting2, GuildScheduledEventEntityType.VOICE, getDisabledMessageForChannelOption(valid.getAvailableVoiceChannelIds(), valid.getCanChangeEntityType())); + configureLocationOption(valid, checkedSetting2, GuildScheduledEventEntityType.VOICE, getDisabledMessageForChannelOption(valid.getAvailableVoiceChannelIds(), valid.getCanChangeChannel())); CheckedSetting checkedSetting3 = getBinding().h; m.checkNotNullExpressionValue(checkedSetting3, "binding.externalOption"); - configureLocationOption(valid, checkedSetting3, GuildScheduledEventEntityType.EXTERNAL, getDisabledMessageForExternalOption(valid.getCanCreateExternalEvent(), valid.getCanChangeEntityType())); + configureLocationOption(valid, checkedSetting3, GuildScheduledEventEntityType.EXTERNAL, getDisabledMessageForExternalOption(valid.getCanCreateExternalEvent(), valid.getCanChangeChannel())); CheckedSetting checkedSetting4 = getBinding().h; m.checkNotNullExpressionValue(checkedSetting4, "binding.externalOption"); FreeFormEventsFeatureFlag.Companion companion = FreeFormEventsFeatureFlag.Companion; @@ -220,8 +220,9 @@ public final class WidgetGuildScheduledEventLocationSelect extends AppFragment { textInputLayout6.setVisibility(0); } TextInputEditText textInputEditText = getBinding().b; - Editable text = textInputEditText.getText(); String str = null; + ViewExtensions.setEnabledAndAlpha$default(textInputEditText, valid.getCanChangeChannel(), 0.0f, 2, null); + Editable text = textInputEditText.getText(); String obj = text != null ? text.toString() : null; Channel selectedChannel = valid.getSelectedChannel(); if (!m.areEqual(obj, selectedChannel != null ? selectedChannel.m() : null)) { diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventLocationSelectViewModel.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventLocationSelectViewModel.java index e227b486e0..950424574d 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventLocationSelectViewModel.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventLocationSelectViewModel.java @@ -18,7 +18,9 @@ import com.discord.stores.StorePermissions; import com.discord.stores.StoreStream; import com.discord.stores.updates.ObservationDeck; import com.discord.stores.updates.ObservationDeckProvider; +import com.discord.utilities.guildscheduledevent.GuildScheduledEventTiming; import com.discord.utilities.guildscheduledevent.GuildScheduledEventUtilities; +import com.discord.utilities.guildscheduledevent.GuildScheduledEventUtilitiesKt; import com.discord.utilities.rx.ObservableExtensionsKt; import d0.z.d.m; import d0.z.d.o; @@ -230,7 +232,7 @@ public final class WidgetGuildScheduledEventLocationSelectViewModel extends AppV private final Map availableChannels; private final Set availableStageChannelIds; private final Set availableVoiceChannelIds; - private final boolean canChangeEntityType; + private final boolean canChangeChannel; private final boolean canCreateExternalEvent; private final String externalLocation; private final Channel selectedChannel; @@ -253,11 +255,11 @@ public final class WidgetGuildScheduledEventLocationSelectViewModel extends AppV this.availableStageChannelIds = set2; this.canCreateExternalEvent = z2; this.showStageOptionIfUnavailable = z3; - this.canChangeEntityType = z4; + this.canChangeChannel = z4; } public static /* synthetic */ Valid copy$default(Valid valid, GuildScheduledEventEntityType guildScheduledEventEntityType, Channel channel, String str, Map map, Set set, Set set2, boolean z2, boolean z3, boolean z4, int i, Object obj) { - return valid.copy((i & 1) != 0 ? valid.selectedLocationOption : guildScheduledEventEntityType, (i & 2) != 0 ? valid.selectedChannel : channel, (i & 4) != 0 ? valid.externalLocation : str, (i & 8) != 0 ? valid.availableChannels : map, (i & 16) != 0 ? valid.availableVoiceChannelIds : set, (i & 32) != 0 ? valid.availableStageChannelIds : set2, (i & 64) != 0 ? valid.canCreateExternalEvent : z2, (i & 128) != 0 ? valid.showStageOptionIfUnavailable : z3, (i & 256) != 0 ? valid.canChangeEntityType : z4); + return valid.copy((i & 1) != 0 ? valid.selectedLocationOption : guildScheduledEventEntityType, (i & 2) != 0 ? valid.selectedChannel : channel, (i & 4) != 0 ? valid.externalLocation : str, (i & 8) != 0 ? valid.availableChannels : map, (i & 16) != 0 ? valid.availableVoiceChannelIds : set, (i & 32) != 0 ? valid.availableStageChannelIds : set2, (i & 64) != 0 ? valid.canCreateExternalEvent : z2, (i & 128) != 0 ? valid.showStageOptionIfUnavailable : z3, (i & 256) != 0 ? valid.canChangeChannel : z4); } public final GuildScheduledEventEntityType component1() { @@ -293,7 +295,7 @@ public final class WidgetGuildScheduledEventLocationSelectViewModel extends AppV } public final boolean component9() { - return this.canChangeEntityType; + return this.canChangeChannel; } public final Valid copy(GuildScheduledEventEntityType guildScheduledEventEntityType, Channel channel, String str, Map map, Set set, Set set2, boolean z2, boolean z3, boolean z4) { @@ -313,7 +315,7 @@ public final class WidgetGuildScheduledEventLocationSelectViewModel extends AppV return false; } Valid valid = (Valid) obj; - return m.areEqual(this.selectedLocationOption, valid.selectedLocationOption) && m.areEqual(this.selectedChannel, valid.selectedChannel) && m.areEqual(this.externalLocation, valid.externalLocation) && m.areEqual(this.availableChannels, valid.availableChannels) && m.areEqual(this.availableVoiceChannelIds, valid.availableVoiceChannelIds) && m.areEqual(this.availableStageChannelIds, valid.availableStageChannelIds) && this.canCreateExternalEvent == valid.canCreateExternalEvent && this.showStageOptionIfUnavailable == valid.showStageOptionIfUnavailable && this.canChangeEntityType == valid.canChangeEntityType; + return m.areEqual(this.selectedLocationOption, valid.selectedLocationOption) && m.areEqual(this.selectedChannel, valid.selectedChannel) && m.areEqual(this.externalLocation, valid.externalLocation) && m.areEqual(this.availableChannels, valid.availableChannels) && m.areEqual(this.availableVoiceChannelIds, valid.availableVoiceChannelIds) && m.areEqual(this.availableStageChannelIds, valid.availableStageChannelIds) && this.canCreateExternalEvent == valid.canCreateExternalEvent && this.showStageOptionIfUnavailable == valid.showStageOptionIfUnavailable && this.canChangeChannel == valid.canChangeChannel; } public final Map getAvailableChannels() { @@ -328,8 +330,8 @@ public final class WidgetGuildScheduledEventLocationSelectViewModel extends AppV return this.availableVoiceChannelIds; } - public final boolean getCanChangeEntityType() { - return this.canChangeEntityType; + public final boolean getCanChangeChannel() { + return this.canChangeChannel; } public final boolean getCanCreateExternalEvent() { @@ -386,7 +388,7 @@ public final class WidgetGuildScheduledEventLocationSelectViewModel extends AppV int i9 = z3 ? 1 : 0; int i10 = z3 ? 1 : 0; int i11 = (i7 + i8) * 31; - boolean z4 = this.canChangeEntityType; + boolean z4 = this.canChangeChannel; if (!z4) { i3 = z4 ? 1 : 0; } @@ -410,8 +412,8 @@ public final class WidgetGuildScheduledEventLocationSelectViewModel extends AppV P.append(this.canCreateExternalEvent); P.append(", showStageOptionIfUnavailable="); P.append(this.showStageOptionIfUnavailable); - P.append(", canChangeEntityType="); - return a.L(P, this.canChangeEntityType, ")"); + P.append(", canChangeChannel="); + return a.L(P, this.canChangeChannel, ")"); } } @@ -462,19 +464,21 @@ public final class WidgetGuildScheduledEventLocationSelectViewModel extends AppV /* JADX WARNING: Removed duplicated region for block: B:46:0x00f6 */ /* JADX WARNING: Removed duplicated region for block: B:55:0x010e */ /* JADX WARNING: Removed duplicated region for block: B:60:0x0120 */ - /* JADX WARNING: Removed duplicated region for block: B:61:0x0125 A[ADDED_TO_REGION] */ - /* JADX WARNING: Removed duplicated region for block: B:70:0x013d */ - /* JADX WARNING: Removed duplicated region for block: B:71:0x013f */ + /* JADX WARNING: Removed duplicated region for block: B:61:0x0125 */ + /* JADX WARNING: Removed duplicated region for block: B:70:0x013e */ + /* JADX WARNING: Removed duplicated region for block: B:79:0x0156 */ @MainThread private final void handleStoreState(StoreState storeState) { Long l; GuildScheduledEventEntityType selectedLocationOption; + String externalLocation; + boolean z2; GuildScheduledEvent existingGuildScheduledEvent; GuildScheduledEventEntityMetadata d; Set features; this.currentStoreState = storeState; ViewState viewState = getViewState(); - String str = null; + GuildScheduledEventTiming guildScheduledEventTiming = null; if (!(viewState instanceof ViewState.Valid)) { viewState = null; } @@ -497,7 +501,7 @@ public final class WidgetGuildScheduledEventLocationSelectViewModel extends AppV hashSet.add(Long.valueOf(channel.h())); } } - boolean z2 = this.existingGuildScheduledEventId != null; + boolean z3 = this.existingGuildScheduledEventId != null; if (valid != null) { Channel selectedChannel = valid.getSelectedChannel(); if (selectedChannel != null) { @@ -513,18 +517,30 @@ public final class WidgetGuildScheduledEventLocationSelectViewModel extends AppV } Guild guild = storeState.getGuild(); boolean contains = (guild != null || (features = guild.getFeatures()) == null) ? false : features.contains(GuildFeature.COMMUNITY); - if (valid != null) { - str = valid.getExternalLocation(); - } else if (z2 && l == null && (existingGuildScheduledEvent = storeState.getExistingGuildScheduledEvent()) != null && (d = existingGuildScheduledEvent.d()) != null) { - str = d.a(); + externalLocation = valid != null ? valid.getExternalLocation() : (!z3 || l != null || (existingGuildScheduledEvent = storeState.getExistingGuildScheduledEvent()) == null || (d = existingGuildScheduledEvent.d()) == null) ? null : d.a(); + if (z3) { + GuildScheduledEvent existingGuildScheduledEvent2 = storeState.getExistingGuildScheduledEvent(); + if (existingGuildScheduledEvent2 != null) { + guildScheduledEventTiming = GuildScheduledEventUtilitiesKt.getEventTiming(existingGuildScheduledEvent2); + } + if (guildScheduledEventTiming == GuildScheduledEventTiming.LIVE) { + z2 = false; + if (externalLocation == null) { + externalLocation = ""; + } + updateViewState(new ViewState.Valid(selectedLocationOption, channel2, externalLocation, linkedHashMap, hashSet2, hashSet, canCreateExternalEvent, contains, z2)); + } } - updateViewState(new ViewState.Valid(selectedLocationOption, channel2, str != null ? str : "", linkedHashMap, hashSet2, hashSet, canCreateExternalEvent, contains, !z2)); + z2 = true; + if (externalLocation == null) { + } + updateViewState(new ViewState.Valid(selectedLocationOption, channel2, externalLocation, linkedHashMap, hashSet2, hashSet, canCreateExternalEvent, contains, z2)); } } else { - if (z2) { - GuildScheduledEvent existingGuildScheduledEvent2 = storeState.getExistingGuildScheduledEvent(); - if (existingGuildScheduledEvent2 != null) { - l = existingGuildScheduledEvent2.b(); + if (z3) { + GuildScheduledEvent existingGuildScheduledEvent3 = storeState.getExistingGuildScheduledEvent(); + if (existingGuildScheduledEvent3 != null) { + l = existingGuildScheduledEvent3.b(); } } else { l = this.initialChannelId; @@ -542,7 +558,12 @@ public final class WidgetGuildScheduledEventLocationSelectViewModel extends AppV } if (valid != null) { } - updateViewState(new ViewState.Valid(selectedLocationOption, channel2, str != null ? str : "", linkedHashMap, hashSet2, hashSet, canCreateExternalEvent, contains, !z2)); + if (z3) { + } + z2 = true; + if (externalLocation == null) { + } + updateViewState(new ViewState.Valid(selectedLocationOption, channel2, externalLocation, linkedHashMap, hashSet2, hashSet, canCreateExternalEvent, contains, z2)); } l = null; Channel channel2 = (Channel) linkedHashMap.get(l); @@ -558,7 +579,12 @@ public final class WidgetGuildScheduledEventLocationSelectViewModel extends AppV } if (valid != null) { } - updateViewState(new ViewState.Valid(selectedLocationOption, channel2, str != null ? str : "", linkedHashMap, hashSet2, hashSet, canCreateExternalEvent, contains, !z2)); + if (z3) { + } + z2 = true; + if (externalLocation == null) { + } + updateViewState(new ViewState.Valid(selectedLocationOption, channel2, externalLocation, linkedHashMap, hashSet2, hashSet, canCreateExternalEvent, contains, z2)); } public final StoreState getCurrentStoreState() { diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings$onViewBound$7.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings$onViewBound$7.java index 2a6a20e0cd..e01f26e0d8 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings$onViewBound$7.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings$onViewBound$7.java @@ -4,6 +4,7 @@ import android.app.DatePickerDialog; import android.content.Context; import android.view.View; import android.widget.DatePicker; +import com.discord.utilities.time.ClockFactory; import com.discord.widgets.guildscheduledevent.GuildScheduledEventSettingsViewModel; import d0.z.d.m; /* compiled from: WidgetGuildScheduledEventSettings.kt */ @@ -30,7 +31,7 @@ public final class WidgetGuildScheduledEventSettings$onViewBound$7 implements Vi DatePickerDialog datePickerDialog = new DatePickerDialog(requireContext, widgetGuildScheduledEventSettings$onViewBound$7$$special$$inlined$let$lambda$1, year, month, endDate3 != null ? endDate3.getDayOfMonth() : first.getDayOfMonth()); DatePicker datePicker = datePickerDialog.getDatePicker(); m.checkNotNullExpressionValue(datePicker, "datePicker"); - datePicker.setMinDate(eventModel.getStartDate().toMillis()); + datePicker.setMinDate(Math.max(eventModel.getStartDate().toMillis(), ClockFactory.get().currentTimeMillis())); datePickerDialog.show(); } } diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings$onViewBound$8.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings$onViewBound$8.java index b6e0819495..7bcd7718bc 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings$onViewBound$8.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings$onViewBound$8.java @@ -18,10 +18,12 @@ public final class WidgetGuildScheduledEventSettings$onViewBound$8 implements Vi if (access$getCurrentViewState$p == null) { return; } - if (!WidgetGuildScheduledEventSettings.access$getViewModel$p(this.this$0).isStartDateBeforeEndDate(access$getCurrentViewState$p)) { - WidgetGuildScheduledEventSettings.access$showDateErrorToast(this.this$0, GuildScheduledEventSettingsViewModel.DateError.END_DATE_BEFORE_START_DATE); - } else if (!WidgetGuildScheduledEventSettings.access$getViewModel$p(this.this$0).isDateInFuture(access$getCurrentViewState$p.getEventModel().getStartDate(), access$getCurrentViewState$p.getEventModel().getStartTime())) { + if (WidgetGuildScheduledEventSettings.access$getViewModel$p(this.this$0).hasStartTimeChanged(access$getCurrentViewState$p) && !WidgetGuildScheduledEventSettings.access$getViewModel$p(this.this$0).isDateInFuture(access$getCurrentViewState$p.getEventModel().getStartDate(), access$getCurrentViewState$p.getEventModel().getStartTime())) { WidgetGuildScheduledEventSettings.access$showDateErrorToast(this.this$0, GuildScheduledEventSettingsViewModel.DateError.START_DATE_IN_PAST); + } else if (WidgetGuildScheduledEventSettings.access$getViewModel$p(this.this$0).hasEndTimeChanged(access$getCurrentViewState$p) && !WidgetGuildScheduledEventSettings.access$getViewModel$p(this.this$0).isDateInFuture(access$getCurrentViewState$p.getEventModel().getEndDate(), access$getCurrentViewState$p.getEventModel().getEndTime())) { + WidgetGuildScheduledEventSettings.access$showDateErrorToast(this.this$0, GuildScheduledEventSettingsViewModel.DateError.END_DATE_IN_PAST); + } else if (!WidgetGuildScheduledEventSettings.access$getViewModel$p(this.this$0).isStartDateBeforeEndDate(access$getCurrentViewState$p)) { + WidgetGuildScheduledEventSettings.access$showDateErrorToast(this.this$0, GuildScheduledEventSettingsViewModel.DateError.END_DATE_BEFORE_START_DATE); } else { WidgetPreviewGuildScheduledEvent.Companion companion = WidgetPreviewGuildScheduledEvent.Companion; Context requireContext = this.this$0.requireContext(); diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings.java index a1ddaa4012..fe964b0740 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventSettings.java @@ -16,10 +16,14 @@ import c.a.d.j; import c.a.k.b; import c.d.b.a.a; import com.discord.R; +import com.discord.api.guildscheduledevent.GuildScheduledEvent; import com.discord.api.guildscheduledevent.GuildScheduledEventEntityType; import com.discord.app.AppFragment; import com.discord.databinding.WidgetGuildScheduledEventSettingsBinding; +import com.discord.utilities.guildscheduledevent.GuildScheduledEventTiming; +import com.discord.utilities.guildscheduledevent.GuildScheduledEventUtilitiesKt; import com.discord.utilities.rx.ObservableExtensionsKt; +import com.discord.utilities.view.extensions.ViewExtensions; import com.discord.utilities.viewbinding.FragmentViewBindingDelegate; import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt; import com.discord.widgets.guildscheduledevent.GuildScheduledEventSettingsViewModel; @@ -196,8 +200,14 @@ public final class WidgetGuildScheduledEventSettings extends AppFragment { private final void configureStartDateTime(GuildScheduledEventSettingsViewModel.ViewState.Initialized initialized) { long millis = GuildScheduledEventPickerDateTime.INSTANCE.toMillis(initialized.getEventModel().getStartDate(), initialized.getEventModel().getStartTime()); - getBinding().k.setText(new SimpleDateFormat("MMM dd, yyyy", Locale.getDefault()).format(Long.valueOf(millis))); - getBinding().l.setText(new SimpleDateFormat("h:mm a", Locale.getDefault()).format(Long.valueOf(millis))); + GuildScheduledEvent existingEvent = initialized.getExistingEvent(); + boolean z2 = (existingEvent != null ? GuildScheduledEventUtilitiesKt.getEventTiming(existingEvent) : null) == GuildScheduledEventTiming.LIVE; + TextInputEditText textInputEditText = getBinding().k; + ViewExtensions.setEnabledAndAlpha$default(textInputEditText, !z2, 0.0f, 2, null); + textInputEditText.setText(new SimpleDateFormat("MMM dd, yyyy", Locale.getDefault()).format(Long.valueOf(millis))); + TextInputEditText textInputEditText2 = getBinding().l; + ViewExtensions.setEnabledAndAlpha$default(textInputEditText2, !z2, 0.0f, 2, null); + textInputEditText2.setText(new SimpleDateFormat("h:mm a", Locale.getDefault()).format(Long.valueOf(millis))); } private final void configureUi(GuildScheduledEventSettingsViewModel.ViewState viewState) { diff --git a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetPreviewGuildScheduledEvent$viewModel$2.java b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetPreviewGuildScheduledEvent$viewModel$2.java index 9c0f743029..5b9c97caf2 100644 --- a/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetPreviewGuildScheduledEvent$viewModel$2.java +++ b/app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetPreviewGuildScheduledEvent$viewModel$2.java @@ -18,6 +18,6 @@ public final class WidgetPreviewGuildScheduledEvent$viewModel$2 extends o implem @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final AppViewModel mo1invoke() { - return new PreviewGuildScheduledEventViewModel(WidgetPreviewGuildScheduledEvent.access$getEventModel$p(this.this$0), (WidgetPreviewGuildScheduledEvent.Companion.ExistingEventData) this.this$0.getMostRecentIntent().getSerializableExtra("INTENT_EXTRA_EXISTING_EVENT_DATA"), null, null, 12, null); + return new PreviewGuildScheduledEventViewModel(WidgetPreviewGuildScheduledEvent.access$getEventModel$p(this.this$0), (WidgetPreviewGuildScheduledEvent.Companion.ExistingEventData) this.this$0.getMostRecentIntent().getSerializableExtra("INTENT_EXTRA_EXISTING_EVENT_DATA"), null, null, null, 28, null); } } diff --git a/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1.java b/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1.java index a6b5ec332f..34e8cee9fe 100644 --- a/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1.java +++ b/app/src/main/java/com/discord/widgets/nux/WidgetNuxChannelPrompt$handleSubmit$1.java @@ -2,8 +2,12 @@ package com.discord.widgets.nux; import c.a.k.b; import com.discord.R; +import com.discord.analytics.generated.events.network_action.TrackNetworkActionChannelCreate; +import com.discord.analytics.generated.traits.TrackNetworkMetadataReceiver; import com.discord.api.channel.Channel; +import com.discord.api.permission.PermissionOverwrite; import com.discord.restapi.RestAPIParams; +import com.discord.stores.utilities.RestCallStateKt; import com.discord.utilities.error.Error; import com.discord.utilities.rest.RestAPI; import com.discord.utilities.rx.ObservableExtensionsKt; @@ -11,6 +15,7 @@ import com.discord.utilities.view.extensions.ViewExtensions; import com.google.android.material.textfield.TextInputLayout; import d0.z.d.m; import d0.z.d.o; +import java.util.List; import kotlin.Unit; import kotlin.jvm.functions.Function1; import rx.functions.Action1; @@ -21,7 +26,7 @@ public final class WidgetNuxChannelPrompt$handleSubmit$1 extends o implements Fu /* compiled from: WidgetNuxChannelPrompt.kt */ /* renamed from: com.discord.widgets.nux.WidgetNuxChannelPrompt$handleSubmit$1$1 reason: invalid class name */ - public static final class AnonymousClass1 extends o implements Function1 { + public static final class AnonymousClass1 extends o implements Function1 { public final /* synthetic */ WidgetNuxChannelPrompt$handleSubmit$1 this$0; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ @@ -30,6 +35,23 @@ public final class WidgetNuxChannelPrompt$handleSubmit$1 extends o implements Fu this.this$0 = widgetNuxChannelPrompt$handleSubmit$1; } + public final TrackNetworkMetadataReceiver invoke(Channel channel) { + List s2; + return new TrackNetworkActionChannelCreate((channel == null || (s2 = channel.s()) == null) ? null : Boolean.valueOf(!s2.isEmpty()), channel != null ? Long.valueOf((long) channel.A()) : null, channel != null ? Long.valueOf(channel.h()) : null, channel != null ? Long.valueOf(channel.r()) : null, Long.valueOf(this.this$0.$guildId)); + } + } + + /* compiled from: WidgetNuxChannelPrompt.kt */ + /* renamed from: com.discord.widgets.nux.WidgetNuxChannelPrompt$handleSubmit$1$2 reason: invalid class name */ + public static final class AnonymousClass2 extends o implements Function1 { + public final /* synthetic */ WidgetNuxChannelPrompt$handleSubmit$1 this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public AnonymousClass2(WidgetNuxChannelPrompt$handleSubmit$1 widgetNuxChannelPrompt$handleSubmit$1) { + super(1); + this.this$0 = widgetNuxChannelPrompt$handleSubmit$1; + } + /* 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] */ @Override // kotlin.jvm.functions.Function1 @@ -45,11 +67,11 @@ public final class WidgetNuxChannelPrompt$handleSubmit$1 extends o implements Fu } /* compiled from: WidgetNuxChannelPrompt.kt */ - /* renamed from: com.discord.widgets.nux.WidgetNuxChannelPrompt$handleSubmit$1$2 reason: invalid class name */ - public static final class AnonymousClass2 implements Action1 { + /* renamed from: com.discord.widgets.nux.WidgetNuxChannelPrompt$handleSubmit$1$3 reason: invalid class name */ + public static final class AnonymousClass3 implements Action1 { public final /* synthetic */ WidgetNuxChannelPrompt$handleSubmit$1 this$0; - public AnonymousClass2(WidgetNuxChannelPrompt$handleSubmit$1 widgetNuxChannelPrompt$handleSubmit$1) { + public AnonymousClass3(WidgetNuxChannelPrompt$handleSubmit$1 widgetNuxChannelPrompt$handleSubmit$1) { this.this$0 = widgetNuxChannelPrompt$handleSubmit$1; } @@ -83,6 +105,6 @@ public final class WidgetNuxChannelPrompt$handleSubmit$1 extends o implements Fu TextInputLayout textInputLayout = WidgetNuxChannelPrompt.access$getBinding$p(this.this$0).g; m.checkNotNullExpressionValue(textInputLayout, "binding.nufChannelPromptTopicWrap"); String textOrEmpty = ViewExtensions.getTextOrEmpty(textInputLayout); - ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().createGuildChannel(this.$guildId, new RestAPIParams.CreateGuildChannel(0, null, textOrEmpty, Long.valueOf(channel.r()), null, b.k(this.this$0, R.string.nuf_channel_prompt_channel_topic_template, new Object[]{textOrEmpty}, null, 4).toString())), false, 1, null), this.this$0, null, 2, null).k(c.a.d.o.a.g(this.this$0.requireContext(), new AnonymousClass1(this), new AnonymousClass2(this))); + ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestCallStateKt.logNetworkAction(RestAPI.Companion.getApi().createGuildChannel(this.$guildId, new RestAPIParams.CreateGuildChannel(0, null, textOrEmpty, Long.valueOf(channel.r()), null, b.k(this.this$0, R.string.nuf_channel_prompt_channel_topic_template, new Object[]{textOrEmpty}, null, 4).toString())), new AnonymousClass1(this)), false, 1, null), this.this$0, null, 2, null).k(c.a.d.o.a.g(this.this$0.requireContext(), new AnonymousClass2(this), new AnonymousClass3(this))); } } diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java index 0c40440af2..9b3795c114 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java @@ -323,7 +323,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 + " - 94.0 - Alpha (94200)"); + textView.setText(string + " - 94.1 - Alpha (94201)"); 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/stage/start/ModeratorStartStageAdapter.java b/app/src/main/java/com/discord/widgets/stage/start/ModeratorStartStageAdapter.java index 7c4dd8dfd2..1235e4da8a 100644 --- a/app/src/main/java/com/discord/widgets/stage/start/ModeratorStartStageAdapter.java +++ b/app/src/main/java/com/discord/widgets/stage/start/ModeratorStartStageAdapter.java @@ -174,7 +174,7 @@ public final class ModeratorStartStageAdapter extends MGRecyclerAdapterSimple implements Action1 { - public final /* synthetic */ WidgetUserPhoneVerify this$0; +public final class WidgetUserPhoneVerify$handleCodeEntered$1 extends o implements Function1 { + public static final WidgetUserPhoneVerify$handleCodeEntered$1 INSTANCE = new WidgetUserPhoneVerify$handleCodeEntered$1(); - public WidgetUserPhoneVerify$handleCodeEntered$1(WidgetUserPhoneVerify widgetUserPhoneVerify) { - this.this$0 = widgetUserPhoneVerify; + public WidgetUserPhoneVerify$handleCodeEntered$1() { + super(1); } - public final void call(ModelPhoneVerificationToken modelPhoneVerificationToken) { - WidgetUserPhoneVerify.access$handleCodeReceived(this.this$0, modelPhoneVerificationToken.component1()); + public final TrackNetworkMetadataReceiver invoke(ModelPhoneVerificationToken modelPhoneVerificationToken) { + return new TrackNetworkActionUserVerifyPhone(); } } diff --git a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify$handleCodeEntered$2.java b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify$handleCodeEntered$2.java index 0a3ab2c407..7d69db87de 100644 --- a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify$handleCodeEntered$2.java +++ b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify$handleCodeEntered$2.java @@ -1,16 +1,16 @@ package com.discord.widgets.user.phone; -import com.discord.utilities.error.Error; +import com.discord.models.domain.ModelPhoneVerificationToken; import rx.functions.Action1; /* compiled from: WidgetUserPhoneVerify.kt */ -public final class WidgetUserPhoneVerify$handleCodeEntered$2 implements Action1 { +public final class WidgetUserPhoneVerify$handleCodeEntered$2 implements Action1 { public final /* synthetic */ WidgetUserPhoneVerify this$0; public WidgetUserPhoneVerify$handleCodeEntered$2(WidgetUserPhoneVerify widgetUserPhoneVerify) { this.this$0 = widgetUserPhoneVerify; } - public final void call(Error error) { - WidgetUserPhoneVerify.access$getBinding$p(this.this$0).d.b(); + public final void call(ModelPhoneVerificationToken modelPhoneVerificationToken) { + WidgetUserPhoneVerify.access$handleCodeReceived(this.this$0, modelPhoneVerificationToken.component1()); } } diff --git a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify$handleCodeEntered$3.java b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify$handleCodeEntered$3.java new file mode 100644 index 0000000000..12e37459c9 --- /dev/null +++ b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify$handleCodeEntered$3.java @@ -0,0 +1,16 @@ +package com.discord.widgets.user.phone; + +import com.discord.utilities.error.Error; +import rx.functions.Action1; +/* compiled from: WidgetUserPhoneVerify.kt */ +public final class WidgetUserPhoneVerify$handleCodeEntered$3 implements Action1 { + public final /* synthetic */ WidgetUserPhoneVerify this$0; + + public WidgetUserPhoneVerify$handleCodeEntered$3(WidgetUserPhoneVerify widgetUserPhoneVerify) { + this.this$0 = widgetUserPhoneVerify; + } + + public final void call(Error error) { + WidgetUserPhoneVerify.access$getBinding$p(this.this$0).d.b(); + } +} diff --git a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify.java b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify.java index 97452dcffa..a9df21b89d 100644 --- a/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify.java +++ b/app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify.java @@ -15,6 +15,7 @@ import com.discord.R; import com.discord.app.AppFragment; import com.discord.databinding.WidgetUserPhoneVerifyBinding; import com.discord.restapi.RestAPIParams; +import com.discord.stores.utilities.RestCallStateKt; import com.discord.utilities.rest.RestAPI; import com.discord.utilities.rx.ObservableExtensionsKt; import com.discord.utilities.viewbinding.FragmentViewBindingDelegate; @@ -96,7 +97,7 @@ public final class WidgetUserPhoneVerify extends WidgetUserAccountVerifyBase { String stringExtra = getMostRecentIntent().getStringExtra(INTENT_EXTRA_PHONE_NUMBER); if (stringExtra != null) { m.checkNotNullExpressionValue(stringExtra, "mostRecentIntent.getStri…A_PHONE_NUMBER) ?: return"); - ObservableExtensionsKt.ui$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().phoneVerificationsVerify(new RestAPIParams.VerificationCode(stringExtra, str)), false, 1, null), getBinding().f2075c, 0, 2, null), this, null, 2, null).k(o.h(new WidgetUserPhoneVerify$handleCodeEntered$1(this), getContext(), new WidgetUserPhoneVerify$handleCodeEntered$2(this))); + ObservableExtensionsKt.ui$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.restSubscribeOn$default(RestCallStateKt.logNetworkAction(RestAPI.Companion.getApi().phoneVerificationsVerify(new RestAPIParams.VerificationCode(stringExtra, str)), WidgetUserPhoneVerify$handleCodeEntered$1.INSTANCE), false, 1, null), getBinding().f2075c, 0, 2, null), this, null, 2, null).k(o.h(new WidgetUserPhoneVerify$handleCodeEntered$2(this), getContext(), new WidgetUserPhoneVerify$handleCodeEntered$3(this))); } } diff --git a/app/src/main/res/layout/widget_guild_scheduled_event_details_extras_bottom_sheet.xml b/app/src/main/res/layout/widget_guild_scheduled_event_details_extras_bottom_sheet.xml index b12f49de9a..5f076fd639 100644 --- a/app/src/main/res/layout/widget_guild_scheduled_event_details_extras_bottom_sheet.xml +++ b/app/src/main/res/layout/widget_guild_scheduled_event_details_extras_bottom_sheet.xml @@ -4,7 +4,7 @@ - + diff --git a/app/src/main/res/values-ar-rXB/strings.xml b/app/src/main/res/values-ar-rXB/strings.xml index 6442e657d6..c4dbeb472c 100644 --- a/app/src/main/res/values-ar-rXB/strings.xml +++ b/app/src/main/res/values-ar-rXB/strings.xml @@ -3377,6 +3377,7 @@ ‏‮Start‬‏ ‏‮Event:‬‏ ‏‮{eventName}‬‏ ‏‮Scheduled‬‏ ‏‮for‬‏ ‏‮{startTime}‬‏ ‏‮Scheduled‬‏ ‏‮at‬‏ ‏‮{startTime}‬‏ + ‏‮Event‬‏ ‏‮is‬‏ ‏‮in‬‏ ‏‮progress‬‏ ‏‮Step‬‏ ‏‮{step}‬‏ ‏‮of‬‏ ‏‮{total}‬‏ ‏‮**Total**‬‏ ‏‮(Tax‬‏ ‏‮Included)‬‏ ‏‮Events‬‏ @@ -5817,8 +5818,8 @@ ‏‮Members‬‏ ‏‮with‬‏ ‏‮this‬‏ ‏‮permission‬‏ ‏‮can‬‏ ‏‮drag‬‏ ‏‮other‬‏ ‏‮members‬‏ ‏‮out‬‏ ‏‮of‬‏ ‏‮this‬‏ ‏‮channel.‬‏ ‏‮They‬‏ ‏‮can‬‏ ‏‮only‬‏ ‏‮move‬‏ ‏‮members‬‏ ‏‮between‬‏ ‏‮channels‬‏ ‏‮both‬‏ ‏‮they‬‏ ‏‮and‬‏ ‏‮the‬‏ ‏‮member‬‏ ‏‮they‬‏ ‏‮are‬‏ ‏‮moving‬‏ ‏‮have‬‏ ‏‮access.‬‏ ‏‮Move‬‏ ‏‮To‬‏ ‏‮User‬‏ ‏‮has‬‏ ‏‮been‬‏ ‏‮moved‬‏ ‏‮to‬‏ ‏‮the‬‏ ‏‮selected‬‏ ‏‮channel.‬‏ - ‏‮Alert‬‏ ‏‮Cleared‬‏ - ‏‮No‬‏ ‏‮Alert‬‏ ‏‮Showing‬‏ + ‏‮Alert‬‏ ‏‮Cleared‬‏ + ‏‮No‬‏ ‏‮Alert‬‏ ‏‮Showing‬‏ ‏‮New‬‏ ‏‮notification‬‏ ‏‮Remove‬‏ ‏‮%1$s‬‏ ‏‮More‬‏ ‏‮than‬‏ %1$d ‏‮new‬‏ ‏‮notifications‬‏ @@ -5995,6 +5996,7 @@ ‏‮Feeling‬‏ ‏‮aimless?‬‏ ‏‮Like‬‏ ‏‮a‬‏ ‏‮paper‬‏ ‏‮plane‬‏ ‏‮drifting‬‏ ‏‮through‬‏ ‏‮the‬‏ ‏‮skies?‬‏ ‏‮Get‬‏ ‏‮some‬‏ ‏‮friends‬‏ ‏‮in‬‏ ‏‮here‬‏ ‏‮by‬‏ ‏‮creating‬‏ ‏‮an‬‏ ‏‮invite‬‏ ‏‮link!‬‏ ‏‮No‬‏ ‏‮invites‬‏ ‏‮yet!‬‏ ‏‮No‬‏ ‏‮invites‬‏ ‏‮yet‬‏ + ‏‮No‬‏ ‏‮options‬‏ ‏‮match‬‏ ‏‮your‬‏ ‏‮search.‬‏ ‏‮Instructions‬‏ ‏‮for‬‏ ‏‮enabling‬‏ ‏‮access‬‏ ‏‮to‬‏ ‏‮your‬‏ ‏‮microphone‬‏ ‏‮can‬‏ ‏‮be‬‏ ‏‮found‬‏ ‏‮in‬‏ ‏‮the‬‏ ‏‮Discord‬‏ ‏‮Help‬‏ ‏‮Center.‬‏ ‏‮Microphone‬‏ ‏‮Access‬‏ ‏‮is‬‏ ‏‮Denied‬‏ ‏‮Discord‬‏ ‏‮does‬‏ ‏‮not‬‏ ‏‮have‬‏ ‏‮access‬‏ ‏‮to‬‏ ‏‮your‬‏ ‏‮microphone‬‏ @@ -6399,14 +6401,14 @@ ‏‮Enter‬‏ ‏‮your‬‏ ‏‮confirmation‬‏ ‏‮code‬‏ ‏‮to‬‏ ‏‮reset‬‏ ‏‮your‬‏ ‏‮password‬‏ ‏‮Password‬‏ ‏‮is‬‏ ‏‮required.‬‏ ‏‮Show‬‏ ‏‮password‬‏ - ‏‮Login‬‏ ‏‮with‬‏ ‏‮password‬‏ ‏‮instead‬‏ + ‏‮Log‬‏ ‏‮in‬‏ ‏‮with‬‏ ‏‮password‬‏ ‏‮instead‬‏ ‏‮We‬‏ ‏‮will‬‏ ‏‮send‬‏ ‏‮a‬‏ ‏‮code‬‏ ‏‮to‬‏ ‏‮{recipient}‬‏‏‮.‬‏ ‏‮Sent‬‏ ‏‮to‬‏ ‏‮{recipient}‬‏‏‮.‬‏ ‏‮Enter‬‏ ‏‮the‬‏ ‏‮password‬‏ ‏‮for‬‏ ‏‮the‬‏ ‏‮account‬‏ ‏‮with‬‏ ‏‮the‬‏ ‏‮email‬‏ ‏‮address‬‏ ‏‮{email}‬‏ ‏‮Enter‬‏ ‏‮the‬‏ ‏‮password‬‏ ‏‮for‬‏ ‏‮the‬‏ ‏‮account‬‏ ‏‮with‬‏ ‏‮the‬‏ ‏‮phone‬‏ ‏‮number‬‏ ‏‮{phone}‬‏ ‏‮Enter‬‏ ‏‮your‬‏ ‏‮password‬‏ ‏‮Get‬‏ ‏‮a‬‏ ‏‮one-time‬‏ ‏‮login‬‏ ‏‮code‬‏ - ‏‮Enter‬‏ ‏‮code‬‏ ‏‮to‬‏ ‏‮login‬‏ + ‏‮Enter‬‏ ‏‮code‬‏ ‏‮to‬‏ ‏‮log‬‏ ‏‮in‬‏ ‏‮Continue‬‏ ‏‮Send‬‏ ‏‮me‬‏ ‏‮a‬‏ ‏‮one-time‬‏ ‏‮login‬‏ ‏‮code‬‏ ‏‮instead‬‏ ‏‮Resend‬‏ @@ -9537,6 +9539,7 @@ ‏‮Unmuted‬‏ ‏‮Voice‬‏ ‏‮Channels‬‏ ‏‮Voice‬‏ ‏‮channels‬‏ ‏‮matching‬‏ ‏‮**!!‬‏‏‮{prefix}‬‏‏‮!!**‬‏ + ‏‮We‬‏ ‏‮are‬‏ ‏‮having‬‏ ‏‮problems‬‏ ‏‮connecting‬‏ ‏‮you‬‏ ‏‮to‬‏ ‏‮this‬‏ ‏‮Channel.‬‏ ‏‮Please‬‏ ‏‮try‬‏ ‏‮later.‬‏ ‏‮Swipe‬‏ ‏‮up‬‏ ‏‮Minimize‬‏ ‏‮Got‬‏ ‏‮it‬‏ diff --git a/app/src/main/res/values-en-rXA/strings.xml b/app/src/main/res/values-en-rXA/strings.xml index fbbaf00e06..c57e20a650 100644 --- a/app/src/main/res/values-en-rXA/strings.xml +++ b/app/src/main/res/values-en-rXA/strings.xml @@ -3377,6 +3377,7 @@ [Šţåŕţ ÉVéñţ: »{eventName}« one two] [Šçĥéðûļéð ƒöŕ »{startTime}« one two three] [Šçĥéðûļéð åţ »{startTime}« one two] + [ÉVéñţ îš îñ þŕöĝŕéšš one two three] [Šţéþ »{step}« öƒ »{total}« one two] [**Ţöţåļ** (Ţåх Îñçļûðéð) one two three] [ÉVéñţš one two] @@ -5817,8 +5818,8 @@ [Ḿéḿɓéŕš ŵîţĥ ţĥîš þéŕḿîššîöñ çåñ ðŕåĝ öţĥéŕ ḿéḿɓéŕš öûţ öƒ ţĥîš çĥåññéļ. Ţĥéý çåñ öñļý ḿöVé ḿéḿɓéŕš ɓéţŵééñ çĥåññéļš ɓöţĥ ţĥéý åñð ţĥé ḿéḿɓéŕ ţĥéý åŕé ḿöVîñĝ ĥåVé åççéšš. one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen] [ḾöVé Ţö one two] [Ûšéŕ ĥåš ɓééñ ḿöVéð ţö ţĥé šéļéçţéð çĥåññéļ. one two three four five] - [Åļéŕţ Çļéåŕéð one two] - [Ñö Åļéŕţ Šĥöŵîñĝ one two three] + [Åļéŕţ Çļéåŕéð one two] + [Ñö Åļéŕţ Šĥöŵîñĝ one two three] [Ñéŵ ñöţîƒîçåţîöñ one two three] [ŔéḿöVé »%1$s« one two] [Ḿöŕé ţĥåñ %1$d ñéŵ ñöţîƒîçåţîöñš one two three four] @@ -5995,6 +5996,7 @@ [Fééļîñĝ åîḿļéšš¿ Ļîķé å þåþéŕ þļåñé ðŕîƒţîñĝ ţĥŕöûĝĥ ţĥé šķîéš¿ Ĝéţ šöḿé ƒŕîéñðš îñ ĥéŕé ɓý çŕéåţîñĝ åñ îñVîţé ļîñķ¡ one two three four five six seven eight nine ten eleven twelve] [Ñö îñVîţéš ýéţ¡ one two three] [Ñö îñVîţéš ýéţ one two three] + [Ñö öþţîöñš ḿåţçĥ ýöûŕ šéåŕçĥ. one two three four] [Îñšţŕûçţîöñš ƒöŕ éñåɓļîñĝ åççéšš ţö ýöûŕ ḿîçŕöþĥöñé çåñ ɓé ƒöûñð îñ ţĥé Ðîšçöŕð Ĥéļþ Çéñţéŕ. one two three four five six seven eight nine ten] [Ḿîçŕöþĥöñé Åççéšš îš Ðéñîéð one two three four] [Ðîšçöŕð ðöéš ñöţ ĥåVé åççéšš ţö ýöûŕ ḿîçŕöþĥöñé one two three four five six] @@ -6399,14 +6401,14 @@ [Éñţéŕ ýöûŕ çöñƒîŕḿåţîöñ çöðé ţö ŕéšéţ ýöûŕ þåššŵöŕð one two three four five six] [Þåššŵöŕð îš ŕéQûîŕéð. one two three] [Šĥöŵ þåššŵöŕð one two] - [Ļöĝîñ ŵîţĥ þåššŵöŕð îñšţéåð one two three four] + [Ļöĝ îñ ŵîţĥ þåššŵöŕð îñšţéåð one two three four] [Ŵé ŵîļļ šéñð å çöðé ţö »{recipient}«. one two three] [Šéñţ ţö »{recipient}«. one two] [Éñţéŕ ţĥé þåššŵöŕð ƒöŕ ţĥé åççöûñţ ŵîţĥ ţĥé éḿåîļ åððŕéšš »{email}« one two three four five six seven] [Éñţéŕ ţĥé þåššŵöŕð ƒöŕ ţĥé åççöûñţ ŵîţĥ ţĥé þĥöñé ñûḿɓéŕ »{phone}« one two three four five six seven] [Éñţéŕ ýöûŕ þåššŵöŕð one two three] [Ĝéţ å öñé-ţîḿé ļöĝîñ çöðé one two three] - [Éñţéŕ çöðé ţö ļöĝîñ one two three] + [Éñţéŕ çöðé ţö ļöĝ îñ one two three] [Çöñţîñûé one two] [Šéñð ḿé å öñé-ţîḿé ļöĝîñ çöðé îñšţéåð one two three four five] [Ŕéšéñð one two] @@ -9537,6 +9539,7 @@ [Ûñḿûţéð one two] [νöîçé Çĥåññéļš one two three] [νöîçé çĥåññéļš ḿåţçĥîñĝ **¡¡»{prefix}«¡¡** one two three four] + [Ŵé åŕé ĥåVîñĝ þŕöɓļéḿš çöññéçţîñĝ ýöû ţö ţĥîš Çĥåññéļ. Þļéåšé ţŕý ļåţéŕ. one two three four five six seven eight] [Šŵîþé ûþ one two] [Ḿîñîḿîžé one two] [Ĝöţ îţ one two] diff --git a/app/src/main/res/values/public.xml b/app/src/main/res/values/public.xml index 549c4c7907..cdae30a67c 100644 --- a/app/src/main/res/values/public.xml +++ b/app/src/main/res/values/public.xml @@ -17781,6299 +17781,6302 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fcb718ffd9..924c6ac70d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1420,7 +1420,7 @@ Select a color Transparency Use Default - 9bff5b153b054b9795275589ca942795 + 4d655413ba0744b19e4a7f9e88a165ec Coming Soon Slash command application {applicationName} {applicationName} application @@ -3393,6 +3393,7 @@ Start Event: {eventName} Scheduled for {startTime} Scheduled at {startTime} + Event is in progress Step {step} of {total} **Total** (Tax Included) Events @@ -5836,8 +5837,8 @@ Members with this permission can drag other members out of this channel. They can only move members between channels both they and the member they are moving have access. Move To User has been moved to the selected channel. - Alert Cleared - No Alert Showing + Alert Cleared + No Alert Showing New notification Remove %1$s More than %1$d new notifications @@ -6017,6 +6018,7 @@ Feeling aimless? Like a paper plane drifting through the skies? Get some friends in here by creating an invite link! No invites yet! No invites yet + No options match your search. Instructions for enabling access to your microphone can be found in the Discord Help Center. Microphone Access is Denied Discord does not have access to your microphone @@ -6421,14 +6423,14 @@ Enter your confirmation code to reset your password Password is required. Show password - Login with password instead + Log in with password instead We will send a code to {recipient}. Sent to {recipient}. Enter the password for the account with the email address {email} Enter the password for the account with the phone number {phone} Enter your password Get a one-time login code - Enter code to login + Enter code to log in Continue Send me a one-time login code instead Resend @@ -9566,6 +9568,7 @@ Unmuted Voice Channels Voice channels matching **!!{prefix}!!** + We are having problems connecting you to this Channel. Please try later. Swipe up Minimize Got it