From afc7aa95ea8d43c49b4a695fcff2ad9486646bd5 Mon Sep 17 00:00:00 2001 From: Juby210 Date: Tue, 2 Nov 2021 00:51:21 +0100 Subject: [PATCH] 100.10 - Beta (100110) --- app/build.gradle | 6 +++--- app/src/main/AndroidManifest.xml | 6 +++--- .../autocomplete/sources/UserAutocompletableSource.java | 2 +- .../autocomplete/sources/UserMentionableSourceKt.java | 8 ++++---- .../java/com/discord/widgets/settings/WidgetSettings.java | 2 +- app/src/main/res/values/strings.xml | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 29138e35c6..091d4fde19 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,9 +9,9 @@ android { defaultConfig { applicationId 'com.discord' minSdkVersion 21 - targetSdkVersion 29 - versionCode 100109 - versionName "100.9 - Beta" + targetSdkVersion 30 + versionCode 100110 + versionName "100.10 - Beta" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fed0bc2ffd..a0b3e98881 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ - - + + @@ -178,7 +178,7 @@ - + diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource.java index e32e6c9dcd..bbcfbb5978 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource.java +++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserAutocompletableSource.java @@ -174,7 +174,7 @@ public final class UserAutocompletableSource { Observable observable; m.checkNotNullParameter(channel, "channel"); long f = channel.f(); - if (UserMentionableSourceKt.access$isGuildChannelOrThread(channel)) { + if (UserMentionableSourceKt.access$isTextOrVoiceChannel(channel)) { Observable computationLatest = ObservableExtensionsKt.computationLatest(this.storeUsers.observeMeId()); Observable F = this.storeGuilds.observeGuild(f).x(ObservableExtensionsKt$filterNull$1.INSTANCE).F(ObservableExtensionsKt$filterNull$2.INSTANCE); m.checkNotNullExpressionValue(F, "filter { it != null }.map { it!! }"); diff --git a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserMentionableSourceKt.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserMentionableSourceKt.java index d4762496bb..e9d8dadcce 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserMentionableSourceKt.java +++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/sources/UserMentionableSourceKt.java @@ -7,15 +7,15 @@ public final class UserMentionableSourceKt { return isDmOrGroupDm(channel); } - public static final /* synthetic */ boolean access$isGuildChannelOrThread(Channel channel) { - return isGuildChannelOrThread(channel); + public static final /* synthetic */ boolean access$isTextOrVoiceChannel(Channel channel) { + return isTextOrVoiceChannel(channel); } private static final boolean isDmOrGroupDm(Channel channel) { return channel.A() == 3 || channel.A() == 1; } - private static final boolean isGuildChannelOrThread(Channel channel) { - return channel.A() == 5 || channel.A() == 0 || channel.A() == 11 || channel.A() == 12; + private static final boolean isTextOrVoiceChannel(Channel channel) { + return channel.A() == 5 || channel.A() == 0 || channel.A() == 11 || channel.A() == 12 || channel.A() == 2; } } 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 9f35f8eaa9..9ebd201f8a 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java @@ -313,7 +313,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi TextView textView = binding.f; m.checkNotNullExpressionValue(textView, "appInfoHeader"); String string = getString(R.string.app_information); - textView.setText(string + " - 100.9 - Beta (100109)"); + textView.setText(string + " - 100.10 - Beta (100110)"); binding.A.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$3(this)); binding.u.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE); binding.q.setOnClickListener(WidgetSettings$onViewBound$1$6.INSTANCE); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8cf88f4e53..b7f26de4e6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1463,7 +1463,7 @@ Select a color Transparency Use Default - 46e3d15dbf48475a9e58738ff3a6e8da + 2ba370b3296e486cac5917b5a64454a1 Coming Soon Slash command application {applicationName} {applicationName} application