diff --git a/app/build.gradle b/app/build.gradle index 96b8283859..f741890625 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 30 - versionCode 102109 - versionName "102.9 - Beta" + versionCode 102111 + versionName "102.11 - Beta" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5285addfae..3788496c8e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/java/com/discord/stores/StoreApplicationInteractions.java b/app/src/main/java/com/discord/stores/StoreApplicationInteractions.java index 18511657a3..b22203dc5a 100644 --- a/app/src/main/java/com/discord/stores/StoreApplicationInteractions.java +++ b/app/src/main/java/com/discord/stores/StoreApplicationInteractions.java @@ -486,7 +486,7 @@ public final class StoreApplicationInteractions extends StoreV2 { @StoreThread private final void handleSendApplicationCommandRequest(ApplicationCommandLocalSendData applicationCommandLocalSendData, List> list, Function0 function0, Function1 function1) { upsertApplicationCommandSendData(applicationCommandLocalSendData); - ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.restSubscribeOn$default(sendApplicationCommandObservable(applicationCommandLocalSendData, list), false, 1, null), StoreApplicationInteractions.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreApplicationInteractions$handleSendApplicationCommandRequest$1(this, applicationCommandLocalSendData, function0, function1), 62, (Object) null); + ObservableExtensionsKt.appSubscribe$default(sendApplicationCommandObservable(applicationCommandLocalSendData, list), StoreApplicationInteractions.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new StoreApplicationInteractions$handleSendApplicationCommandRequest$1(this, applicationCommandLocalSendData, function0, function1), 62, (Object) null); } /* JADX DEBUG: Multi-variable search result rejected for r1v0, resolved type: com.discord.stores.StoreApplicationInteractions */ diff --git a/app/src/main/java/com/discord/stores/StoreMessages$enqueueRequest$1.java b/app/src/main/java/com/discord/stores/StoreMessages$enqueueRequest$1.java new file mode 100644 index 0000000000..3c39f9025e --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreMessages$enqueueRequest$1.java @@ -0,0 +1,28 @@ +package com.discord.stores; + +import com.discord.utilities.messagesend.MessageQueue; +import com.discord.utilities.messagesend.MessageRequest; +import com.discord.utilities.messagesend.MessageResult; +import d0.z.d.m; +import kotlin.jvm.functions.Function1; +import rx.Emitter; +import rx.functions.Action1; +/* compiled from: StoreMessages.kt */ +public final class StoreMessages$enqueueRequest$1 implements Action1> { + public final /* synthetic */ long $channelId; + public final /* synthetic */ Function1 $createRequest; + public final /* synthetic */ StoreMessages this$0; + + public StoreMessages$enqueueRequest$1(StoreMessages storeMessages, long j, Function1 function1) { + this.this$0 = storeMessages; + this.$channelId = j; + this.$createRequest = function1; + } + + public final void call(Emitter emitter) { + MessageQueue access$getOrCreateMessageQueue = StoreMessages.access$getOrCreateMessageQueue(this.this$0, this.$channelId); + Function1 function1 = this.$createRequest; + m.checkNotNullExpressionValue(emitter, "emitter"); + access$getOrCreateMessageQueue.enqueue((MessageRequest) function1.invoke(emitter)); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$5.java b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$5.java index 158caab654..71f26f9d39 100644 --- a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$5.java +++ b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$5.java @@ -1,28 +1,38 @@ package com.discord.stores; -import com.discord.utilities.messagesend.MessageQueue; -import com.discord.utilities.messagesend.MessageRequest; -import com.discord.utilities.messagesend.MessageResult; +import android.content.Context; +import androidx.work.Constraints; +import androidx.work.ExistingWorkPolicy; +import androidx.work.NetworkType; +import androidx.work.OneTimeWorkRequest; +import androidx.work.WorkManager; +import com.discord.models.message.Message; +import com.discord.workers.BackgroundMessageSendWorker; import d0.z.d.m; -import kotlin.jvm.functions.Function1; -import rx.Emitter; -import rx.functions.Action1; +import d0.z.d.o; +import java.util.concurrent.TimeUnit; +import kotlin.Unit; +import kotlin.jvm.functions.Function0; /* compiled from: StoreMessages.kt */ -public final class StoreMessages$sendMessage$5 implements Action1> { - public final /* synthetic */ long $channelId; - public final /* synthetic */ Function1 $request; +public final class StoreMessages$sendMessage$5 extends o implements Function0 { + public final /* synthetic */ Message $message; public final /* synthetic */ StoreMessages this$0; - public StoreMessages$sendMessage$5(StoreMessages storeMessages, long j, Function1 function1) { + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public StoreMessages$sendMessage$5(StoreMessages storeMessages, Message message) { + super(0); this.this$0 = storeMessages; - this.$channelId = j; - this.$request = function1; + this.$message = message; } - public final void call(Emitter emitter) { - MessageQueue access$getOrCreateMessageQueue = StoreMessages.access$getOrCreateMessageQueue(this.this$0, this.$channelId); - Function1 function1 = this.$request; - m.checkNotNullExpressionValue(emitter, "emitter"); - access$getOrCreateMessageQueue.enqueue((MessageRequest) function1.invoke(emitter)); + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + StoreMessages.access$handleLocalMessageCreate(this.this$0, this.$message); + Context access$getContext$p = StoreMessages.access$getContext$p(this.this$0); + m.checkNotNullParameter(access$getContext$p, "context"); + OneTimeWorkRequest build = new OneTimeWorkRequest.Builder(BackgroundMessageSendWorker.class).setInitialDelay(120000, TimeUnit.MILLISECONDS).setConstraints(new Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build()).build(); + m.checkNotNullExpressionValue(build, "OneTimeWorkRequestBuilde… )\n .build()"); + WorkManager.getInstance(access$getContext$p).enqueueUniqueWork("BACKGROUND_MESSAGE_SENDING", ExistingWorkPolicy.REPLACE, build); } } diff --git a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$6.java b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$6.java deleted file mode 100644 index c461f4d002..0000000000 --- a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$6.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.discord.stores; - -import android.content.Context; -import androidx.work.Constraints; -import androidx.work.ExistingWorkPolicy; -import androidx.work.NetworkType; -import androidx.work.OneTimeWorkRequest; -import androidx.work.WorkManager; -import com.discord.models.message.Message; -import com.discord.workers.BackgroundMessageSendWorker; -import d0.z.d.m; -import d0.z.d.o; -import java.util.concurrent.TimeUnit; -import kotlin.Unit; -import kotlin.jvm.functions.Function0; -/* compiled from: StoreMessages.kt */ -public final class StoreMessages$sendMessage$6 extends o implements Function0 { - public final /* synthetic */ Message $message; - public final /* synthetic */ StoreMessages this$0; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public StoreMessages$sendMessage$6(StoreMessages storeMessages, Message message) { - super(0); - this.this$0 = storeMessages; - this.$message = message; - } - - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public final void mo1invoke() { - StoreMessages.access$handleLocalMessageCreate(this.this$0, this.$message); - Context access$getContext$p = StoreMessages.access$getContext$p(this.this$0); - m.checkNotNullParameter(access$getContext$p, "context"); - OneTimeWorkRequest build = new OneTimeWorkRequest.Builder(BackgroundMessageSendWorker.class).setInitialDelay(120000, TimeUnit.MILLISECONDS).setConstraints(new Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build()).build(); - m.checkNotNullExpressionValue(build, "OneTimeWorkRequestBuilde… )\n .build()"); - WorkManager.getInstance(access$getContext$p).enqueueUniqueWork("BACKGROUND_MESSAGE_SENDING", ExistingWorkPolicy.REPLACE, build); - } -} diff --git a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7$request$1.java b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7$request$1.java deleted file mode 100644 index 346b8cc9ce..0000000000 --- a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7$request$1.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.discord.stores; - -import com.discord.stores.StoreMessages; -import com.discord.utilities.messagesend.MessageResult; -import d0.z.d.m; -import d0.z.d.o; -import kotlin.Unit; -import kotlin.jvm.functions.Function0; -import kotlin.jvm.functions.Function2; -import rx.Emitter; -/* compiled from: StoreMessages.kt */ -public final class StoreMessages$sendMessage$7$request$1 extends o implements Function2 { - public final /* synthetic */ Emitter $emitter; - public final /* synthetic */ StoreMessages$sendMessage$7 this$0; - - /* compiled from: StoreMessages.kt */ - /* renamed from: com.discord.stores.StoreMessages$sendMessage$7$request$1$1 reason: invalid class name */ - public static final class AnonymousClass1 extends o implements Function0 { - public final /* synthetic */ StoreMessages$sendMessage$7$request$1 this$0; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public AnonymousClass1(StoreMessages$sendMessage$7$request$1 storeMessages$sendMessage$7$request$1) { - super(0); - this.this$0 = storeMessages$sendMessage$7$request$1; - } - - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public final void mo1invoke() { - StoreMessages.Companion.access$cancelBackgroundSendingWork(StoreMessages.Companion, StoreMessages.access$getContext$p(this.this$0.this$0.this$0)); - } - } - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public StoreMessages$sendMessage$7$request$1(StoreMessages$sendMessage$7 storeMessages$sendMessage$7, Emitter emitter) { - super(2); - this.this$0 = storeMessages$sendMessage$7; - this.$emitter = emitter; - } - - /* Return type fixed from 'java.lang.Object' to match base method */ - /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */ - @Override // kotlin.jvm.functions.Function2 - public /* bridge */ /* synthetic */ Unit invoke(MessageResult messageResult, Boolean bool) { - invoke(messageResult, bool.booleanValue()); - return Unit.a; - } - - public final void invoke(MessageResult messageResult, boolean z2) { - m.checkNotNullParameter(messageResult, "messageResult"); - this.$emitter.onNext(messageResult); - this.$emitter.onCompleted(); - if (z2) { - StoreMessages.access$getDispatcher$p(this.this$0.this$0).schedule(new AnonymousClass1(this)); - } - } -} diff --git a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7$request$2.java b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7$request$2.java deleted file mode 100644 index eabc8adcc2..0000000000 --- a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7$request$2.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.discord.stores; - -import com.discord.utilities.rest.SendUtils; -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: StoreMessages.kt */ -public final class StoreMessages$sendMessage$7$request$2 extends o implements Function1 { - public final /* synthetic */ StoreMessages$sendMessage$7 this$0; - - /* compiled from: StoreMessages.kt */ - /* renamed from: com.discord.stores.StoreMessages$sendMessage$7$request$2$1 reason: invalid class name */ - public static final class AnonymousClass1 extends o implements Function0 { - public final /* synthetic */ String $displayName; - public final /* synthetic */ String $mimeType; - public final /* synthetic */ int $numFiles; - public final /* synthetic */ StoreMessages$sendMessage$7$request$2 this$0; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public AnonymousClass1(StoreMessages$sendMessage$7$request$2 storeMessages$sendMessage$7$request$2, int i, String str, String str2) { - super(0); - this.this$0 = storeMessages$sendMessage$7$request$2; - this.$numFiles = i; - this.$displayName = str; - this.$mimeType = str2; - } - - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public final void mo1invoke() { - StoreMessages.access$getStream$p(this.this$0.this$0.this$0).getMessageUploads$app_productionBetaRelease().onPreprocessing(this.this$0.this$0.$applicationCommandLocalSendData.getNonceString(), this.$numFiles, this.$displayName, this.$mimeType); - } - } - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public StoreMessages$sendMessage$7$request$2(StoreMessages$sendMessage$7 storeMessages$sendMessage$7) { - super(1); - this.this$0 = storeMessages$sendMessage$7; - } - - /* 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(SendUtils.SendPayload.Preprocessing preprocessing) { - invoke(preprocessing); - return Unit.a; - } - - public final void invoke(SendUtils.SendPayload.Preprocessing preprocessing) { - m.checkNotNullParameter(preprocessing, ""); - StoreMessages.access$getDispatcher$p(this.this$0.this$0).schedule(new AnonymousClass1(this, preprocessing.component1(), preprocessing.component2(), preprocessing.component3())); - } -} diff --git a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7$request$3.java b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7$request$3.java deleted file mode 100644 index 734131aa8c..0000000000 --- a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7$request$3.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.discord.stores; - -import com.discord.utilities.rest.SendUtils; -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; -/* compiled from: StoreMessages.kt */ -public final class StoreMessages$sendMessage$7$request$3 extends o implements Function1, Unit> { - public final /* synthetic */ StoreMessages$sendMessage$7 this$0; - - /* compiled from: StoreMessages.kt */ - /* renamed from: com.discord.stores.StoreMessages$sendMessage$7$request$3$1 reason: invalid class name */ - public static final class AnonymousClass1 extends o implements Function0 { - public final /* synthetic */ List $uploads; - public final /* synthetic */ StoreMessages$sendMessage$7$request$3 this$0; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public AnonymousClass1(StoreMessages$sendMessage$7$request$3 storeMessages$sendMessage$7$request$3, List list) { - super(0); - this.this$0 = storeMessages$sendMessage$7$request$3; - this.$uploads = list; - } - - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public final void mo1invoke() { - StoreMessages.access$getStream$p(this.this$0.this$0.this$0).getMessageUploads$app_productionBetaRelease().bindUpload(this.this$0.this$0.$applicationCommandLocalSendData.getNonceString(), this.$uploads); - } - } - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public StoreMessages$sendMessage$7$request$3(StoreMessages$sendMessage$7 storeMessages$sendMessage$7) { - super(1); - this.this$0 = storeMessages$sendMessage$7; - } - - /* 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(List list) { - invoke((List) list); - return Unit.a; - } - - public final void invoke(List list) { - m.checkNotNullParameter(list, "uploads"); - StoreMessages.access$getDispatcher$p(this.this$0.this$0).schedule(new AnonymousClass1(this, list)); - } -} diff --git a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7.java b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7.java deleted file mode 100644 index 6917804e20..0000000000 --- a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.discord.stores; - -import com.discord.api.utcdatetime.UtcDateTime; -import com.discord.models.commands.ApplicationCommandLocalSendData; -import com.discord.models.message.Message; -import com.discord.utilities.messagesend.MessageRequest; -import com.discord.utilities.messagesend.MessageResult; -import java.util.List; -import rx.Emitter; -import rx.functions.Action1; -/* compiled from: StoreMessages.kt */ -public final class StoreMessages$sendMessage$7 implements Action1> { - public final /* synthetic */ ApplicationCommandLocalSendData $applicationCommandLocalSendData; - public final /* synthetic */ List $attachments; - public final /* synthetic */ Message $message; - public final /* synthetic */ StoreMessages this$0; - - public StoreMessages$sendMessage$7(StoreMessages storeMessages, Message message, ApplicationCommandLocalSendData applicationCommandLocalSendData, List list) { - this.this$0 = storeMessages; - this.$message = message; - this.$applicationCommandLocalSendData = applicationCommandLocalSendData; - this.$attachments = list; - } - - public final void call(Emitter emitter) { - com.discord.api.message.Message synthesizeApiMessage = this.$message.synthesizeApiMessage(); - ApplicationCommandLocalSendData applicationCommandLocalSendData = this.$applicationCommandLocalSendData; - UtcDateTime timestamp = this.$message.getTimestamp(); - StoreMessages.access$getOrCreateMessageQueue(this.this$0, this.$message.getChannelId()).enqueue(new MessageRequest.SendApplicationCommand(synthesizeApiMessage, applicationCommandLocalSendData, this.$attachments, new StoreMessages$sendMessage$7$request$2(this), new StoreMessages$sendMessage$7$request$3(this), new StoreMessages$sendMessage$7$request$1(this, emitter), timestamp != null ? timestamp.g() : 0)); - } -} diff --git a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$request$1.java b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$createRequest$1.java similarity index 77% rename from app/src/main/java/com/discord/stores/StoreMessages$sendMessage$request$1.java rename to app/src/main/java/com/discord/stores/StoreMessages$sendMessage$createRequest$1.java index cf1d1bb456..96ed52207a 100644 --- a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$request$1.java +++ b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$createRequest$1.java @@ -17,7 +17,7 @@ import kotlin.jvm.functions.Function2; import kotlin.jvm.internal.Ref$ObjectRef; import rx.Emitter; /* compiled from: StoreMessages.kt */ -public final class StoreMessages$sendMessage$request$1 extends o implements Function1, MessageRequest.Send> { +public final class StoreMessages$sendMessage$createRequest$1 extends o implements Function1, MessageRequest.Send> { public final /* synthetic */ Activity $activity; public final /* synthetic */ long $attemptTimestamp; public final /* synthetic */ Message $localMessage; @@ -25,13 +25,13 @@ public final class StoreMessages$sendMessage$request$1 extends o implements Func public final /* synthetic */ StoreMessages this$0; /* compiled from: StoreMessages.kt */ - /* renamed from: com.discord.stores.StoreMessages$sendMessage$request$1$1 reason: invalid class name */ + /* renamed from: com.discord.stores.StoreMessages$sendMessage$createRequest$1$1 reason: invalid class name */ public static final class AnonymousClass1 extends o implements Function2 { public final /* synthetic */ Emitter $emitter; - public final /* synthetic */ StoreMessages$sendMessage$request$1 this$0; + public final /* synthetic */ StoreMessages$sendMessage$createRequest$1 this$0; /* compiled from: StoreMessages.kt */ - /* renamed from: com.discord.stores.StoreMessages$sendMessage$request$1$1$1 reason: invalid class name */ + /* renamed from: com.discord.stores.StoreMessages$sendMessage$createRequest$1$1$1 reason: invalid class name */ public static final class AnonymousClass1 extends o implements Function0 { public final /* synthetic */ boolean $isLastMessage; public final /* synthetic */ MessageResult $result; @@ -57,26 +57,26 @@ public final class StoreMessages$sendMessage$request$1 extends o implements Func this.this$0.this$0.this$0.handleMessageCreate(m.listOf(((MessageResult.Success) this.$result).getMessage())); Integer numRetries = this.this$0.this$0.$localMessage.getNumRetries(); if ((numRetries != null ? numRetries.intValue() : 0) > 0) { - StoreMessages$sendMessage$request$1 storeMessages$sendMessage$request$1 = this.this$0.this$0; - StoreMessages.access$trackFailedLocalMessageResolved(storeMessages$sendMessage$request$1.this$0, storeMessages$sendMessage$request$1.$localMessage, FailedMessageResolutionType.RESENT); + StoreMessages$sendMessage$createRequest$1 storeMessages$sendMessage$createRequest$1 = this.this$0.this$0; + StoreMessages.access$trackFailedLocalMessageResolved(storeMessages$sendMessage$createRequest$1.this$0, storeMessages$sendMessage$createRequest$1.$localMessage, FailedMessageResolutionType.RESENT); } } else if (messageResult instanceof MessageResult.Slowmode) { - StoreMessages$sendMessage$request$1 storeMessages$sendMessage$request$12 = this.this$0.this$0; - StoreMessages.access$handleSendMessageFailure(storeMessages$sendMessage$request$12.this$0, storeMessages$sendMessage$request$12.$localMessage); + StoreMessages$sendMessage$createRequest$1 storeMessages$sendMessage$createRequest$12 = this.this$0.this$0; + StoreMessages.access$handleSendMessageFailure(storeMessages$sendMessage$createRequest$12.this$0, storeMessages$sendMessage$createRequest$12.$localMessage); StoreMessages.access$getStream$p(this.this$0.this$0.this$0).getSlowMode$app_productionBetaRelease().onCooldown(this.this$0.this$0.$localMessage.getChannelId(), ((MessageResult.Slowmode) this.$result).getCooldownMs(), StoreSlowMode.Type.MessageSend.INSTANCE); } else if (!(messageResult instanceof MessageResult.RateLimited)) { if (messageResult instanceof MessageResult.UserCancelled) { - StoreMessages$sendMessage$request$1 storeMessages$sendMessage$request$13 = this.this$0.this$0; - StoreMessages.access$handleLocalMessageDelete(storeMessages$sendMessage$request$13.this$0, storeMessages$sendMessage$request$13.$localMessage); + StoreMessages$sendMessage$createRequest$1 storeMessages$sendMessage$createRequest$13 = this.this$0.this$0; + StoreMessages.access$handleLocalMessageDelete(storeMessages$sendMessage$createRequest$13.this$0, storeMessages$sendMessage$createRequest$13.$localMessage); } else if (messageResult instanceof MessageResult.UnknownFailure) { - StoreMessages$sendMessage$request$1 storeMessages$sendMessage$request$14 = this.this$0.this$0; - StoreMessages.access$handleSendMessageFailure(storeMessages$sendMessage$request$14.this$0, storeMessages$sendMessage$request$14.$localMessage); + StoreMessages$sendMessage$createRequest$1 storeMessages$sendMessage$createRequest$14 = this.this$0.this$0; + StoreMessages.access$handleSendMessageFailure(storeMessages$sendMessage$createRequest$14.this$0, storeMessages$sendMessage$createRequest$14.$localMessage); } else if (messageResult instanceof MessageResult.ValidationError) { - StoreMessages$sendMessage$request$1 storeMessages$sendMessage$request$15 = this.this$0.this$0; - StoreMessages.access$handleSendMessageValidationError(storeMessages$sendMessage$request$15.this$0, storeMessages$sendMessage$request$15.$localMessage, ((MessageResult.ValidationError) messageResult).getMessage()); + StoreMessages$sendMessage$createRequest$1 storeMessages$sendMessage$createRequest$15 = this.this$0.this$0; + StoreMessages.access$handleSendMessageValidationError(storeMessages$sendMessage$createRequest$15.this$0, storeMessages$sendMessage$createRequest$15.$localMessage, ((MessageResult.ValidationError) messageResult).getMessage()); } else if (!(messageResult instanceof MessageResult.NetworkFailure) && (messageResult instanceof MessageResult.Timeout)) { - StoreMessages$sendMessage$request$1 storeMessages$sendMessage$request$16 = this.this$0.this$0; - StoreMessages.access$handleSendMessageFailure(storeMessages$sendMessage$request$16.this$0, storeMessages$sendMessage$request$16.$localMessage); + StoreMessages$sendMessage$createRequest$1 storeMessages$sendMessage$createRequest$16 = this.this$0.this$0; + StoreMessages.access$handleSendMessageFailure(storeMessages$sendMessage$createRequest$16.this$0, storeMessages$sendMessage$createRequest$16.$localMessage); } } this.this$0.$emitter.onNext(this.$result); @@ -85,9 +85,9 @@ public final class StoreMessages$sendMessage$request$1 extends o implements Func } /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public AnonymousClass1(StoreMessages$sendMessage$request$1 storeMessages$sendMessage$request$1, Emitter emitter) { + public AnonymousClass1(StoreMessages$sendMessage$createRequest$1 storeMessages$sendMessage$createRequest$1, Emitter emitter) { super(2); - this.this$0 = storeMessages$sendMessage$request$1; + this.this$0 = storeMessages$sendMessage$createRequest$1; this.$emitter = emitter; } @@ -106,12 +106,12 @@ public final class StoreMessages$sendMessage$request$1 extends o implements Func } /* compiled from: StoreMessages.kt */ - /* renamed from: com.discord.stores.StoreMessages$sendMessage$request$1$2 reason: invalid class name */ + /* renamed from: com.discord.stores.StoreMessages$sendMessage$createRequest$1$2 reason: invalid class name */ public static final class AnonymousClass2 extends o implements Function1 { - public final /* synthetic */ StoreMessages$sendMessage$request$1 this$0; + public final /* synthetic */ StoreMessages$sendMessage$createRequest$1 this$0; /* compiled from: StoreMessages.kt */ - /* renamed from: com.discord.stores.StoreMessages$sendMessage$request$1$2$1 reason: invalid class name */ + /* renamed from: com.discord.stores.StoreMessages$sendMessage$createRequest$1$2$1 reason: invalid class name */ public static final class AnonymousClass1 extends o implements Function0 { public final /* synthetic */ String $displayName; public final /* synthetic */ String $mimeType; @@ -138,9 +138,9 @@ public final class StoreMessages$sendMessage$request$1 extends o implements Func } /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public AnonymousClass2(StoreMessages$sendMessage$request$1 storeMessages$sendMessage$request$1) { + public AnonymousClass2(StoreMessages$sendMessage$createRequest$1 storeMessages$sendMessage$createRequest$1) { super(1); - this.this$0 = storeMessages$sendMessage$request$1; + this.this$0 = storeMessages$sendMessage$createRequest$1; } /* Return type fixed from 'java.lang.Object' to match base method */ @@ -158,12 +158,12 @@ public final class StoreMessages$sendMessage$request$1 extends o implements Func } /* compiled from: StoreMessages.kt */ - /* renamed from: com.discord.stores.StoreMessages$sendMessage$request$1$3 reason: invalid class name */ + /* renamed from: com.discord.stores.StoreMessages$sendMessage$createRequest$1$3 reason: invalid class name */ public static final class AnonymousClass3 extends o implements Function1, Unit> { - public final /* synthetic */ StoreMessages$sendMessage$request$1 this$0; + public final /* synthetic */ StoreMessages$sendMessage$createRequest$1 this$0; /* compiled from: StoreMessages.kt */ - /* renamed from: com.discord.stores.StoreMessages$sendMessage$request$1$3$1 reason: invalid class name */ + /* renamed from: com.discord.stores.StoreMessages$sendMessage$createRequest$1$3$1 reason: invalid class name */ public static final class AnonymousClass1 extends o implements Function0 { public final /* synthetic */ List $uploads; public final /* synthetic */ AnonymousClass3 this$0; @@ -186,9 +186,9 @@ public final class StoreMessages$sendMessage$request$1 extends o implements Func } /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public AnonymousClass3(StoreMessages$sendMessage$request$1 storeMessages$sendMessage$request$1) { + public AnonymousClass3(StoreMessages$sendMessage$createRequest$1 storeMessages$sendMessage$createRequest$1) { super(1); - this.this$0 = storeMessages$sendMessage$request$1; + this.this$0 = storeMessages$sendMessage$createRequest$1; } /* Return type fixed from 'java.lang.Object' to match base method */ @@ -206,7 +206,7 @@ public final class StoreMessages$sendMessage$request$1 extends o implements Func } /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public StoreMessages$sendMessage$request$1(StoreMessages storeMessages, Message message, Ref$ObjectRef ref$ObjectRef, Activity activity, long j) { + public StoreMessages$sendMessage$createRequest$1(StoreMessages storeMessages, Message message, Ref$ObjectRef ref$ObjectRef, Activity activity, long j) { super(1); this.this$0 = storeMessages; this.$localMessage = message; diff --git a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$createRequest$2.java b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$createRequest$2.java new file mode 100644 index 0000000000..1a68e0199a --- /dev/null +++ b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$createRequest$2.java @@ -0,0 +1,184 @@ +package com.discord.stores; + +import com.discord.api.utcdatetime.UtcDateTime; +import com.discord.models.commands.ApplicationCommandLocalSendData; +import com.discord.models.message.Message; +import com.discord.stores.StoreMessages; +import com.discord.utilities.messagesend.MessageRequest; +import com.discord.utilities.messagesend.MessageResult; +import com.discord.utilities.rest.SendUtils; +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; +import kotlin.jvm.functions.Function2; +import rx.Emitter; +/* compiled from: StoreMessages.kt */ +public final class StoreMessages$sendMessage$createRequest$2 extends o implements Function1, MessageRequest.SendApplicationCommand> { + public final /* synthetic */ ApplicationCommandLocalSendData $applicationCommandLocalSendData; + public final /* synthetic */ List $attachments; + public final /* synthetic */ Message $message; + public final /* synthetic */ StoreMessages this$0; + + /* compiled from: StoreMessages.kt */ + /* renamed from: com.discord.stores.StoreMessages$sendMessage$createRequest$2$1 reason: invalid class name */ + public static final class AnonymousClass1 extends o implements Function2 { + public final /* synthetic */ Emitter $emitter; + public final /* synthetic */ StoreMessages$sendMessage$createRequest$2 this$0; + + /* compiled from: StoreMessages.kt */ + /* renamed from: com.discord.stores.StoreMessages$sendMessage$createRequest$2$1$1 reason: invalid class name */ + public static final class AnonymousClass1 extends o implements Function0 { + public final /* synthetic */ AnonymousClass1 this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public AnonymousClass1(AnonymousClass1 r1) { + super(0); + this.this$0 = r1; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + StoreMessages.Companion.access$cancelBackgroundSendingWork(StoreMessages.Companion, StoreMessages.access$getContext$p(this.this$0.this$0.this$0)); + } + } + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public AnonymousClass1(StoreMessages$sendMessage$createRequest$2 storeMessages$sendMessage$createRequest$2, Emitter emitter) { + super(2); + this.this$0 = storeMessages$sendMessage$createRequest$2; + this.$emitter = emitter; + } + + /* Return type fixed from 'java.lang.Object' to match base method */ + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object, java.lang.Object] */ + @Override // kotlin.jvm.functions.Function2 + public /* bridge */ /* synthetic */ Unit invoke(MessageResult messageResult, Boolean bool) { + invoke(messageResult, bool.booleanValue()); + return Unit.a; + } + + public final void invoke(MessageResult messageResult, boolean z2) { + m.checkNotNullParameter(messageResult, "messageResult"); + this.$emitter.onNext(messageResult); + this.$emitter.onCompleted(); + if (z2) { + StoreMessages.access$getDispatcher$p(this.this$0.this$0).schedule(new AnonymousClass1(this)); + } + } + } + + /* compiled from: StoreMessages.kt */ + /* renamed from: com.discord.stores.StoreMessages$sendMessage$createRequest$2$2 reason: invalid class name */ + public static final class AnonymousClass2 extends o implements Function1 { + public final /* synthetic */ StoreMessages$sendMessage$createRequest$2 this$0; + + /* compiled from: StoreMessages.kt */ + /* renamed from: com.discord.stores.StoreMessages$sendMessage$createRequest$2$2$1 reason: invalid class name */ + public static final class AnonymousClass1 extends o implements Function0 { + public final /* synthetic */ String $displayName; + public final /* synthetic */ String $mimeType; + public final /* synthetic */ int $numFiles; + public final /* synthetic */ AnonymousClass2 this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public AnonymousClass1(AnonymousClass2 r1, int i, String str, String str2) { + super(0); + this.this$0 = r1; + this.$numFiles = i; + this.$displayName = str; + this.$mimeType = str2; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + StoreMessages.access$getStream$p(this.this$0.this$0.this$0).getMessageUploads$app_productionBetaRelease().onPreprocessing(this.this$0.this$0.$applicationCommandLocalSendData.getNonceString(), this.$numFiles, this.$displayName, this.$mimeType); + } + } + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public AnonymousClass2(StoreMessages$sendMessage$createRequest$2 storeMessages$sendMessage$createRequest$2) { + super(1); + this.this$0 = storeMessages$sendMessage$createRequest$2; + } + + /* 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(SendUtils.SendPayload.Preprocessing preprocessing) { + invoke(preprocessing); + return Unit.a; + } + + public final void invoke(SendUtils.SendPayload.Preprocessing preprocessing) { + m.checkNotNullParameter(preprocessing, ""); + StoreMessages.access$getDispatcher$p(this.this$0.this$0).schedule(new AnonymousClass1(this, preprocessing.component1(), preprocessing.component2(), preprocessing.component3())); + } + } + + /* compiled from: StoreMessages.kt */ + /* renamed from: com.discord.stores.StoreMessages$sendMessage$createRequest$2$3 reason: invalid class name */ + public static final class AnonymousClass3 extends o implements Function1, Unit> { + public final /* synthetic */ StoreMessages$sendMessage$createRequest$2 this$0; + + /* compiled from: StoreMessages.kt */ + /* renamed from: com.discord.stores.StoreMessages$sendMessage$createRequest$2$3$1 reason: invalid class name */ + public static final class AnonymousClass1 extends o implements Function0 { + public final /* synthetic */ List $uploads; + public final /* synthetic */ AnonymousClass3 this$0; + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public AnonymousClass1(AnonymousClass3 r1, List list) { + super(0); + this.this$0 = r1; + this.$uploads = list; + } + + @Override // kotlin.jvm.functions.Function0 + /* renamed from: invoke */ + public final void mo1invoke() { + StoreMessages.access$getStream$p(this.this$0.this$0.this$0).getMessageUploads$app_productionBetaRelease().bindUpload(this.this$0.this$0.$applicationCommandLocalSendData.getNonceString(), this.$uploads); + } + } + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public AnonymousClass3(StoreMessages$sendMessage$createRequest$2 storeMessages$sendMessage$createRequest$2) { + super(1); + this.this$0 = storeMessages$sendMessage$createRequest$2; + } + + /* 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(List list) { + invoke((List) list); + return Unit.a; + } + + public final void invoke(List list) { + m.checkNotNullParameter(list, "uploads"); + StoreMessages.access$getDispatcher$p(this.this$0.this$0).schedule(new AnonymousClass1(this, list)); + } + } + + /* JADX INFO: super call moved to the top of the method (can break code semantics) */ + public StoreMessages$sendMessage$createRequest$2(StoreMessages storeMessages, Message message, ApplicationCommandLocalSendData applicationCommandLocalSendData, List list) { + super(1); + this.this$0 = storeMessages; + this.$message = message; + this.$applicationCommandLocalSendData = applicationCommandLocalSendData; + this.$attachments = list; + } + + public final MessageRequest.SendApplicationCommand invoke(Emitter emitter) { + m.checkNotNullParameter(emitter, "emitter"); + com.discord.api.message.Message synthesizeApiMessage = this.$message.synthesizeApiMessage(); + ApplicationCommandLocalSendData applicationCommandLocalSendData = this.$applicationCommandLocalSendData; + UtcDateTime timestamp = this.$message.getTimestamp(); + return new MessageRequest.SendApplicationCommand(synthesizeApiMessage, applicationCommandLocalSendData, this.$attachments, new AnonymousClass2(this), new AnonymousClass3(this), new AnonymousClass1(this, emitter), timestamp != null ? timestamp.g() : 0); + } +} diff --git a/app/src/main/java/com/discord/stores/StoreMessages.java b/app/src/main/java/com/discord/stores/StoreMessages.java index 4a66a9a49a..09228caa00 100644 --- a/app/src/main/java/com/discord/stores/StoreMessages.java +++ b/app/src/main/java/com/discord/stores/StoreMessages.java @@ -149,6 +149,13 @@ public final class StoreMessages extends Store { storeMessages.trackFailedLocalMessageResolved(message, failedMessageResolutionType); } + private final Observable enqueueRequest(long j, Function1, ? extends MessageRequest> function1) { + Observable X = Observable.n(new StoreMessages$enqueueRequest$1(this, j, function1), Emitter.BackpressureMode.ERROR).X(this.dispatcher.getScheduler()); + m.checkNotNullExpressionValue(X, "Observable.create values = this.messageQueues.values(); - m.checkNotNullExpressionValue(values, "messageQueues.values"); - for (MessageQueue messageQueue : values) { - messageQueue.handleConnected(); - } + Collection values = this.messageQueues.values(); + m.checkNotNullExpressionValue(values, "messageQueues.values"); + for (MessageQueue messageQueue : values) { + messageQueue.handleConnected(); } } @@ -638,18 +642,18 @@ public final class StoreMessages extends Store { throw new IllegalArgumentException("Incorrect " + z2 + " auto attempt and message type " + message.getType()); } - /* JADX DEBUG: Multi-variable search result rejected for r31v0, resolved type: java.util.List> */ + /* JADX DEBUG: Multi-variable search result rejected for r28v0, resolved type: java.util.List> */ /* JADX WARN: Multi-variable type inference failed */ /* JADX WARNING: Unknown variable types count: 1 */ public final Observable sendMessage(long j, com.discord.models.user.User user, String str, List list, List> list2, List list3, MessageReference messageReference, MessageAllowedMentions messageAllowedMentions, Application application, Activity activity, MessageActivity messageActivity, Long l, Long l2, Integer num) { List list4; ArrayList arrayList; String str2 = str; - Emitter.BackpressureMode backpressureMode = Emitter.BackpressureMode.ERROR; m.checkNotNullParameter(user, "author"); m.checkNotNullParameter(str2, "content"); Ref$ObjectRef ref$ObjectRef = new Ref$ObjectRef(); ref$ObjectRef.element = list2; + int i = 0; if (!(list2 == 0 || list2.isEmpty())) { ProcessedMessageContent.Companion companion = ProcessedMessageContent.Companion; Context context = this.context; @@ -673,7 +677,7 @@ public final class StoreMessages extends Store { List list5 = ref$ObjectRef.element; if (list5 == null || list5.isEmpty()) { if (str2.length() == 0) { - Observable n = Observable.n(StoreMessages$sendMessage$2.INSTANCE, backpressureMode); + Observable n = Observable.n(StoreMessages$sendMessage$2.INSTANCE, Emitter.BackpressureMode.ERROR); m.checkNotNullExpressionValue(n, "Observable.create({ emit…r.BackpressureMode.ERROR)"); return n; } @@ -702,22 +706,23 @@ public final class StoreMessages extends Store { } else { arrayList = null; } - Message createLocalMessage = LocalMessageCreatorsKt.createLocalMessage(str2, j, synthesizeApiUser2, list4, false, z2, application, messageActivity, clock2, arrayList, Long.valueOf(longValue), Long.valueOf(l2 != null ? l2.longValue() : this.clock.currentTimeMillis()), Integer.valueOf(num != null ? num.intValue() : 0), list3, messageReference, messageAllowedMentions); + Long valueOf = Long.valueOf(longValue); + Long valueOf2 = Long.valueOf(l2 != null ? l2.longValue() : this.clock.currentTimeMillis()); + if (num != null) { + i = num.intValue(); + } + Message createLocalMessage = LocalMessageCreatorsKt.createLocalMessage(str2, j, synthesizeApiUser2, list4, false, z2, application, messageActivity, clock2, arrayList, valueOf, valueOf2, Integer.valueOf(i), list3, messageReference, messageAllowedMentions); if (messageActivity == null) { this.dispatcher.schedule(new StoreMessages$sendMessage$3(this, createLocalMessage)); } this.dispatcher.schedule(new StoreMessages$sendMessage$4(this)); - Observable n2 = Observable.n(new StoreMessages$sendMessage$5(this, j, new StoreMessages$sendMessage$request$1(this, createLocalMessage, ref$ObjectRef, activity, longValue)), backpressureMode); - m.checkNotNullExpressionValue(n2, "Observable.create({ emit…r.BackpressureMode.ERROR)"); - return n2; + return enqueueRequest(j, new StoreMessages$sendMessage$createRequest$1(this, createLocalMessage, ref$ObjectRef, activity, longValue)); } public final Observable sendMessage(Message message, ApplicationCommandLocalSendData applicationCommandLocalSendData, List> list) { m.checkNotNullParameter(message, "message"); m.checkNotNullParameter(applicationCommandLocalSendData, "applicationCommandLocalSendData"); - this.dispatcher.schedule(new StoreMessages$sendMessage$6(this, message)); - Observable n = Observable.n(new StoreMessages$sendMessage$7(this, message, applicationCommandLocalSendData, list), Emitter.BackpressureMode.NONE); - m.checkNotNullExpressionValue(n, "Observable.create({ emit…er.BackpressureMode.NONE)"); - return n; + this.dispatcher.schedule(new StoreMessages$sendMessage$5(this, message)); + return enqueueRequest(message.getChannelId(), new StoreMessages$sendMessage$createRequest$2(this, message, applicationCommandLocalSendData, list)); } } diff --git a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel.java b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel.java index 0350ca7cdf..269a7ce5c1 100644 --- a/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel.java +++ b/app/src/main/java/com/discord/widgets/guilds/invite/GuildInviteShareSheetViewModel.java @@ -759,7 +759,7 @@ public final class GuildInviteShareSheetViewModel extends AppViewModelSelect a color Transparency Use Default - 323b67b63d7148ec9fb7fbedd48e92eb + c20e331be24e4e2eb9b604159ec95624 Coming Soon Slash command application {applicationName} {applicationName} application