From 9330ffd588e2e78f8af0f710bc6ec0fb36e7e94a Mon Sep 17 00:00:00 2001 From: Juby210 Date: Tue, 17 Aug 2021 02:08:27 +0200 Subject: [PATCH] 87.9 - Beta (87109) --- app/build.gradle | 4 ++-- app/src/main/AndroidManifest.xml | 2 +- app/src/main/java/c/a/r/h0.java | 3 +++ .../com/discord/rtcconnection/socket/io/Payloads.java | 9 ++++++--- .../com/discord/widgets/settings/WidgetSettings.java | 2 +- app/src/main/res/values/strings.xml | 2 +- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 04c991052d..b2a8668dff 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 29 - versionCode 87108 - versionName "87.8 - Beta" + versionCode 87109 + versionName "87.9 - Beta" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 36a91e263d..008edc8ff2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/java/c/a/r/h0.java b/app/src/main/java/c/a/r/h0.java index d7b98bf9f0..b2697116c6 100644 --- a/app/src/main/java/c/a/r/h0.java +++ b/app/src/main/java/c/a/r/h0.java @@ -333,6 +333,9 @@ public final class h0 implements a.d { Payloads.Stream stream = (Payloads.Stream) it.next(); MediaType mediaType = MediaStreamTrack.VIDEO_TRACK_KIND.equals(stream.getType()) ? MediaType.Video : MediaType.Audio; String rid = stream.getRid(); + if (rid == null) { + rid = ""; + } Integer ssrc = stream.getSsrc(); int intValue = ssrc != null ? ssrc.intValue() : 0; Integer rtxSsrc = stream.getRtxSsrc(); diff --git a/app/src/main/java/com/discord/rtcconnection/socket/io/Payloads.java b/app/src/main/java/com/discord/rtcconnection/socket/io/Payloads.java index eee4b0eb41..8a077fa2e7 100644 --- a/app/src/main/java/com/discord/rtcconnection/socket/io/Payloads.java +++ b/app/src/main/java/com/discord/rtcconnection/socket/io/Payloads.java @@ -1,5 +1,6 @@ package com.discord.rtcconnection.socket.io; +import androidx.core.app.FrameMetricsAggregator; import c.d.b.a.a; import c.i.d.p.b; import com.discord.models.domain.ModelAuditLogEntry; @@ -1330,8 +1331,11 @@ public final class Payloads { } } + public Stream() { + this(null, null, null, null, null, null, null, null, null, FrameMetricsAggregator.EVERY_DURATION, null); + } + public Stream(String str, String str2, Integer num, Integer num2, Integer num3, Integer num4, MaxResolution maxResolution, Boolean bool, Integer num5) { - m.checkNotNullParameter(str2, "rid"); this.type = str; this.rid = str2; this.maxFrameRate = num; @@ -1345,7 +1349,7 @@ public final class Payloads { /* JADX INFO: this call moved to the top of the method (can break code semantics) */ public /* synthetic */ Stream(String str, String str2, Integer num, Integer num2, Integer num3, Integer num4, MaxResolution maxResolution, Boolean bool, Integer num5, int i, DefaultConstructorMarker defaultConstructorMarker) { - this((i & 1) != 0 ? null : str, str2, (i & 4) != 0 ? null : num, (i & 8) != 0 ? null : num2, (i & 16) != 0 ? null : num3, (i & 32) != 0 ? null : num4, (i & 64) != 0 ? null : maxResolution, (i & 128) != 0 ? null : bool, (i & 256) != 0 ? null : num5); + this((i & 1) != 0 ? null : str, (i & 2) != 0 ? null : str2, (i & 4) != 0 ? null : num, (i & 8) != 0 ? null : num2, (i & 16) != 0 ? null : num3, (i & 32) != 0 ? null : num4, (i & 64) != 0 ? null : maxResolution, (i & 128) != 0 ? null : bool, (i & 256) == 0 ? num5 : null); } public static /* synthetic */ Stream copy$default(Stream stream, String str, String str2, Integer num, Integer num2, Integer num3, Integer num4, MaxResolution maxResolution, Boolean bool, Integer num5, int i, Object obj) { @@ -1389,7 +1393,6 @@ public final class Payloads { } public final Stream copy(String str, String str2, Integer num, Integer num2, Integer num3, Integer num4, MaxResolution maxResolution, Boolean bool, Integer num5) { - m.checkNotNullParameter(str2, "rid"); return new Stream(str, str2, num, num2, num3, num4, maxResolution, bool, num5); } 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 4ce85d9aa5..f2816bfb7e 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java @@ -321,7 +321,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 + " - 87.8 - Beta (87108)"); + textView.setText(string + " - 87.9 - Beta (87109)"); binding.f1962z.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 9f68adda29..43e62b13a4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1359,7 +1359,7 @@ Select a color Transparency Use Default - 8afbfbeb5a8e47b48db005042cfd6260 + 3f78c8da504f4edbb5a3dca172d82374 Coming Soon Slash command application {applicationName} {applicationName} application