From 1b59cead2e1cff4aa86cc966313e223d26a670a9 Mon Sep 17 00:00:00 2001 From: Juby210 Date: Wed, 1 Sep 2021 08:24:32 +0200 Subject: [PATCH] 91.1 - Alpha (91201) --- app/build.gradle | 4 ++-- app/src/main/AndroidManifest.xml | 2 +- .../events/TrackVoiceAudioOutputModeEnabled.java | 15 ++++++++++----- .../discord/widgets/settings/WidgetSettings.java | 2 +- app/src/main/res/values-ar-rXB/strings.xml | 2 +- app/src/main/res/values-en-rXA/strings.xml | 2 +- app/src/main/res/values/strings.xml | 4 ++-- 7 files changed, 18 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4bd6d3492b..d51dd2d677 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 29 - versionCode 91200 - versionName "91.0 - Alpha" + versionCode 91201 + versionName "91.1 - Alpha" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 29ca46fd54..5a6f269be6 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/analytics/generated/events/TrackVoiceAudioOutputModeEnabled.java b/app/src/main/java/com/discord/analytics/generated/events/TrackVoiceAudioOutputModeEnabled.java index e991907709..2e672d71c5 100644 --- a/app/src/main/java/com/discord/analytics/generated/events/TrackVoiceAudioOutputModeEnabled.java +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackVoiceAudioOutputModeEnabled.java @@ -17,6 +17,7 @@ public final class TrackVoiceAudioOutputModeEnabled implements AnalyticsSchema, private final CharSequence toAudioOutputMode = null; private TrackBase trackBase; private final Long videoStreamCount = null; + private final Long voiceStateCount = null; @Override // com.discord.api.science.AnalyticsSchema public String b() { @@ -31,7 +32,7 @@ public final class TrackVoiceAudioOutputModeEnabled implements AnalyticsSchema, return false; } TrackVoiceAudioOutputModeEnabled trackVoiceAudioOutputModeEnabled = (TrackVoiceAudioOutputModeEnabled) obj; - return m.areEqual(this.channelId, trackVoiceAudioOutputModeEnabled.channelId) && m.areEqual(this.channelType, trackVoiceAudioOutputModeEnabled.channelType) && m.areEqual(this.guildId, trackVoiceAudioOutputModeEnabled.guildId) && m.areEqual(this.rtcConnectionId, trackVoiceAudioOutputModeEnabled.rtcConnectionId) && m.areEqual(this.mediaSessionId, trackVoiceAudioOutputModeEnabled.mediaSessionId) && m.areEqual(this.fromAudioOutputMode, trackVoiceAudioOutputModeEnabled.fromAudioOutputMode) && m.areEqual(this.toAudioOutputMode, trackVoiceAudioOutputModeEnabled.toAudioOutputMode) && m.areEqual(this.videoStreamCount, trackVoiceAudioOutputModeEnabled.videoStreamCount); + return m.areEqual(this.channelId, trackVoiceAudioOutputModeEnabled.channelId) && m.areEqual(this.channelType, trackVoiceAudioOutputModeEnabled.channelType) && m.areEqual(this.guildId, trackVoiceAudioOutputModeEnabled.guildId) && m.areEqual(this.rtcConnectionId, trackVoiceAudioOutputModeEnabled.rtcConnectionId) && m.areEqual(this.mediaSessionId, trackVoiceAudioOutputModeEnabled.mediaSessionId) && m.areEqual(this.fromAudioOutputMode, trackVoiceAudioOutputModeEnabled.fromAudioOutputMode) && m.areEqual(this.toAudioOutputMode, trackVoiceAudioOutputModeEnabled.toAudioOutputMode) && m.areEqual(this.videoStreamCount, trackVoiceAudioOutputModeEnabled.videoStreamCount) && m.areEqual(this.voiceStateCount, trackVoiceAudioOutputModeEnabled.voiceStateCount); } public int hashCode() { @@ -51,10 +52,12 @@ public final class TrackVoiceAudioOutputModeEnabled implements AnalyticsSchema, CharSequence charSequence4 = this.toAudioOutputMode; int hashCode7 = (hashCode6 + (charSequence4 != null ? charSequence4.hashCode() : 0)) * 31; Long l4 = this.videoStreamCount; - if (l4 != null) { - i = l4.hashCode(); + int hashCode8 = (hashCode7 + (l4 != null ? l4.hashCode() : 0)) * 31; + Long l5 = this.voiceStateCount; + if (l5 != null) { + i = l5.hashCode(); } - return hashCode7 + i; + return hashCode8 + i; } public String toString() { @@ -73,6 +76,8 @@ public final class TrackVoiceAudioOutputModeEnabled implements AnalyticsSchema, P.append(", toAudioOutputMode="); P.append(this.toAudioOutputMode); P.append(", videoStreamCount="); - return a.F(P, this.videoStreamCount, ")"); + P.append(this.videoStreamCount); + P.append(", voiceStateCount="); + return a.F(P, this.voiceStateCount, ")"); } } 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 021ce810d6..e4a788294e 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 + " - 91.0 - Alpha (91200)"); + textView.setText(string + " - 91.1 - Alpha (91201)"); 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-ar-rXB/strings.xml b/app/src/main/res/values-ar-rXB/strings.xml index d8eb827da8..3be1f403c8 100644 --- a/app/src/main/res/values-ar-rXB/strings.xml +++ b/app/src/main/res/values-ar-rXB/strings.xml @@ -838,7 +838,7 @@ ‏‮!!‬‏‏‮{paymentGatewayName}‬‏‏‮!!‬‏ ‏‮transactions‬‏ ‏‮will‬‏ ‏‮not‬‏ ‏‮be‬‏ ‏‮listed‬‏ ‏‮below.‬‏ ‏‮To‬‏ ‏‮view‬‏ ‏‮!!‬‏‏‮{paymentGatewayName}‬‏‏‮!!‬‏ ‏‮transaction‬‏ ‏‮history‬‏ ‏‮or‬‏ ‏‮to‬‏ ‏‮change‬‏ ‏‮your‬‏ ‏‮!!‬‏‏‮{paymentGatewayName}‬‏‏‮!!‬‏ ‏‮payment‬‏ ‏‮method,‬‏ ‏‮[visit‬‏ ‏‮your‬‏ ‏‮!!‬‏‏‮{paymentGatewayName}‬‏‏‮!!‬‏ ‏‮Billing‬‏ ‏‮settings](‬‏‏‮{billingHistoryLink}‬‏‏‮).‬‏ ‏‮You‬‏ ‏‮subscribed‬‏ ‏‮through‬‏ ‏‮!!‬‏‏‮{paymentGatewayName}‬‏‏‮!!‬‏ ‏‮This‬‏ ‏‮is‬‏ ‏‮not‬‏ ‏‮supported‬‏ ‏‮for‬‏ ‏‮!!‬‏‏‮{paymentGatewayName}‬‏‏‮!!‬‏ ‏‮subscriptions.‬‏ ‏‮To‬‏ ‏‮manage‬‏ ‏‮your‬‏ ‏‮subscription,‬‏ ‏‮please‬‏ ‏‮[visit‬‏ ‏‮your‬‏ ‏‮!!‬‏‏‮{paymentGatewayName}‬‏‏‮!!‬‏ ‏‮Billing‬‏ ‏‮settings](‬‏‏‮{subscriptionManagementLink}‬‏‏‮).‬‏ - ‏‮Final‬‏ ‏‮price‬‏ ‏‮and‬‏ ‏‮currency‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮based‬‏ ‏‮on‬‏ ‏‮the‬‏ ‏‮country‬‏ ‏‮that‬‏ ‏‮issued‬‏ ‏‮your‬‏ ‏‮payment‬‏ ‏‮method.‬‏ ‏‮[Learn‬‏ ‏‮More](‬‏‏‮{documentationLink}‬‏‏‮).‬‏ + ‏‮Final‬‏ ‏‮price‬‏ ‏‮and‬‏ ‏‮currency‬‏ ‏‮will‬‏ ‏‮be‬‏ ‏‮based‬‏ ‏‮on‬‏ ‏‮your‬‏ ‏‮selected‬‏ ‏‮payment‬‏ ‏‮method‬‏ ‏‮and‬‏ ‏‮the‬‏ ‏‮country‬‏ ‏‮that‬‏ ‏‮issued‬‏ ‏‮it.‬‏ ‏‮[Learn‬‏ ‏‮More](‬‏‏‮{documentationLink}‬‏‏‮).‬‏ ‏‮Copied!‬‏ ‏‮Gift‬‏ ‏‮Link‬‏ ‏‮This‬‏ ‏‮was‬‏ ‏‮a‬‏ ‏‮gift‬‏ diff --git a/app/src/main/res/values-en-rXA/strings.xml b/app/src/main/res/values-en-rXA/strings.xml index 2b74bb2b1f..5eb89cc529 100644 --- a/app/src/main/res/values-en-rXA/strings.xml +++ b/app/src/main/res/values-en-rXA/strings.xml @@ -838,7 +838,7 @@ [¡¡»{paymentGatewayName}«¡¡ ţŕåñšåçţîöñš ŵîļļ ñöţ ɓé ļîšţéð ɓéļöŵ. Ţö Vîéŵ ¡¡»{paymentGatewayName}«¡¡ ţŕåñšåçţîöñ ĥîšţöŕý öŕ ţö çĥåñĝé ýöûŕ ¡¡»{paymentGatewayName}«¡¡ þåýḿéñţ ḿéţĥöð, [Vîšîţ ýöûŕ ¡¡»{paymentGatewayName}«¡¡ βîļļîñĝ šéţţîñĝš](»{billingHistoryLink}«). one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty one two three four five six seven] [Ýöû šûɓšçŕîɓéð ţĥŕöûĝĥ ¡¡»{paymentGatewayName}«¡¡ one two three four] [Ţĥîš îš ñöţ šûþþöŕţéð ƒöŕ ¡¡»{paymentGatewayName}«¡¡ šûɓšçŕîþţîöñš. Ţö ḿåñåĝé ýöûŕ šûɓšçŕîþţîöñ, þļéåšé [Vîšîţ ýöûŕ ¡¡»{paymentGatewayName}«¡¡ βîļļîñĝ šéţţîñĝš](»{subscriptionManagementLink}«). one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty] - [Fîñåļ þŕîçé åñð çûŕŕéñçý ŵîļļ ɓé ɓåšéð öñ ţĥé çöûñţŕý ţĥåţ îššûéð ýöûŕ þåýḿéñţ ḿéţĥöð. [Ļéåŕñ Ḿöŕé](»{documentationLink}«). one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen] + [Fîñåļ þŕîçé åñð çûŕŕéñçý ŵîļļ ɓé ɓåšéð öñ ýöûŕ šéļéçţéð þåýḿéñţ ḿéţĥöð åñð ţĥé çöûñţŕý ţĥåţ îššûéð îţ. [Ļéåŕñ Ḿöŕé](»{documentationLink}«). one two three four five six seven eight nine ten eleven twelve thirteen fourteen fiveteen sixteen seventeen nineteen twenty] [Çöþîéð¡ one two] [Ĝîƒţ Ļîñķ one two] [Ţĥîš ŵåš å ĝîƒţ one two three] diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 82b4490a57..d1033d6c86 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -839,7 +839,7 @@ !!{paymentGatewayName}!! transactions will not be listed below. To view !!{paymentGatewayName}!! transaction history or to change your !!{paymentGatewayName}!! payment method, [visit your !!{paymentGatewayName}!! Billing settings]({billingHistoryLink}). You subscribed through !!{paymentGatewayName}!! This is not supported for !!{paymentGatewayName}!! subscriptions. To manage your subscription, please [visit your !!{paymentGatewayName}!! Billing settings]({subscriptionManagementLink}). - Final price and currency will be based on the country that issued your payment method. [Learn More]({documentationLink}). + Final price and currency will be based on your selected payment method and the country that issued it. [Learn More]({documentationLink}). Copied! Gift Link This was a gift @@ -1390,7 +1390,7 @@ Select a color Transparency Use Default - 67aaf02eb35246b8a8821f9ec5bd51ec + d979e00ad0d74294b48125aef5e5a57d Coming Soon Slash command application {applicationName} {applicationName} application