BlazeK1ng420/discord-jadx
1
0
Fork 0
forked from Juby210/discord-jadx
Code Issues Pull requests Projects Releases Wiki Activity

101.6 - Beta (101106)

Browse source
This commit is contained in:
Juby210 2021-11-12 10:24:43 +01:00
parent b7472dff86
commit e5dc602af9
8 changed files with 41 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -10,8 +10,8 @@ android {
applicationId 'com.discord' applicationId 'com.discord'
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 30 targetSdkVersion 30
versionCode 101105 versionCode 101106
versionName "101.5 - Beta" versionName "101.6 - Beta"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }

2
app/src/main/AndroidManifest.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="101105" android:versionName="101.5 - Beta" android:installLocation="auto" android:compileSdkVersion="30" android:compileSdkVersionCodename="11" package="com.discord" platformBuildVersionCode="30" platformBuildVersionName="11"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="101106" android:versionName="101.6 - Beta" android:installLocation="auto" android:compileSdkVersion="30" android:compileSdkVersionCodename="11" package="com.discord" platformBuildVersionCode="30" platformBuildVersionName="11">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30"/> <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30"/>
<uses-feature android:name="android.hardware.camera" android:required="false"/> <uses-feature android:name="android.hardware.camera" android:required="false"/>
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/> <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>

4
app/src/main/java/com/discord/restapi/RestAPIInterface.java
View file

@ -354,7 +354,7 @@ public interface RestAPIInterface {
@b("guilds/{guildId}/integrations/{integrationId}") @b("guilds/{guildId}/integrations/{integrationId}")
Observable<Void> deleteGuildIntegration(@s("guildId") long j, @s("integrationId") long j2); Observable<Void> deleteGuildIntegration(@s("guildId") long j, @s("integrationId") long j2);
@b("/guilds/{guildId}/role-subscriptions/group-listings/{groupListingId}/subscription-listings/{listingId}") @b("guilds/{guildId}/role-subscriptions/group-listings/{groupListingId}/subscription-listings/{listingId}")
Observable<Void> deleteGuildRoleSubscriptionTierListing(@s("guildId") long j, @s("groupListingId") long j2, @s("listingId") long j3); Observable<Void> deleteGuildRoleSubscriptionTierListing(@s("guildId") long j, @s("groupListingId") long j2, @s("listingId") long j3);
@b("guild-events/{eventId}") @b("guild-events/{eventId}")
@ -899,7 +899,7 @@ public interface RestAPIInterface {
@n("guilds/{guildId}/role-subscriptions/group-listings/{groupListingId}") @n("guilds/{guildId}/role-subscriptions/group-listings/{groupListingId}")
Observable<GuildRoleSubscriptionGroupListing> updateGuildRoleSubscriptionGroupListing(@s("guildId") long j, @s("groupListingId") long j2, @a RestAPIParams.UpdateGuildRoleSubscriptionGroupListing updateGuildRoleSubscriptionGroupListing); Observable<GuildRoleSubscriptionGroupListing> updateGuildRoleSubscriptionGroupListing(@s("guildId") long j, @s("groupListingId") long j2, @a RestAPIParams.UpdateGuildRoleSubscriptionGroupListing updateGuildRoleSubscriptionGroupListing);
@n("/guilds/{guildId}/role-subscriptions/group-listings/{groupListingId}/subscription-listings/{listingId}") @n("guilds/{guildId}/role-subscriptions/group-listings/{groupListingId}/subscription-listings/{listingId}")
Observable<GuildRoleSubscriptionTierListing> updateGuildRoleSubscriptionTierListing(@s("guildId") long j, @s("groupListingId") long j2, @s("listingId") long j3, @a RestAPIParams.UpdateGuildRoleSubscriptionTierListing updateGuildRoleSubscriptionTierListing); Observable<GuildRoleSubscriptionTierListing> updateGuildRoleSubscriptionTierListing(@s("guildId") long j, @s("groupListingId") long j2, @s("listingId") long j3, @a RestAPIParams.UpdateGuildRoleSubscriptionTierListing updateGuildRoleSubscriptionTierListing);
@n("guild-events/{eventId}") @n("guild-events/{eventId}")

2
app/src/main/java/com/discord/stores/StoreMessagesHolder.java
View file

@ -38,7 +38,7 @@ public class StoreMessagesHolder {
private static final int MAX_MESSAGES_PER_CHANNEL = 200; private static final int MAX_MESSAGES_PER_CHANNEL = 200;
private static final int MAX_MESSAGES_PER_CHANNEL_TRIM = 100; private static final int MAX_MESSAGES_PER_CHANNEL_TRIM = 100;
private final Set<Long> activeChannels = new HashSet(); private final Set<Long> activeChannels = new HashSet();
private final Persister<Map<Long, List<Message>>> cache = new Persister<>("STORE_MESSAGES_CACHE_V36", new HashMap()); private final Persister<Map<Long, List<Message>>> cache = new Persister<>("STORE_MESSAGES_CACHE_V37", new HashMap());
private boolean cacheEnabled; private boolean cacheEnabled;
private Subscription cachePersistSubscription; private Subscription cachePersistSubscription;
private long cachePersistedAt = ClockFactory.get().currentTimeMillis(); private long cachePersistedAt = ClockFactory.get().currentTimeMillis();

4
app/src/main/java/com/discord/utilities/rest/RestAPI.java
View file

@ -839,7 +839,7 @@ public final class RestAPI implements RestAPIInterface {
} }
@Override // com.discord.restapi.RestAPIInterface @Override // com.discord.restapi.RestAPIInterface
@b("/guilds/{guildId}/role-subscriptions/group-listings/{groupListingId}/subscription-listings/{listingId}") @b("guilds/{guildId}/role-subscriptions/group-listings/{groupListingId}/subscription-listings/{listingId}")
public Observable<Void> deleteGuildRoleSubscriptionTierListing(@s("guildId") long j, @s("groupListingId") long j2, @s("listingId") long j3) { public Observable<Void> deleteGuildRoleSubscriptionTierListing(@s("guildId") long j, @s("groupListingId") long j2, @s("listingId") long j3) {
return this._api.deleteGuildRoleSubscriptionTierListing(j, j2, j3); return this._api.deleteGuildRoleSubscriptionTierListing(j, j2, j3);
} }
@ -2189,7 +2189,7 @@ public final class RestAPI implements RestAPIInterface {
} }
@Override // com.discord.restapi.RestAPIInterface @Override // com.discord.restapi.RestAPIInterface
@i0.f0.n("/guilds/{guildId}/role-subscriptions/group-listings/{groupListingId}/subscription-listings/{listingId}") @i0.f0.n("guilds/{guildId}/role-subscriptions/group-listings/{groupListingId}/subscription-listings/{listingId}")
public Observable<GuildRoleSubscriptionTierListing> updateGuildRoleSubscriptionTierListing(@s("guildId") long j, @s("groupListingId") long j2, @s("listingId") long j3, @i0.f0.a RestAPIParams.UpdateGuildRoleSubscriptionTierListing updateGuildRoleSubscriptionTierListing) { public Observable<GuildRoleSubscriptionTierListing> updateGuildRoleSubscriptionTierListing(@s("guildId") long j, @s("groupListingId") long j2, @s("listingId") long j3, @i0.f0.a RestAPIParams.UpdateGuildRoleSubscriptionTierListing updateGuildRoleSubscriptionTierListing) {
m.checkNotNullParameter(updateGuildRoleSubscriptionTierListing, "body"); m.checkNotNullParameter(updateGuildRoleSubscriptionTierListing, "body");
return this._api.updateGuildRoleSubscriptionTierListing(j, j2, j3, updateGuildRoleSubscriptionTierListing); return this._api.updateGuildRoleSubscriptionTierListing(j, j2, j3, updateGuildRoleSubscriptionTierListing);

63
app/src/main/java/com/discord/widgets/guilds/invite/InviteJoinHelper$joinViaInvite$4.java
View file

@ -1,6 +1,7 @@
package com.discord.widgets.guilds.invite; package com.discord.widgets.guilds.invite;
import android.content.Context; import android.content.Context;
import androidx.fragment.app.FragmentActivity;
import c.a.d.j; import c.a.d.j;
import com.discord.R; import com.discord.R;
import com.discord.api.channel.Channel; import com.discord.api.channel.Channel;
@ -43,7 +44,7 @@ import kotlin.jvm.internal.Ref$ObjectRef;
import kotlinx.coroutines.CoroutineScope; import kotlinx.coroutines.CoroutineScope;
import retrofit2.HttpException; import retrofit2.HttpException;
/* compiled from: InviteJoinHelper.kt */ /* compiled from: InviteJoinHelper.kt */
@e(c = "com.discord.widgets.guilds.invite.InviteJoinHelper$joinViaInvite$4", f = "InviteJoinHelper.kt", l = {74, 99, 108, 109, 123, 162, 193}, m = "invokeSuspend") @e(c = "com.discord.widgets.guilds.invite.InviteJoinHelper$joinViaInvite$4", f = "InviteJoinHelper.kt", l = {76, 101, 110, 111, 125, 164, 193}, m = "invokeSuspend")
public final class InviteJoinHelper$joinViaInvite$4 extends k implements Function2<CoroutineScope, Continuation<? super Unit>, Object> { public final class InviteJoinHelper$joinViaInvite$4 extends k implements Function2<CoroutineScope, Continuation<? super Unit>, Object> {
public final /* synthetic */ String $captchaKey; public final /* synthetic */ String $captchaKey;
public final /* synthetic */ AppFragment $fragment; public final /* synthetic */ AppFragment $fragment;
@ -84,21 +85,21 @@ public final class InviteJoinHelper$joinViaInvite$4 extends k implements Functio
return ((InviteJoinHelper$joinViaInvite$4) create(coroutineScope, continuation)).invokeSuspend(Unit.a); return ((InviteJoinHelper$joinViaInvite$4) create(coroutineScope, continuation)).invokeSuspend(Unit.a);
} }
/* JADX WARNING: Removed duplicated region for block: B:104:0x0276 */ /* JADX WARNING: Removed duplicated region for block: B:104:0x027f */
/* JADX WARNING: Removed duplicated region for block: B:117:0x02c1 */ /* JADX WARNING: Removed duplicated region for block: B:117:0x02ca */
/* JADX WARNING: Removed duplicated region for block: B:121:0x02d2 */ /* JADX WARNING: Removed duplicated region for block: B:121:0x02db */
/* JADX WARNING: Removed duplicated region for block: B:151:0x0369 */ /* JADX WARNING: Removed duplicated region for block: B:151:0x0372 */
/* JADX WARNING: Removed duplicated region for block: B:152:0x0377 */ /* JADX WARNING: Removed duplicated region for block: B:152:0x0380 */
/* JADX WARNING: Removed duplicated region for block: B:164:0x03cb */ /* JADX WARNING: Removed duplicated region for block: B:164:0x03d4 */
/* JADX WARNING: Removed duplicated region for block: B:167:0x03de A[RETURN] */ /* JADX WARNING: Removed duplicated region for block: B:167:0x03e7 A[RETURN] */
/* JADX WARNING: Removed duplicated region for block: B:69:0x01a2 */ /* JADX WARNING: Removed duplicated region for block: B:69:0x01ab */
/* JADX WARNING: Removed duplicated region for block: B:74:0x01af */ /* JADX WARNING: Removed duplicated region for block: B:74:0x01b8 */
/* JADX WARNING: Removed duplicated region for block: B:79:0x01d5 */ /* JADX WARNING: Removed duplicated region for block: B:79:0x01de */
/* JADX WARNING: Removed duplicated region for block: B:80:0x01d7 */ /* JADX WARNING: Removed duplicated region for block: B:80:0x01e0 */
/* JADX WARNING: Removed duplicated region for block: B:82:0x01da */ /* JADX WARNING: Removed duplicated region for block: B:82:0x01e3 */
/* JADX WARNING: Removed duplicated region for block: B:87:0x01f5 */ /* JADX WARNING: Removed duplicated region for block: B:87:0x01fe */
/* JADX WARNING: Removed duplicated region for block: B:94:0x023e A[RETURN] */ /* JADX WARNING: Removed duplicated region for block: B:94:0x0247 A[RETURN] */
/* JADX WARNING: Removed duplicated region for block: B:95:0x023f */ /* JADX WARNING: Removed duplicated region for block: B:95:0x0248 */
/* JADX WARNING: Unknown variable types count: 2 */ /* JADX WARNING: Unknown variable types count: 2 */
@Override // d0.w.i.a.a @Override // d0.w.i.a.a
public final Object invokeSuspend(Object obj) { public final Object invokeSuspend(Object obj) {
@ -128,6 +129,7 @@ public final class InviteJoinHelper$joinViaInvite$4 extends k implements Functio
List<GuildFeature> l2; List<GuildFeature> l2;
List<GuildFeature> l3; List<GuildFeature> l3;
Object coroutine_suspended = c.getCOROUTINE_SUSPENDED(); Object coroutine_suspended = c.getCOROUTINE_SUSPENDED();
String str = null;
switch (this.label) { switch (this.label) {
case 0: case 0:
l.throwOnFailure(obj); l.throwOnFailure(obj);
@ -145,15 +147,23 @@ public final class InviteJoinHelper$joinViaInvite$4 extends k implements Functio
boolean z6 = (guild4 == null || (l = guild4.l()) == null || !l.contains(GuildFeature.HUB)) ? false : true; boolean z6 = (guild4 == null || (l = guild4.l()) == null || !l.contains(GuildFeature.HUB)) ? false : true;
if (z6 && !GrowthTeamFeatures.INSTANCE.isHubEnabled()) { if (z6 && !GrowthTeamFeatures.INSTANCE.isHubEnabled()) {
c.a.d.m.g(ref$ObjectRef4.element, R.string.discord_u_coming_soon_to_mobile, 0, null, 12); c.a.d.m.g(ref$ObjectRef4.element, R.string.discord_u_coming_soon_to_mobile, 0, null, 12);
return Unit.a;
} else if (z6 && GrowthTeamFeatures.INSTANCE.isHubEmailConnectionEnabled()) { } else if (z6 && GrowthTeamFeatures.INSTANCE.isHubEmailConnectionEnabled()) {
Context context = ref$ObjectRef4.element; Context context = ref$ObjectRef4.element;
HubEmailEntryPoint hubEmailEntryPoint = HubEmailEntryPoint.Invite; HubEmailEntryPoint hubEmailEntryPoint = HubEmailEntryPoint.Invite;
Guild guild5 = this.$invite.getGuild(); Guild guild5 = this.$invite.getGuild();
String v = guild5 != null ? guild5.v() : null; if (guild5 != null) {
if (v == null) { str = guild5.v();
v = "";
} }
j.d(context, WidgetHubEmailFlow.class, new HubEmailArgs(v, this.$invite.getApproximateMemberCount(), hubEmailEntryPoint)); if (str == null) {
str = "";
}
j.d(context, WidgetHubEmailFlow.class, new HubEmailArgs(str, this.$invite.getApproximateMemberCount(), hubEmailEntryPoint));
FragmentActivity activity = this.$fragment.getActivity();
if (activity != null) {
activity.onBackPressed();
}
return Unit.a;
} else if (!z4 || !z5) { } else if (!z4 || !z5) {
ref$ObjectRef2 = ref$ObjectRef4; ref$ObjectRef2 = ref$ObjectRef4;
modelInvite4 = null; modelInvite4 = null;
@ -426,18 +436,7 @@ public final class InviteJoinHelper$joinViaInvite$4 extends k implements Functio
if (((guild != null || (boxLong2 = b.boxLong(guild.p())) == null) ? null : StoreStream.Companion.getGuilds().getGuilds().get(b.boxLong(boxLong2.longValue()))) != null) { if (((guild != null || (boxLong2 = b.boxLong(guild.p())) == null) ? null : StoreStream.Companion.getGuilds().getGuilds().get(b.boxLong(boxLong2.longValue()))) != null) {
} }
} }
modelInvite = null; break;
function2 = this.$onInviteFlowFinished;
if (modelInvite == null) {
}
this.L$0 = null;
this.L$1 = null;
this.L$2 = null;
this.L$3 = null;
this.label = 7;
if (function2.invoke(modelInvite, this) == coroutine_suspended) {
}
return Unit.a;
case 1: case 1:
InviteJoinHelper$joinViaInvite$4 inviteJoinHelper$joinViaInvite$4 = (InviteJoinHelper$joinViaInvite$4) this.L$3; InviteJoinHelper$joinViaInvite$4 inviteJoinHelper$joinViaInvite$4 = (InviteJoinHelper$joinViaInvite$4) this.L$3;
Ref$ObjectRef ref$ObjectRef6 = (Ref$ObjectRef) this.L$1; Ref$ObjectRef ref$ObjectRef6 = (Ref$ObjectRef) this.L$1;

2
app/src/main/java/com/discord/widgets/settings/WidgetSettings.java
View file

@ -346,7 +346,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
TextView textView = binding.f; TextView textView = binding.f;
m.checkNotNullExpressionValue(textView, "appInfoHeader"); m.checkNotNullExpressionValue(textView, "appInfoHeader");
String string = getString(R.string.app_information); String string = getString(R.string.app_information);
textView.setText(string + " - 101.5 - Beta (101105)"); textView.setText(string + " - 101.6 - Beta (101106)");
binding.B.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$3(this)); binding.B.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$3(this));
binding.u.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE); binding.u.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE);
binding.q.setOnClickListener(WidgetSettings$onViewBound$1$6.INSTANCE); binding.q.setOnClickListener(WidgetSettings$onViewBound$1$6.INSTANCE);

2
app/src/main/res/values/strings.xml
View file

@ -1475,7 +1475,7 @@
<string name="color_picker_title">Select a color</string> <string name="color_picker_title">Select a color</string>
<string name="color_picker_transparency">Transparency</string> <string name="color_picker_transparency">Transparency</string>
<string name="color_picker_use_default">Use Default</string> <string name="color_picker_use_default">Use Default</string>
<string name="res_2131887555_com_crashlytics_android_build_id">be51239636d841e78cce35a4c7b37dec</string> <string name="res_2131887555_com_crashlytics_android_build_id">7fda0ac2434f4424ba121d532be29be8</string>
<string name="coming_soon">Coming Soon</string> <string name="coming_soon">Coming Soon</string>
<string name="command_accessibility_desc_app_header_item">Slash command application {applicationName}</string> <string name="command_accessibility_desc_app_header_item">Slash command application {applicationName}</string>
<string name="command_accessibility_desc_app_item">{applicationName} application</string> <string name="command_accessibility_desc_app_item">{applicationName} application</string>