From 18dae46feb60349b4e6a07b9f57e562dce735b60 Mon Sep 17 00:00:00 2001 From: Juby210 Date: Thu, 7 Oct 2021 09:24:34 +0200 Subject: [PATCH] 96.2 - Beta (96102) --- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 2 +- .../commands/AutocompleteCommandUtils.java | 143 +++--------------- .../widgets/settings/WidgetSettings.java | 2 +- app/src/main/res/values/strings.xml | 2 +- 5 files changed, 23 insertions(+), 130 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 499013deec..1dfb432714 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 29 - versionCode 96101 - versionName "96.1 - Beta" + versionCode 96102 + versionName "96.2 - Beta" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b6b2d7ae0f..ed901004b2 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/input/autocomplete/commands/AutocompleteCommandUtils.java b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/commands/AutocompleteCommandUtils.java index cfbec8c08f..008a66c0be 100644 --- a/app/src/main/java/com/discord/widgets/chat/input/autocomplete/commands/AutocompleteCommandUtils.java +++ b/app/src/main/java/com/discord/widgets/chat/input/autocomplete/commands/AutocompleteCommandUtils.java @@ -16,7 +16,6 @@ import com.discord.widgets.chat.input.autocomplete.Autocompletable; import com.discord.widgets.chat.input.autocomplete.AutocompleteModelUtils; import com.discord.widgets.chat.input.autocomplete.ChannelAutocompletable; import com.discord.widgets.chat.input.autocomplete.InputEditTextAction; -import com.discord.widgets.chat.input.autocomplete.LeadingIdentifier; import com.discord.widgets.chat.input.autocomplete.RoleAutocompletable; import com.discord.widgets.chat.input.autocomplete.UserAutocompletable; import com.discord.widgets.chat.input.models.AutocompleteApplicationCommands; @@ -44,6 +43,7 @@ import d0.z.d.m; import java.text.NumberFormat; import java.text.ParseException; import java.text.ParsePosition; +import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.LinkedHashMap; @@ -343,13 +343,12 @@ public final class AutocompleteCommandUtils { public final String getCommandPrefix(CharSequence charSequence) { List groupValues; - String str; m.checkNotNullParameter(charSequence, "$this$getCommandPrefix"); MatchResult find$default = Regex.find$default(new Regex("^(/([\\p{L}0-9-]+\\s*){0,3})"), charSequence, 0, 2, null); - if (find$default == null || (groupValues = find$default.getGroupValues()) == null || (str = (String) u.getOrNull(groupValues, 1)) == null) { + if (find$default == null || (groupValues = find$default.getGroupValues()) == null) { return null; } - return w.trim(str).toString(); + return (String) u.getOrNull(groupValues, 1); } public final Set getErrorsToShowForCommandParameters(ApplicationCommand applicationCommand, ApplicationCommandOption applicationCommandOption, ApplicationCommandOption applicationCommandOption2, Map map, Map map2) { @@ -380,7 +379,7 @@ public final class AutocompleteCommandUtils { return linkedHashSet; } - /* JADX DEBUG: Multi-variable search result rejected for r2v5, resolved type: java.lang.Object */ + /* JADX DEBUG: Multi-variable search result rejected for r1v2, resolved type: java.lang.Object */ /* JADX WARN: Multi-variable type inference failed */ /* JADX ERROR: IF instruction can be used only in fallback mode jadx.core.utils.exceptions.CodegenException: IF instruction can be used only in fallback mode @@ -405,6 +404,12 @@ public final class AutocompleteCommandUtils { at jadx.core.codegen.RegionGen.makeRegion(RegionGen.java:64) at jadx.core.dex.regions.Region.generate(Region.java:35) at jadx.core.codegen.RegionGen.makeRegion(RegionGen.java:64) + at jadx.core.codegen.RegionGen.makeRegionIndent(RegionGen.java:93) + at jadx.core.codegen.RegionGen.makeIf(RegionGen.java:136) + at jadx.core.dex.regions.conditions.IfRegion.generate(IfRegion.java:137) + at jadx.core.codegen.RegionGen.makeRegion(RegionGen.java:64) + at jadx.core.dex.regions.Region.generate(Region.java:35) + at jadx.core.codegen.RegionGen.makeRegion(RegionGen.java:64) at jadx.core.codegen.MethodGen.addRegionInsns(MethodGen.java:261) at jadx.core.codegen.MethodGen.addInstructions(MethodGen.java:254) at jadx.core.codegen.ClassGen.addMethodCode(ClassGen.java:345) @@ -415,129 +420,17 @@ public final class AutocompleteCommandUtils { at java.base/java.util.stream.SortedOps$RefSortingSink.end(SortedOps.java:395) at java.base/java.util.stream.Sink$ChainedReference.end(Sink.java:258) */ - /* JADX WARNING: Code restructure failed: missing block: B:8:0x0036, code lost: - if (d0.g0.t.startsWith$default(r8, r9, false, 2, null) == false) goto L_0x0038; + /* JADX WARNING: Code restructure failed: missing block: B:68:0x014c, code lost: + if (d0.g0.t.startsWith$default(r18.subSequence(1, r18.length()).toString(), d0.z.d.m.stringPlus(r2 != null ? r2.getName() : null, " "), false, 2, null) != false) goto L_0x0157; */ - /* JADX WARNING: Removed duplicated region for block: B:31:0x00bc */ - /* JADX WARNING: Removed duplicated region for block: B:44:0x00a8 A[EDGE_INSN: B:44:0x00a8->B:26:0x00a8 ?: BREAK , SYNTHETIC] */ - /* JADX WARNING: Removed duplicated region for block: B:48:0x00d7 A[EDGE_INSN: B:48:0x00d7->B:39:0x00d7 ?: BREAK , SYNTHETIC] */ + /* JADX WARNING: Code restructure failed: missing block: B:8:0x0039, code lost: + if (d0.g0.t.startsWith$default(r11, r12, false, 2, null) == false) goto L_0x003b; + */ + /* JADX WARNING: Removed duplicated region for block: B:76:0x0165 */ + /* JADX WARNING: Removed duplicated region for block: B:95:0x0180 A[EDGE_INSN: B:95:0x0180->B:84:0x0180 ?: BREAK , SYNTHETIC] */ public final com.discord.widgets.chat.input.models.InputCommandContext getInputCommandContext(java.lang.CharSequence charSequence, long j, java.util.List list, com.discord.widgets.chat.input.models.AutocompleteApplicationCommands autocompleteApplicationCommands, com.discord.models.commands.ApplicationCommand applicationCommand) { /* - r14 = this; - r0 = r15 - r1 = r18 - java.lang.String r2 = "input" - d0.z.d.m.checkNotNullParameter(r15, r2) - java.lang.String r2 = "userRoles" - d0.z.d.m.checkNotNullParameter(r1, r2) - java.lang.String r2 = "applicationCommands" - r3 = r19 - d0.z.d.m.checkNotNullParameter(r3, r2) - java.lang.String r2 = r14.getCommandPrefix(r15) - r4 = 0 - if (r2 == 0) goto L_0x00da - r5 = 2 - r6 = 1 - r7 = 0 - if (r20 == 0) goto L_0x0038 - java.lang.String r8 = r2.substring(r6) - java.lang.String r9 = "(this as java.lang.String).substring(startIndex)" - d0.z.d.m.checkNotNullExpressionValue(r8, r9) - java.lang.String r9 = r20.getName() - if (r9 == 0) goto L_0x0030 - goto L_0x0032 - L_0x0030: - java.lang.String r9 = "" - L_0x0032: - boolean r8 = d0.g0.t.startsWith$default(r8, r9, r7, r5, r4) - if (r8 != 0) goto L_0x00ac - L_0x0038: - int r2 = r2.length() - if (r2 <= 0) goto L_0x0040 - r2 = 1 - goto L_0x0041 - L_0x0040: - r2 = 0 - L_0x0041: - if (r2 == 0) goto L_0x00ac - java.util.List r2 = r19.getQueryCommands() - java.util.List r2 = com.discord.stores.StoreApplicationCommandsKt.flattenSubCommands(r2) - java.util.Iterator r2 = r2.iterator() - L_0x004f: - boolean r8 = r2.hasNext() - if (r8 == 0) goto L_0x00a7 - java.lang.Object r8 = r2.next() - r9 = r8 - com.discord.models.commands.ApplicationCommand r9 = (com.discord.models.commands.ApplicationCommand) r9 - java.lang.StringBuilder r10 = new java.lang.StringBuilder - r10.() - com.discord.widgets.chat.input.autocomplete.LeadingIdentifier r11 = com.discord.widgets.chat.input.autocomplete.LeadingIdentifier.APP_COMMAND - java.lang.Character r11 = r11.getIdentifier() - d0.z.d.m.checkNotNull(r11) - char r11 = r11.charValue() - java.lang.String r12 = r9.getName() - java.lang.StringBuilder r13 = new java.lang.StringBuilder - r13.() - java.lang.String r11 = java.lang.String.valueOf(r11) - r13.append(r11) - r13.append(r12) - java.lang.String r11 = r13.toString() - r10.append(r11) - r11 = 32 - r10.append(r11) - java.lang.String r10 = r10.toString() - boolean r10 = d0.g0.w.startsWith$default(r15, r10, r7, r5, r4) - if (r10 == 0) goto L_0x00a1 - r10 = r16 - boolean r9 = com.discord.models.commands.ApplicationCommandKt.hasPermission(r9, r10, r1) - if (r9 == 0) goto L_0x00a3 - r9 = 1 - goto L_0x00a4 - L_0x00a1: - r10 = r16 - L_0x00a3: - r9 = 0 - L_0x00a4: - if (r9 == 0) goto L_0x004f - goto L_0x00a8 - L_0x00a7: - r8 = r4 - L_0x00a8: - r0 = r8 - com.discord.models.commands.ApplicationCommand r0 = (com.discord.models.commands.ApplicationCommand) r0 - goto L_0x00ae - L_0x00ac: - r0 = r20 - L_0x00ae: - java.util.List r1 = r19.getApplications() - java.util.Iterator r1 = r1.iterator() - L_0x00b6: - boolean r2 = r1.hasNext() - if (r2 == 0) goto L_0x00d7 - java.lang.Object r2 = r1.next() - r3 = r2 - com.discord.models.commands.Application r3 = (com.discord.models.commands.Application) r3 - long r8 = r3.getId() - if (r0 == 0) goto L_0x00d3 - long r10 = r0.getApplicationId() - int r3 = (r8 > r10 ? 1 : (r8 == r10 ? 0 : -1)) - if (r3 != 0) goto L_0x00d3 - r3 = 1 - goto L_0x00d4 - L_0x00d3: - r3 = 0 - L_0x00d4: - if (r3 == 0) goto L_0x00b6 - r4 = r2 - L_0x00d7: - com.discord.models.commands.Application r4 = (com.discord.models.commands.Application) r4 - goto L_0x00db - L_0x00da: - r0 = r4 - L_0x00db: - com.discord.widgets.chat.input.models.InputCommandContext r1 = new com.discord.widgets.chat.input.models.InputCommandContext - r1.(r4, r0) - return r1 + // Method dump skipped, instructions count: 394 */ throw new UnsupportedOperationException("Method not decompiled: com.discord.widgets.chat.input.autocomplete.commands.AutocompleteCommandUtils.getInputCommandContext(java.lang.CharSequence, long, java.util.List, com.discord.widgets.chat.input.models.AutocompleteApplicationCommands, com.discord.models.commands.ApplicationCommand):com.discord.widgets.chat.input.models.InputCommandContext"); } 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 af713efa9d..f8746f71e6 100644 --- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java +++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java @@ -314,7 +314,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 + " - 96.1 - Beta (96101)"); + textView.setText(string + " - 96.2 - Beta (96102)"); 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 c02e7be61a..e35903b53f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1432,7 +1432,7 @@ Select a color Transparency Use Default - 1d92b0b4af45420f9d9e3014804d0392 + eeb7d21ed7a140ac9d10f3e9118a1c94 Coming Soon Slash command application {applicationName} {applicationName} application