From eee8049fad5449eb6ff35093ec085eb8ce2d9886 Mon Sep 17 00:00:00 2001 From: Juby210 Date: Tue, 26 Oct 2021 09:18:25 +0200 Subject: [PATCH] 99.12 - Beta (99112) --- app/build.gradle | 4 ++-- app/src/main/AndroidManifest.xml | 2 +- .../discord/utilities/fcm/NotificationData.java | 14 ++++++++++---- .../discord/widgets/settings/WidgetSettings.java | 2 +- app/src/main/res/values/strings.xml | 2 +- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index efa626ce7d..63fffc5a8b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 29 - versionCode 99111 - versionName "99.11 - Beta" + versionCode 99112 + versionName "99.12 - Beta" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7b78f74ecb..5c1e22382d 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/utilities/fcm/NotificationData.java b/app/src/main/java/com/discord/utilities/fcm/NotificationData.java index 6b18eea17c..80dcaa4fd9 100644 --- a/app/src/main/java/com/discord/utilities/fcm/NotificationData.java +++ b/app/src/main/java/com/discord/utilities/fcm/NotificationData.java @@ -115,6 +115,7 @@ public final class NotificationData { private final String subtitleResName; private final String title; private final String titleResName; + private final String trackingType; private final String type; private final String userAvatar; private final Integer userDiscriminator; @@ -352,7 +353,7 @@ public final class NotificationData { this(new HashMap()); } - public NotificationData(String str, long j, MessageActivityType messageActivityType, String str2, int i, String str3, Channel channel, List list, long j2, String str4, Integer num, String str5, String str6, int i2, String str7, long j3, String str8, String str9, int i3, String str10, long j4, String str11, String str12, Sticker sticker, String str13, String str14, String str15, String str16, String str17, GuildScheduledEventEntityType guildScheduledEventEntityType, NotificationType notificationType) { + public NotificationData(String str, long j, MessageActivityType messageActivityType, String str2, int i, String str3, Channel channel, List list, long j2, String str4, Integer num, String str5, String str6, int i2, String str7, long j3, String str8, String str9, int i3, String str10, long j4, String str11, String str12, Sticker sticker, String str13, String str14, String str15, String str16, String str17, GuildScheduledEventEntityType guildScheduledEventEntityType, NotificationType notificationType, String str18) { m.checkNotNullParameter(str, "type"); m.checkNotNullParameter(channel, "channel"); m.checkNotNullParameter(list, "ackChannelIds"); @@ -386,6 +387,7 @@ public final class NotificationData { this.stageInstanceTopic = str17; this.guildScheduledEventEntityType = guildScheduledEventEntityType; this.notificationType = notificationType; + this.trackingType = str18; Long valueOf = Long.valueOf(j3); boolean z2 = false; long j5 = -1; @@ -407,7 +409,7 @@ public final class NotificationData { /* JADX WARNING: Illegal instructions before constructor call */ public NotificationData(Map map) { - this(r1, r1, r6, r7, r8, r9, r49, r11, r12, r14, r15, r16, r17, r18, r19, r20, r22, r23, r24, r25, r26, r28, r29, r30, r31, r32, r33, r34, r35, r36, r0 != null ? NotificationType.Companion.parse(r0) : null); + this(r1, r1, r6, r7, r8, r9, r49, r11, r12, r14, r15, r16, r17, r18, r19, r20, r22, r23, r24, r25, r26, r28, r29, r30, r31, r32, r33, r34, r35, r36, r1 != null ? NotificationType.Companion.parse(r1) : null, map.get("tracking_type")); Integer intOrNull; Long longOrNull; Integer intOrNull2; @@ -473,7 +475,11 @@ public final class NotificationData { } private final Intent addTrackingData(Intent intent) { - Intent putExtra = intent.putExtra(ANALYTICS_NOTIF_TYPE, this.type).putExtra(ANALYTICS_NOTIF_USER_ID, this.userId).putExtra(ANALYTICS_MESSAGE_ID, this.messageId).putExtra(ANALYTICS_MESSAGE_TYPE, this.messageType).putExtra("guild_id", this.guildId).putExtra("channel_id", this.channel.h()).putExtra(ANALYTICS_CHANNEL_TYPE, this.channel.A()).putExtra(ANALYTICS_REL_TYPE, this.relationshipType).putExtra(ANALYTICS_ACTIVITY_TYPE, this.activityType).putExtra(ANALYTICS_ACTIVITY_NAME, this.activityName); + String str = this.trackingType; + if (str == null) { + str = this.type; + } + Intent putExtra = intent.putExtra(ANALYTICS_NOTIF_TYPE, str).putExtra(ANALYTICS_NOTIF_USER_ID, this.userId).putExtra(ANALYTICS_MESSAGE_ID, this.messageId).putExtra(ANALYTICS_MESSAGE_TYPE, this.messageType).putExtra("guild_id", this.guildId).putExtra("channel_id", this.channel.h()).putExtra(ANALYTICS_CHANNEL_TYPE, this.channel.A()).putExtra(ANALYTICS_REL_TYPE, this.relationshipType).putExtra(ANALYTICS_ACTIVITY_TYPE, this.activityType).putExtra(ANALYTICS_ACTIVITY_NAME, this.activityName); m.checkNotNullExpressionValue(putExtra, "intent\n .putExtra…IVITY_NAME, activityName)"); return putExtra; } @@ -619,7 +625,7 @@ public final class NotificationData { String str3 = this.guildName; String str4 = this.guildIcon; List A = message.A(); - return new NotificationData(TYPE_MESSAGE_CREATE, o, b, g, intValue, i, a4, emptyList, i2, str, intOrNull, str2, b3, -1, null, j, str3, str4, -1, null, -1, null, null, A != null ? (Sticker) u.firstOrNull((List) A) : null, null, null, null, null, null, null, null); + return new NotificationData(TYPE_MESSAGE_CREATE, o, b, g, intValue, i, a4, emptyList, i2, str, intOrNull, str2, b3, -1, null, j, str3, str4, -1, null, -1, null, null, A != null ? (Sticker) u.firstOrNull((List) A) : null, null, null, null, null, null, null, null, null); } public final List getAckChannelIds() { 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 b61b81873b..b6dacf0367 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 + " - 99.11 - Beta (99111)"); + textView.setText(string + " - 99.12 - Beta (99112)"); 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 73ad6d74cb..c69f1db904 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1446,7 +1446,7 @@ Select a color Transparency Use Default - 15e372360777428ab09616c084d41d44 + 55ee48230f4945cb93cc26469fabb4b6 Coming Soon Slash command application {applicationName} {applicationName} application