From f0543e48fd83862845452171f47695c2dd8fcd5f Mon Sep 17 00:00:00 2001 From: Juby210 Date: Thu, 18 Nov 2021 03:53:15 +0100 Subject: [PATCH] 102.12 - Beta (102112) --- app/build.gradle | 4 ++-- app/src/main/AndroidManifest.xml | 2 +- .../widgets/chat/list/InlineMediaView.java | 24 +++++++++---------- .../widgets/settings/WidgetSettings.java | 2 +- app/src/main/res/values/strings.xml | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f741890625..997d897110 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 30 - versionCode 102111 - versionName "102.11 - Beta" + versionCode 102112 + versionName "102.12 - Beta" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3788496c8e..8724d440e9 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/widgets/chat/list/InlineMediaView.java b/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView.java index 5f7bb90517..8ca6a82815 100644 --- a/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView.java +++ b/app/src/main/java/com/discord/widgets/chat/list/InlineMediaView.java @@ -404,23 +404,23 @@ public final class InlineMediaView extends CardView implements View.OnAttachStat } private final boolean shouldAutoPlay() { - EmbedResourceUtils embedResourceUtils = EmbedResourceUtils.INSTANCE; ViewParams viewParams = this.viewParams; String str = null; - EmbedType embedType = viewParams != null ? viewParams.getEmbedType() : null; + if ((viewParams != null ? viewParams.getEmbedType() : null) == EmbedType.GIFV && Build.VERSION.SDK_INT > 30) { + return false; + } + EmbedResourceUtils embedResourceUtils = EmbedResourceUtils.INSTANCE; ViewParams viewParams2 = this.viewParams; - if (viewParams2 != null) { - str = viewParams2.getProgressiveMediaUri(); + EmbedType embedType = viewParams2 != null ? viewParams2.getEmbedType() : null; + ViewParams viewParams3 = this.viewParams; + if (viewParams3 != null) { + str = viewParams3.getProgressiveMediaUri(); } if (!embedResourceUtils.isAnimated(embedType, str)) { return true; } - ViewParams viewParams3 = this.viewParams; - return viewParams3 != null ? viewParams3.getAutoPlayGifs() : this.storeUserSettings.getIsAutoPlayGifsEnabled(); - } - - private final boolean shouldAutoPlayGIFVs() { - return Build.VERSION.SDK_INT <= 30; + ViewParams viewParams4 = this.viewParams; + return viewParams4 != null ? viewParams4.getAutoPlayGifs() : this.storeUserSettings.getIsAutoPlayGifsEnabled(); } private final void updateUI(RenderableEmbedMedia renderableEmbedMedia, String str, EmbedType embedType, Integer num, Integer num2, String str2) { @@ -467,10 +467,10 @@ public final class InlineMediaView extends CardView implements View.OnAttachStat m.checkNotNullExpressionValue(J, "eventSubject.onBackpressureBuffer()"); ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(J, this, null, 2, null), InlineMediaView.class, (Context) null, new InlineMediaView$updateUI$3(this), (Function1) null, (Function0) null, (Function0) null, new InlineMediaView$updateUI$4(this), 58, (Object) null); if (embedType == embedType2) { - boolean shouldAutoPlayGIFVs = shouldAutoPlayGIFVs(); + boolean shouldAutoPlay = shouldAutoPlay(); PlayerView playerView2 = this.binding.f; m.checkNotNullExpressionValue(playerView2, "binding.inlineMediaPlayerView"); - AppMediaPlayer.b(appMediaPlayer, O, shouldAutoPlayGIFVs, true, 0, playerView2, null, 40); + AppMediaPlayer.b(appMediaPlayer, O, shouldAutoPlay, true, 0, playerView2, null, 40); appMediaPlayer.d(0.0f); } else { appMediaPlayer.d(1.0f); 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 b94164b84b..cfd621884c 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.11 - Beta (102111)"); + textView.setText(string + " - 102.12 - Beta (102112)"); 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 0e5cdb20b8..056787fcfd 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 - c20e331be24e4e2eb9b604159ec95624 + 8d6123f10d1745fd8d88c92a8c23b4d6 Coming Soon Slash command application {applicationName} {applicationName} application