From 6a9a8f78800a105432a1e5db8e155011776ec6be Mon Sep 17 00:00:00 2001 From: Juby210 Date: Fri, 16 Jul 2021 22:54:14 +0200 Subject: [PATCH] 83.14 - Beta (83114) --- app/build.gradle | 4 ++-- app/src/main/AndroidManifest.xml | 2 +- app/src/main/java/com/discord/app/App.java | 2 +- .../stores/StoreAudioManagerV2$selectOutputDevice$1.java | 4 ++-- app/src/main/java/com/discord/stores/StoreClientVersion.java | 2 +- .../discord/utilities/analytics/AnalyticSuperProperties.java | 2 +- app/src/main/java/com/discord/utilities/rest/RestAPI.java | 2 +- .../views/select/SelectComponentBottomSheetAdapter.java | 5 +++++ .../WidgetChatInputApplicationCommandsKt.java | 2 +- .../java/com/discord/widgets/debugging/WidgetFatalCrash.java | 2 +- .../java/com/discord/widgets/settings/WidgetSettings.java | 2 +- app/src/main/res/values/strings.xml | 2 +- 12 files changed, 18 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 64d348eff5..3029a114a9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 29 - versionCode 83113 - versionName "83.13 - Beta" + versionCode 83114 + versionName "83.14 - Beta" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 63134d77fd..c0b5d21b0b 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/app/App.java b/app/src/main/java/com/discord/app/App.java index be05dd0a88..aeade71166 100644 --- a/app/src/main/java/com/discord/app/App.java +++ b/app/src/main/java/com/discord/app/App.java @@ -172,7 +172,7 @@ public class App extends Application { loggingProvider.init(appLog); c.i.c.c.e(this); String str = null; - if (BuildUtils.INSTANCE.isValidBuildVersionName("83.13 - Beta")) { + if (BuildUtils.INSTANCE.isValidBuildVersionName("83.14 - Beta")) { FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(true); } else { FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(false); diff --git a/app/src/main/java/com/discord/stores/StoreAudioManagerV2$selectOutputDevice$1.java b/app/src/main/java/com/discord/stores/StoreAudioManagerV2$selectOutputDevice$1.java index 222bfc47ed..95e1e94010 100644 --- a/app/src/main/java/com/discord/stores/StoreAudioManagerV2$selectOutputDevice$1.java +++ b/app/src/main/java/com/discord/stores/StoreAudioManagerV2$selectOutputDevice$1.java @@ -27,8 +27,8 @@ public final class StoreAudioManagerV2$selectOutputDevice$1 implements Runnable Objects.requireNonNull(d); m.checkNotNullParameter(deviceTypes, "deviceType"); d.c(); - if (!d.e().b || !d.e().f208c) { - AnimatableValueParser.G1("AudioManager", "Requires MODIFY_AUDIO_SETTINGS and RECORD_AUDIO. Selected device will not be available for recording"); + if (!d.e().b) { + AnimatableValueParser.G1("AudioManager", "Can't setDevice, requires MODIFY_AUDIO_SETTINGS."); return; } AnimatableValueParser.C1("AudioManager", "setDevice(deviceType=" + deviceTypes + ')'); diff --git a/app/src/main/java/com/discord/stores/StoreClientVersion.java b/app/src/main/java/com/discord/stores/StoreClientVersion.java index a31d045859..abf37b1673 100644 --- a/app/src/main/java/com/discord/stores/StoreClientVersion.java +++ b/app/src/main/java/com/discord/stores/StoreClientVersion.java @@ -15,7 +15,7 @@ public final class StoreClientVersion extends Store { private int clientMinVersion; private final String clientMinVersionKey = "CLIENT_OUTDATED_KEY"; private final SerializedSubject clientOutdatedSubject = new SerializedSubject<>(BehaviorSubject.l0(Boolean.FALSE)); - private final int clientVersion = 83113; + private final int clientVersion = 83114; public static final /* synthetic */ void access$setClientMinVersion(StoreClientVersion storeClientVersion, int i) { storeClientVersion.setClientMinVersion(i); diff --git a/app/src/main/java/com/discord/utilities/analytics/AnalyticSuperProperties.java b/app/src/main/java/com/discord/utilities/analytics/AnalyticSuperProperties.java index 7472848773..58d61f9e77 100644 --- a/app/src/main/java/com/discord/utilities/analytics/AnalyticSuperProperties.java +++ b/app/src/main/java/com/discord/utilities/analytics/AnalyticSuperProperties.java @@ -77,7 +77,7 @@ public final class AnalyticSuperProperties { private final void setBaselineProperties() { String locale = Locale.getDefault().toString(); m.checkNotNullExpressionValue(locale, "Locale.getDefault().toString()"); - updateSuperProperties(h0.mapOf(o.to("browser", "Discord Android"), o.to("browser_user_agent", "Discord-Android/83113"), o.to("client_build_number", 83113), o.to("client_version", "83.13 - Beta"), o.to("device", Build.MODEL + ", " + Build.PRODUCT), o.to("os", "Android"), o.to("os_sdk_version", String.valueOf(Build.VERSION.SDK_INT)), o.to("os_version", Build.VERSION.RELEASE), o.to("system_locale", t.replace$default(locale, "_", "-", false, 4, (Object) null)))); + updateSuperProperties(h0.mapOf(o.to("browser", "Discord Android"), o.to("browser_user_agent", "Discord-Android/83114"), o.to("client_build_number", 83114), o.to("client_version", "83.14 - Beta"), o.to("device", Build.MODEL + ", " + Build.PRODUCT), o.to("os", "Android"), o.to("os_sdk_version", String.valueOf(Build.VERSION.SDK_INT)), o.to("os_version", Build.VERSION.RELEASE), o.to("system_locale", t.replace$default(locale, "_", "-", false, 4, (Object) null)))); } private final void setSuperProperties(Map map) { 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 f8a47fc3cc..62dd8834ba 100644 --- a/app/src/main/java/com/discord/utilities/rest/RestAPI.java +++ b/app/src/main/java/com/discord/utilities/rest/RestAPI.java @@ -179,7 +179,7 @@ public final class RestAPI implements RestAPIInterface { @Override // com.discord.restapi.RequiredHeadersInterceptor.HeadersProvider public String getUserAgent() { - return "Discord-Android/83113"; + return "Discord-Android/83114"; } } diff --git a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetAdapter.java b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetAdapter.java index 737f77f73d..faca213c45 100644 --- a/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetAdapter.java +++ b/app/src/main/java/com/discord/widgets/botuikit/views/select/SelectComponentBottomSheetAdapter.java @@ -39,6 +39,11 @@ public final class SelectComponentBottomSheetAdapter extends RecyclerView.Adapte return this.data.size(); } + @Override // androidx.recyclerview.widget.RecyclerView.Adapter + public long getItemId(int i) { + return (long) i; + } + @Override // androidx.recyclerview.widget.RecyclerView.Adapter public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, int i) { m.checkNotNullParameter(viewHolder, "holder"); diff --git a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputApplicationCommandsKt.java b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputApplicationCommandsKt.java index 4233bb4c1b..8748fb67a3 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputApplicationCommandsKt.java +++ b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputApplicationCommandsKt.java @@ -73,7 +73,7 @@ public final class WidgetChatInputApplicationCommandsKt { return null; } int intValue = findStartOfValue.intValue(); - Regex regex = new Regex(" (\\w*):"); + Regex regex = new Regex(" ([\\w-_]*):"); String substring = str.substring(intValue); m.checkNotNullExpressionValue(substring, "(this as java.lang.String).substring(startIndex)"); Iterator it = Regex.findAll$default(regex, substring, 0, 2, null).iterator(); diff --git a/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash.java b/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash.java index 22666d1bb0..59513fd015 100644 --- a/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash.java +++ b/app/src/main/java/com/discord/widgets/debugging/WidgetFatalCrash.java @@ -100,7 +100,7 @@ public final class WidgetFatalCrash extends AppFragment { textView2.setText(b.j(this, 2131887893, objArr2, null, 4)); TextView textView3 = getBinding().b; m.checkNotNullExpressionValue(textView3, "binding.fatalCrashAppVersion"); - textView3.setText(b.j(this, 2131887886, new Object[]{"83.13 - Beta"}, null, 4)); + textView3.setText(b.j(this, 2131887886, new Object[]{"83.14 - Beta"}, null, 4)); TextView textView4 = getBinding().d; m.checkNotNullExpressionValue(textView4, "binding.fatalCrashOsVersion"); textView4.setText(b.j(this, 2131887889, new Object[]{String.valueOf(Build.VERSION.SDK_INT)}, null, 4)); 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 73d33c982e..66e10a0af1 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java @@ -355,7 +355,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi TextView textView = binding.f; m.checkNotNullExpressionValue(textView, "appInfoHeader"); String string = getString(2131886360); - textView.setText(string + " - 83.13 - Beta (83113)"); + textView.setText(string + " - 83.14 - Beta (83114)"); binding.f1933z.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$2(this)); binding.u.setOnClickListener(WidgetSettings$onViewBound$1$4.INSTANCE); binding.q.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 213d09ac3c..d7ee879b2f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1342,7 +1342,7 @@ Presets Select a color Transparency - 422e1162447b455b8db69e3ee3f6bb32 + f86ee1e25c4841c48f7faecfcd5bcce3 Coming Soon Slash command application {applicationName} {applicationName} application