From 56872945619c257b3663207f25ae6874e4f15e8b Mon Sep 17 00:00:00 2001 From: Juby210 Date: Sun, 4 Jul 2021 17:50:31 +0200 Subject: [PATCH] 82.16 - Beta (82116) --- app/build.gradle | 4 +-- app/src/main/AndroidManifest.xml | 2 +- app/src/main/java/com/discord/app/App.java | 2 +- .../com/discord/gateway/GatewaySocket.java | 2 +- .../message/Message$reactionsMap$2.java | 34 ------------------- .../com/discord/models/message/Message.java | 29 +++++++++++----- .../discord/stores/StoreClientVersion.java | 2 +- .../com/discord/stores/StoreMessageAck.java | 2 +- .../stores/utilities/Batched$onNext$1.java | 2 +- .../com/discord/stores/utilities/Batched.java | 20 ++++++----- .../analytics/AnalyticSuperProperties.java | 2 +- .../discord/utilities/images/MGImages.java | 2 ++ .../com/discord/utilities/rest/RestAPI.java | 2 +- .../input/WidgetChatInputAutocomplete.java | 2 +- .../WidgetChatInputModelMappingFunctions.java | 28 +++++++-------- .../widgets/debugging/WidgetFatalCrash.java | 2 +- .../discord/widgets/media/WidgetMedia.java | 14 ++++---- .../widgets/settings/WidgetSettings.java | 2 +- app/src/main/res/values/strings.xml | 2 +- 19 files changed, 70 insertions(+), 85 deletions(-) delete mode 100644 app/src/main/java/com/discord/models/message/Message$reactionsMap$2.java diff --git a/app/build.gradle b/app/build.gradle index 66b4d86b03..f25c958a66 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 29 - versionCode 82112 - versionName "82.12 - Beta" + versionCode 82116 + versionName "82.16 - Beta" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d5ad5320c1..56fea1ecce 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 0cc7253c22..eb28f8b96d 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("82.12 - Beta")) { + if (BuildUtils.INSTANCE.isValidBuildVersionName("82.16 - Beta")) { FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(true); } else { FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(false); diff --git a/app/src/main/java/com/discord/gateway/GatewaySocket.java b/app/src/main/java/com/discord/gateway/GatewaySocket.java index 0333ee699d..cb8b3c79ac 100644 --- a/app/src/main/java/com/discord/gateway/GatewaySocket.java +++ b/app/src/main/java/com/discord/gateway/GatewaySocket.java @@ -850,7 +850,7 @@ public final class GatewaySocket { } else if (u.contains(EXPECTED_NULL_DATA_EVENTS, str)) { this.eventHandler.handleDispatch(str, Unit.a); } else if ((!m.areEqual(str, "READY")) && (!m.areEqual(str, "RESUMED"))) { - Logger.e$default(this.logger, a.v("handleDispatch() ", str, " is unhandled!"), null, null, 6, null); + Logger.w$default(this.logger, a.v("handleDispatch() ", str, " is unhandled!"), null, 2, null); } } diff --git a/app/src/main/java/com/discord/models/message/Message$reactionsMap$2.java b/app/src/main/java/com/discord/models/message/Message$reactionsMap$2.java deleted file mode 100644 index 542afa4453..0000000000 --- a/app/src/main/java/com/discord/models/message/Message$reactionsMap$2.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.discord.models.message; - -import com.discord.api.message.reaction.MessageReaction; -import d0.z.d.o; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import kotlin.jvm.functions.Function0; -/* compiled from: Message.kt */ -public final class Message$reactionsMap$2 extends o implements Function0> { - public final /* synthetic */ Message this$0; - - /* JADX INFO: super call moved to the top of the method (can break code semantics) */ - public Message$reactionsMap$2(Message message) { - super(0); - this.this$0 = message; - } - - /* Return type fixed from 'java.util.Map' to match base method */ - @Override // kotlin.jvm.functions.Function0 - /* renamed from: invoke */ - public final Map mo1invoke() { - List reactions = this.this$0.getReactions(); - if (reactions == null || !(!reactions.isEmpty())) { - return Message.access$getEMPTY_REACTIONS$cp(); - } - List reactions2 = this.this$0.getReactions(); - LinkedHashMap linkedHashMap = new LinkedHashMap(); - for (Object obj : reactions2) { - linkedHashMap.put(((MessageReaction) obj).b().c(), obj); - } - return linkedHashMap; - } -} diff --git a/app/src/main/java/com/discord/models/message/Message.java b/app/src/main/java/com/discord/models/message/Message.java index 541dc9b71d..2073b0a6db 100644 --- a/app/src/main/java/com/discord/models/message/Message.java +++ b/app/src/main/java/com/discord/models/message/Message.java @@ -19,13 +19,12 @@ import com.discord.api.sticker.Sticker; import com.discord.api.sticker.StickerPartial; import com.discord.api.user.User; import com.discord.api.utcdatetime.UtcDateTime; -import d0.g; import d0.g0.w; import d0.t.h0; import d0.z.d.m; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import kotlin.Lazy; import kotlin.jvm.internal.DefaultConstructorMarker; /* compiled from: Message.kt */ public final class Message { @@ -37,6 +36,7 @@ public final class Message { private final Long applicationId; private final List attachments; private final User author; + private Map cachedReactionsMap; private final MessageCall call; private final long channelId; private final List components; @@ -62,7 +62,6 @@ public final class Message { private final Integer numRetries; private final Boolean pinned; private final List reactions; - private final Lazy reactionsMap$delegate; private final com.discord.api.message.Message referencedMessage; private final List stickerItems; private final List stickers; @@ -122,7 +121,6 @@ public final class Message { this.lastManualAttemptTimestamp = l5; this.initialAttemptTimestamp = l6; this.localAttachments = list9; - this.reactionsMap$delegate = g.lazy(new Message$reactionsMap$2(this)); } /* JADX INFO: this call moved to the top of the method (can break code semantics) */ @@ -136,10 +134,6 @@ public final class Message { m.checkNotNullParameter(message, "message"); } - public static final /* synthetic */ Map access$getEMPTY_REACTIONS$cp() { - return EMPTY_REACTIONS; - } - public static /* synthetic */ Message copy$default(Message message, long j, long j2, Long l, User user, String str, UtcDateTime utcDateTime, UtcDateTime utcDateTime2, Boolean bool, Boolean bool2, List list, List list2, List list3, List list4, List list5, String str2, Boolean bool3, Long l2, Integer num, MessageActivity messageActivity, Application application, Long l3, MessageReference messageReference, Long l4, List list6, List list7, com.discord.api.message.Message message2, Interaction interaction, Channel channel, List list8, MessageCall messageCall, Boolean bool4, boolean z2, MessageAllowedMentions messageAllowedMentions, Integer num2, Long l5, Long l6, List list9, int i, int i2, Object obj) { return message.copy((i & 1) != 0 ? message.f2058id : j, (i & 2) != 0 ? message.channelId : j2, (i & 4) != 0 ? message.guildId : l, (i & 8) != 0 ? message.author : user, (i & 16) != 0 ? message.content : str, (i & 32) != 0 ? message.timestamp : utcDateTime, (i & 64) != 0 ? message.editedTimestamp : utcDateTime2, (i & 128) != 0 ? message.tts : bool, (i & 256) != 0 ? message.mentionEveryone : bool2, (i & 512) != 0 ? message.mentions : list, (i & 1024) != 0 ? message.mentionRoles : list2, (i & 2048) != 0 ? message.attachments : list3, (i & 4096) != 0 ? message.embeds : list4, (i & 8192) != 0 ? message.reactions : list5, (i & 16384) != 0 ? message.nonce : str2, (i & 32768) != 0 ? message.pinned : bool3, (i & 65536) != 0 ? message.webhookId : l2, (i & 131072) != 0 ? message.type : num, (i & 262144) != 0 ? message.activity : messageActivity, (i & 524288) != 0 ? message.application : application, (i & 1048576) != 0 ? message.applicationId : l3, (i & 2097152) != 0 ? message.messageReference : messageReference, (i & 4194304) != 0 ? message.flags : l4, (i & 8388608) != 0 ? message.stickers : list6, (i & 16777216) != 0 ? message.stickerItems : list7, (i & 33554432) != 0 ? message.referencedMessage : message2, (i & 67108864) != 0 ? message.interaction : interaction, (i & 134217728) != 0 ? message.thread : channel, (i & 268435456) != 0 ? message.components : list8, (i & 536870912) != 0 ? message.call : messageCall, (i & 1073741824) != 0 ? message.hit : bool4, (i & Integer.MIN_VALUE) != 0 ? message.hasLocalUploads : z2, (i2 & 1) != 0 ? message.allowedMentions : messageAllowedMentions, (i2 & 2) != 0 ? message.numRetries : num2, (i2 & 4) != 0 ? message.lastManualAttemptTimestamp : l5, (i2 & 8) != 0 ? message.initialAttemptTimestamp : l6, (i2 & 16) != 0 ? message.localAttachments : list9); } @@ -439,7 +433,24 @@ public final class Message { } public final Map getReactionsMap() { - return (Map) this.reactionsMap$delegate.getValue(); + Map map = this.cachedReactionsMap; + if (map != null) { + m.checkNotNull(map); + } else { + List list = this.reactions; + if (list == null || !(!list.isEmpty())) { + map = EMPTY_REACTIONS; + } else { + List list2 = this.reactions; + LinkedHashMap linkedHashMap = new LinkedHashMap(); + for (Object obj : list2) { + linkedHashMap.put(((MessageReaction) obj).b().c(), obj); + } + map = linkedHashMap; + } + this.cachedReactionsMap = map; + } + return map; } public final com.discord.api.message.Message getReferencedMessage() { diff --git a/app/src/main/java/com/discord/stores/StoreClientVersion.java b/app/src/main/java/com/discord/stores/StoreClientVersion.java index 638db0e54e..f2dd5af0d6 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 = 82112; + private final int clientVersion = 82116; public static final /* synthetic */ void access$setClientMinVersion(StoreClientVersion storeClientVersion, int i) { storeClientVersion.setClientMinVersion(i); diff --git a/app/src/main/java/com/discord/stores/StoreMessageAck.java b/app/src/main/java/com/discord/stores/StoreMessageAck.java index e39e3745f4..b41df0fb43 100644 --- a/app/src/main/java/com/discord/stores/StoreMessageAck.java +++ b/app/src/main/java/com/discord/stores/StoreMessageAck.java @@ -659,7 +659,7 @@ public final class StoreMessageAck extends StoreV2 { @Override // com.discord.stores.StoreV2 public void snapshotData() { super.snapshotData(); - HashMap hashMap = new HashMap(this.acks.size()); + HashMap hashMap = new HashMap(this.acks.size(), 0.75f); hashMap.putAll(this.acks); this.acksSnapshot = hashMap; Persister.set$default(this.acksPersister, hashMap, false, 2, null); diff --git a/app/src/main/java/com/discord/stores/utilities/Batched$onNext$1.java b/app/src/main/java/com/discord/stores/utilities/Batched$onNext$1.java index c5da8637d6..80c1b639ba 100644 --- a/app/src/main/java/com/discord/stores/utilities/Batched$onNext$1.java +++ b/app/src/main/java/com/discord/stores/utilities/Batched$onNext$1.java @@ -11,7 +11,7 @@ import kotlin.coroutines.Continuation; import kotlin.jvm.functions.Function2; import kotlinx.coroutines.CoroutineScope; /* compiled from: Batched.kt */ -@e(c = "com.discord.stores.utilities.Batched$onNext$1", f = "Batched.kt", l = {70}, m = "invokeSuspend") +@e(c = "com.discord.stores.utilities.Batched$onNext$1", f = "Batched.kt", l = {82}, m = "invokeSuspend") public final class Batched$onNext$1 extends k implements Function2, Object> { public int label; public final /* synthetic */ Batched this$0; diff --git a/app/src/main/java/com/discord/stores/utilities/Batched.java b/app/src/main/java/com/discord/stores/utilities/Batched.java index d4f5a23159..dbb726e5fb 100644 --- a/app/src/main/java/com/discord/stores/utilities/Batched.java +++ b/app/src/main/java/com/discord/stores/utilities/Batched.java @@ -1,6 +1,7 @@ package com.discord.stores.utilities; import c.q.a.k.a; +import com.discord.app.AppLog; import com.discord.utilities.time.Clock; import com.discord.utilities.time.ClockFactory; import d0.z.d.m; @@ -61,7 +62,7 @@ public final class Batched { return batched.debounceDelayMs; } - public final void flush() { + public final synchronized void flush() { Job job = this.debounceJob; if (job != null) { a.k(job, null, 1, null); @@ -81,7 +82,10 @@ public final class Batched { return this.subject; } - public final void onNext(T t) { + public final synchronized void onNext(T t) { + if (t == null) { + AppLog.i("onNext received a NULL value for Batched[" + this.type + ']'); + } this.queue.add(t); long currentTimeMillis = this.clock.currentTimeMillis(); if (this.queueStartTime == -1) { @@ -89,13 +93,13 @@ public final class Batched { } if (currentTimeMillis - this.queueStartTime >= this.maxDebounceDelayMs) { flush(); - return; + } else { + Job job = this.debounceJob; + if (job != null) { + a.k(job, null, 1, null); + } + this.debounceJob = a.G(this.scope, null, null, new Batched$onNext$1(this, null), 3, null); } - Job job = this.debounceJob; - if (job != null) { - a.k(job, null, 1, null); - } - this.debounceJob = a.G(this.scope, null, null, new Batched$onNext$1(this, null), 3, null); } /* JADX DEBUG: Multi-variable search result rejected for r2v0, resolved type: java.lang.Object */ 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 f1d04d1a60..da0a77eb0d 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/82112"), o.to("client_build_number", 82112), o.to("client_version", "82.12 - 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/82116"), o.to("client_build_number", 82116), o.to("client_version", "82.16 - 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/images/MGImages.java b/app/src/main/java/com/discord/utilities/images/MGImages.java index 7a5f9d0343..146c252075 100644 --- a/app/src/main/java/com/discord/utilities/images/MGImages.java +++ b/app/src/main/java/com/discord/utilities/images/MGImages.java @@ -177,6 +177,8 @@ public final class MGImages { o.h(context, c.a.l.b.g(context, 2131886798, new Object[]{e.getMessage()}, null, 4), 0, null, 12); } catch (NullPointerException e2) { o.h(context, c.a.l.b.g(context, 2131886798, new Object[]{e2.getMessage()}, null, 4), 0, null, 12); + } catch (IllegalStateException e3) { + o.h(context, c.a.l.b.g(context, 2131886798, new Object[]{e3.getMessage()}, null, 4), 0, null, 12); } } } 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 3454c8e0c5..3d2ddf53ee 100644 --- a/app/src/main/java/com/discord/utilities/rest/RestAPI.java +++ b/app/src/main/java/com/discord/utilities/rest/RestAPI.java @@ -177,7 +177,7 @@ public final class RestAPI implements RestAPIInterface { @Override // com.discord.restapi.RequiredHeadersInterceptor.HeadersProvider public String getUserAgent() { - return "Discord-Android/82112"; + return "Discord-Android/82116"; } } diff --git a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete.java b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete.java index bb14161ba2..736c7b5fab 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete.java +++ b/app/src/main/java/com/discord/widgets/chat/input/WidgetChatInputAutocomplete.java @@ -746,7 +746,7 @@ public final class WidgetChatInputAutocomplete { } String replaceAfterLast$default = w.replaceAfterLast$default(str, ':', "", null, 4, null); FlexEditText flexEditText = this.editText; - String substring = replaceAfterLast$default.substring(0, replaceAfterLast$default.length() - 1); + String substring = replaceAfterLast$default.substring(0, Math.max(0, replaceAfterLast$default.length() - 1)); m.checkNotNullExpressionValue(substring, "(this as java.lang.Strin…ing(startIndex, endIndex)"); flexEditText.setText(substring); MessageManager.sendMessage$default(new MessageManager(this.stickersAdapter.getContext(), null, null, null, null, null, null, null, null, 510, null), null, null, null, null, d0.t.m.listOf(sticker), false, null, null, null, 495, null); diff --git a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputModelMappingFunctions.java b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputModelMappingFunctions.java index 9b30bf1d84..57b38534d3 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputModelMappingFunctions.java +++ b/app/src/main/java/com/discord/widgets/chat/input/applicationcommands/WidgetChatInputModelMappingFunctions.java @@ -355,8 +355,8 @@ public final class WidgetChatInputModelMappingFunctions { } } - /* JADX WARNING: Removed duplicated region for block: B:106:0x006d A[EDGE_INSN: B:106:0x006d->B:21:0x006d ?: BREAK , SYNTHETIC] */ - /* JADX WARNING: Removed duplicated region for block: B:74:0x020e */ + /* JADX WARNING: Removed duplicated region for block: B:103:0x006e A[EDGE_INSN: B:103:0x006e->B:21:0x006e ?: BREAK , SYNTHETIC] */ + /* JADX WARNING: Removed duplicated region for block: B:74:0x020a */ public final ApplicationCommandData getApplicationSendData(AutocompleteInputSelectionModel autocompleteInputSelectionModel, List list) { InputSelectionModel inputSelectionModel; VerifiedCommandMentionInputModel inputModel; @@ -438,12 +438,12 @@ public final class WidgetChatInputModelMappingFunctions { while (it4.hasNext()) { Map.Entry entry = (Map.Entry) it4.next(); Object key = entry.getKey(); - String obj3 = ((CommandOptionValue) entry.getValue()).getValue().toString(); + Object value2 = ((CommandOptionValue) entry.getValue()).getValue(); if (entry.getValue() instanceof StringOptionValue) { List choices = ((ApplicationCommandOption) entry.getKey()).getChoices(); if (!(!(choices == null || choices.isEmpty()) || (optionRange = inputModel.getInputCommandOptions().getInputRanges().get(entry.getKey())) == null || (value = optionRange.getValue()) == null)) { int first = value.getFirst(); - String obj4 = ((CommandOptionValue) entry.getValue()).getValue().toString(); + String obj3 = ((CommandOptionValue) entry.getValue()).getValue().toString(); Map inputMentionsMap = inputModel.getInputMentionsMap(); LinkedHashMap linkedHashMap3 = new LinkedHashMap(g0.mapCapacity(inputMentionsMap.size())); Iterator it5 = inputMentionsMap.entrySet().iterator(); @@ -453,32 +453,32 @@ public final class WidgetChatInputModelMappingFunctions { } LinkedHashMap linkedHashMap4 = new LinkedHashMap(); for (Map.Entry entry3 : linkedHashMap3.entrySet()) { - if (((IntRange) entry3.getKey()).getFirst() >= 0 && ((IntRange) entry3.getKey()).getLast() <= obj4.length()) { + if (((IntRange) entry3.getKey()).getFirst() >= 0 && ((IntRange) entry3.getKey()).getLast() <= obj3.length()) { linkedHashMap4.put(entry3.getKey(), entry3.getValue()); } } - obj3 = INSTANCE.replaceAutocompleteDataWithServerValues(obj3, linkedHashMap4); + value2 = INSTANCE.replaceAutocompleteDataWithServerValues(obj3, linkedHashMap4); } } - linkedHashMap2.put(key, obj3); + linkedHashMap2.put(key, value2); } Map commandOptionValidity = inputModel.getInputCommandOptions().getCommandOptionValidity(); for (ApplicationCommandOption applicationCommandOption : selectedCommand.getOptions()) { if ((applicationCommandOption.getRequired() && linkedHashMap2.get(applicationCommandOption) == null) || m.areEqual(commandOptionValidity.get(applicationCommandOption), Boolean.FALSE)) { return new ApplicationCommandData(application, selectedCommand, n.emptyList(), false); } - while (r1.hasNext()) { + while (r2.hasNext()) { } } if (selectedCommand instanceof ApplicationSubCommand) { Set keySet = linkedHashMap2.keySet(); ArrayList arrayList = new ArrayList(o.collectionSizeOrDefault(keySet, 10)); for (ApplicationCommandOption applicationCommandOption2 : keySet) { - String str = (String) linkedHashMap2.get(applicationCommandOption2); - if (str == null) { + Object obj4 = linkedHashMap2.get(applicationCommandOption2); + if (obj4 == null) { return null; } - arrayList.add(new ApplicationCommandValue(applicationCommandOption2.getName(), str, applicationCommandOption2.getType().getType(), null, 8, null)); + arrayList.add(new ApplicationCommandValue(applicationCommandOption2.getName(), obj4, applicationCommandOption2.getType().getType(), null, 8, null)); } ApplicationSubCommand applicationSubCommand = (ApplicationSubCommand) selectedCommand; ApplicationCommandValue applicationCommandValue = new ApplicationCommandValue(applicationSubCommand.getSubCommandName(), null, ApplicationCommandType.SUBCOMMAND.getType(), arrayList, 2, null); @@ -487,11 +487,11 @@ public final class WidgetChatInputModelMappingFunctions { Set keySet2 = linkedHashMap2.keySet(); ArrayList arrayList2 = new ArrayList(o.collectionSizeOrDefault(keySet2, 10)); for (ApplicationCommandOption applicationCommandOption3 : keySet2) { - String str2 = (String) linkedHashMap2.get(applicationCommandOption3); - if (str2 == null) { + Object obj5 = linkedHashMap2.get(applicationCommandOption3); + if (obj5 == null) { return null; } - arrayList2.add(new ApplicationCommandValue(applicationCommandOption3.getName(), str2, applicationCommandOption3.getType().getType(), null, 8, null)); + arrayList2.add(new ApplicationCommandValue(applicationCommandOption3.getName(), obj5, applicationCommandOption3.getType().getType(), null, 8, null)); } return new ApplicationCommandData(application, selectedCommand, arrayList2, true); } 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 15008d3b8b..f72f1c9444 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, 2131887892, objArr2, null, 4)); TextView textView3 = getBinding().b; m.checkNotNullExpressionValue(textView3, "binding.fatalCrashAppVersion"); - textView3.setText(b.j(this, 2131887885, new Object[]{"82.12 - Beta"}, null, 4)); + textView3.setText(b.j(this, 2131887885, new Object[]{"82.16 - Beta"}, null, 4)); TextView textView4 = getBinding().d; m.checkNotNullExpressionValue(textView4, "binding.fatalCrashOsVersion"); textView4.setText(b.j(this, 2131887888, new Object[]{String.valueOf(Build.VERSION.SDK_INT)}, null, 4)); diff --git a/app/src/main/java/com/discord/widgets/media/WidgetMedia.java b/app/src/main/java/com/discord/widgets/media/WidgetMedia.java index 9e2c684b89..46356ad0ea 100644 --- a/app/src/main/java/com/discord/widgets/media/WidgetMedia.java +++ b/app/src/main/java/com/discord/widgets/media/WidgetMedia.java @@ -95,6 +95,7 @@ public final class WidgetMedia extends AppFragment { int[] iArr2 = new int[11]; $EnumSwitchMapping$1 = iArr2; iArr2[EmbedType.VIDEO.ordinal()] = 1; + iArr2[EmbedType.GIFV.ordinal()] = 2; } } @@ -133,22 +134,23 @@ public final class WidgetMedia extends AppFragment { launch(context, a, c3, c2, c4, g, b, mediaType); } - /* JADX WARNING: Removed duplicated region for block: B:15:0x0041 */ - /* JADX WARNING: Removed duplicated region for block: B:16:0x0044 */ - /* JADX WARNING: Removed duplicated region for block: B:19:0x0051 */ - /* JADX WARNING: Removed duplicated region for block: B:20:0x0055 */ + /* JADX WARNING: Removed duplicated region for block: B:17:0x0044 */ + /* JADX WARNING: Removed duplicated region for block: B:18:0x0047 */ + /* JADX WARNING: Removed duplicated region for block: B:21:0x0054 */ /* JADX WARNING: Removed duplicated region for block: B:22:0x0058 */ - /* JADX WARNING: Removed duplicated region for block: B:23:0x005c */ + /* JADX WARNING: Removed duplicated region for block: B:24:0x005b */ /* JADX WARNING: Removed duplicated region for block: B:25:0x005f */ + /* JADX WARNING: Removed duplicated region for block: B:27:0x0062 */ public final void launch(Context context, MessageEmbed messageEmbed) { String str; RenderableEmbedMedia previewImage; + int ordinal; String str2; m.checkNotNullParameter(context, "context"); m.checkNotNullParameter(messageEmbed, "embed"); EmbedType k = messageEmbed.k(); Integer num = null; - if (k != null && k.ordinal() == 2) { + if (k != null && ((ordinal = k.ordinal()) == 2 || ordinal == 7)) { EmbedVideo m = messageEmbed.m(); if (m == null || (str2 = m.b()) == null) { EmbedVideo m2 = messageEmbed.m(); 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 bd459d8295..3fc03c5ff0 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java @@ -332,7 +332,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi TextView textView = binding.f; m.checkNotNullExpressionValue(textView, "appInfoHeader"); String string = getString(2131886360); - textView.setText(string + " - 82.12 - Beta (82112)"); + textView.setText(string + " - 82.16 - Beta (82116)"); binding.f1921y.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 ccd7154646..22f2156662 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1341,7 +1341,7 @@ Presets Select a color Transparency - 68977ce749cf4ee9b4f8cf8a6a2edd06 + 26f7c0da6ddc4256af0f4fc97b3bdbc6 Coming Soon Slash command application {applicationName} {applicationName} application