From f9aa3ad2befd4e2c8fc0f947cdbd72ba9a89c194 Mon Sep 17 00:00:00 2001 From: Juby210 Date: Tue, 16 Nov 2021 01:42:03 +0100 Subject: [PATCH] 102.9 - Beta (102109) --- app/build.gradle | 4 +-- app/src/main/AndroidManifest.xml | 2 +- .../stores/StoreMessages$deleteMessage$2.java | 2 +- .../stores/StoreMessages$sendMessage$5.java | 4 +-- .../stores/StoreMessages$sendMessage$7.java | 2 +- .../com/discord/stores/StoreMessages.java | 29 ++++++++++--------- .../widgets/settings/WidgetSettings.java | 2 +- app/src/main/res/values/strings.xml | 2 +- 8 files changed, 25 insertions(+), 22 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c496d99780..96b8283859 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 30 - versionCode 102108 - versionName "102.8 - Beta" + versionCode 102109 + versionName "102.9 - Beta" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e42ac2f8df..5285addfae 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/StoreMessages$deleteMessage$2.java b/app/src/main/java/com/discord/stores/StoreMessages$deleteMessage$2.java index b35da4f281..0e560f4745 100644 --- a/app/src/main/java/com/discord/stores/StoreMessages$deleteMessage$2.java +++ b/app/src/main/java/com/discord/stores/StoreMessages$deleteMessage$2.java @@ -27,7 +27,7 @@ public final class StoreMessages$deleteMessage$2 extends o implements Function0< if (this.$message.isLocal()) { String nonce = this.$message.getNonce(); if (nonce != null) { - StoreMessages.access$getMessageQueue(this.this$0, this.$channelId).cancel(nonce); + StoreMessages.access$getOrCreateMessageQueue(this.this$0, this.$channelId).cancel(nonce); } StoreMessages.access$handleLocalMessageDelete(this.this$0, this.$message); Integer type = this.$message.getType(); 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 ef828de4e8..158caab654 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 @@ -20,9 +20,9 @@ public final class StoreMessages$sendMessage$5 implements Action1 emitter) { - MessageQueue access$getMessageQueue = StoreMessages.access$getMessageQueue(this.this$0, this.$channelId); + MessageQueue access$getOrCreateMessageQueue = StoreMessages.access$getOrCreateMessageQueue(this.this$0, this.$channelId); Function1 function1 = this.$request; m.checkNotNullExpressionValue(emitter, "emitter"); - access$getMessageQueue.enqueue((MessageRequest) function1.invoke(emitter)); + access$getOrCreateMessageQueue.enqueue((MessageRequest) function1.invoke(emitter)); } } 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 index 672d97f84d..6917804e20 100644 --- a/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7.java +++ b/app/src/main/java/com/discord/stores/StoreMessages$sendMessage$7.java @@ -26,6 +26,6 @@ public final class StoreMessages$sendMessage$7 implements Action1> getAllDetached() { @@ -480,10 +481,12 @@ public final class StoreMessages extends Store { this.holder.invalidate(); return; } - Collection values = this.messageQueues.values(); - m.checkNotNullExpressionValue(values, "messageQueues.values"); - for (MessageQueue messageQueue : values) { - messageQueue.handleConnected(); + synchronized (this.messageQueues) { + Collection values = this.messageQueues.values(); + m.checkNotNullExpressionValue(values, "messageQueues.values"); + for (MessageQueue messageQueue : values) { + messageQueue.handleConnected(); + } } } 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 34943b39f6..1450a0d2e9 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java @@ -346,7 +346,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi TextView textView = binding.f; m.checkNotNullExpressionValue(textView, "appInfoHeader"); String string = getString(R.string.app_information); - textView.setText(string + " - 102.8 - Beta (102108)"); + textView.setText(string + " - 102.9 - Beta (102109)"); binding.B.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$3(this)); binding.u.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE); binding.q.setOnClickListener(WidgetSettings$onViewBound$1$6.INSTANCE); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0516c71442..7d8440a74c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1505,7 +1505,7 @@ Select a color Transparency Use Default - 9829ea7736fa44f496b851ce59dbaf13 + 323b67b63d7148ec9fb7fbedd48e92eb Coming Soon Slash command application {applicationName} {applicationName} application