diff --git a/app/build.gradle b/app/build.gradle index 97baddefa3..6136b8ec49 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId 'com.discord' minSdkVersion 21 targetSdkVersion 30 - versionCode 101107 - versionName "101.7 - Beta" + versionCode 102106 + versionName "102.6 - Beta" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fcfbaecb5a..a7dc9c8f71 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + @@ -72,7 +72,7 @@ - + @@ -82,13 +82,10 @@ - - - @@ -97,7 +94,6 @@ - @@ -107,33 +103,31 @@ - - - - + + + + + + - - - - @@ -142,7 +136,7 @@ - + diff --git a/app/src/main/java/c/a/a/z/c.java b/app/src/main/java/c/a/a/z/c.java index f7ee9ec4c0..a8f76d0f20 100644 --- a/app/src/main/java/c/a/a/z/c.java +++ b/app/src/main/java/c/a/a/z/c.java @@ -348,7 +348,7 @@ public final class c extends AppDialog { String str; ModelSku sku; Application application; - String e; + String f; ModelSku sku2; AppViewFlipper appViewFlipper = h().g; m.checkNotNullExpressionValue(appViewFlipper, "binding.acceptGiftFlipper"); @@ -360,11 +360,11 @@ public final class c extends AppDialog { MGImages.setImage$default(mGImages, simpleDraweeView, PremiumUtils.INSTANCE.getNitroGiftIcon(modelGift), (MGImages.ChangeDetector) null, 4, (Object) null); } else { ModelStoreListing storeListing = modelGift.getStoreListing(); - if (storeListing == null || (sku = storeListing.getSku()) == null || (application = sku.getApplication()) == null || (e = application.e()) == null) { + if (storeListing == null || (sku = storeListing.getSku()) == null || (application = sku.getApplication()) == null || (f = application.f()) == null) { str = null; } else { ModelStoreListing storeListing2 = modelGift.getStoreListing(); - str = IconUtils.getApplicationIcon$default((storeListing2 == null || (sku2 = storeListing2.getSku()) == null) ? 0 : sku2.getApplicationId(), e, 0, 4, null); + str = IconUtils.getApplicationIcon$default((storeListing2 == null || (sku2 = storeListing2.getSku()) == null) ? 0 : sku2.getApplicationId(), f, 0, 4, null); } h().b.setImageURI(str); } diff --git a/app/src/main/java/c/a/b/a.java b/app/src/main/java/c/a/b/a.java index 4e995554dc..06fcd1e8eb 100644 --- a/app/src/main/java/c/a/b/a.java +++ b/app/src/main/java/c/a/b/a.java @@ -5,6 +5,8 @@ import com.discord.api.activity.ActivityPlatform; import com.discord.api.activity.ActivityPlatformTypeAdapter; import com.discord.api.activity.ActivityType; import com.discord.api.activity.ActivityTypeTypeAdapter; +import com.discord.api.application.ApplicationType; +import com.discord.api.application.ApplicationTypeAdapter; import com.discord.api.auth.OAuthScope; import com.discord.api.auth.OAuthScopeTypeAdapter; import com.discord.api.botuikit.ButtonStyle; @@ -74,7 +76,7 @@ import java.util.Map; import kotlin.jvm.functions.Function0; /* compiled from: TypeAdapterRegistrar.kt */ public final class a { - public static final Map, Function0> a = h0.mapOf(o.to(ActivityPlatform.class, b.i), o.to(ApplicationStatus.class, C0023a.C), o.to(UtcDateTime.class, C0023a.F), o.to(NsfwAllowance.class, C0023a.G), o.to(PremiumTier.class, C0023a.H), o.to(ActivityType.class, C0023a.I), o.to(Phone.class, C0023a.J), o.to(ApplicationCommandType.class, C0023a.K), o.to(OAuthScope.class, C0023a.L), o.to(GuildVerificationLevel.class, C0023a.i), o.to(GuildExplicitContentFilter.class, C0023a.j), o.to(GuildMaxVideoChannelUsers.class, C0023a.k), o.to(ComponentType.class, C0023a.l), o.to(ButtonStyle.class, C0023a.m), o.to(ReportNodeChild.class, C0023a.n), o.to(ReportNodeElementData.class, C0023a.o), o.to(ReportNodeBottomButton.class, C0023a.p), o.to(ApplicationCommandPermissionType.class, C0023a.q), o.to(StageInstancePrivacyLevel.class, C0023a.r), o.to(FriendSuggestionReasonType.class, C0023a.f41s), o.to(AllowedInSuggestionsType.class, C0023a.t), o.to(StickerFormatType.class, C0023a.u), o.to(LocalizedString.class, C0023a.v), o.to(MessageActivityType.class, C0023a.w), o.to(EmbedType.class, C0023a.f42x), o.to(StickerType.class, C0023a.f43y), o.to(GuildScheduledEventStatus.class, C0023a.f44z), o.to(GuildScheduledEventEntityType.class, C0023a.A), o.to(Science.Event.SchemaObject.class, C0023a.B), o.to(GuildRoleSubscriptionBenefitType.class, C0023a.D), o.to(PriceTierType.class, C0023a.E)); + public static final Map, Function0> a = h0.mapOf(o.to(ActivityPlatform.class, b.i), o.to(ActivityType.class, C0023a.C), o.to(ApplicationStatus.class, C0023a.H), o.to(UtcDateTime.class, C0023a.I), o.to(NsfwAllowance.class, C0023a.J), o.to(PremiumTier.class, C0023a.K), o.to(ActivityType.class, C0023a.L), o.to(Phone.class, C0023a.M), o.to(ApplicationCommandType.class, C0023a.N), o.to(OAuthScope.class, C0023a.i), o.to(GuildVerificationLevel.class, C0023a.j), o.to(GuildExplicitContentFilter.class, C0023a.k), o.to(GuildMaxVideoChannelUsers.class, C0023a.l), o.to(ComponentType.class, C0023a.m), o.to(ButtonStyle.class, C0023a.n), o.to(ReportNodeChild.class, C0023a.o), o.to(ReportNodeElementData.class, C0023a.p), o.to(ReportNodeBottomButton.class, C0023a.q), o.to(ApplicationCommandPermissionType.class, C0023a.r), o.to(StageInstancePrivacyLevel.class, C0023a.f41s), o.to(FriendSuggestionReasonType.class, C0023a.t), o.to(AllowedInSuggestionsType.class, C0023a.u), o.to(StickerFormatType.class, C0023a.v), o.to(LocalizedString.class, C0023a.w), o.to(MessageActivityType.class, C0023a.f42x), o.to(EmbedType.class, C0023a.f43y), o.to(StickerType.class, C0023a.f44z), o.to(GuildScheduledEventStatus.class, C0023a.A), o.to(GuildScheduledEventEntityType.class, C0023a.B), o.to(Science.Event.SchemaObject.class, C0023a.D), o.to(GuildRoleSubscriptionBenefitType.class, C0023a.E), o.to(PriceTierType.class, C0023a.F), o.to(ApplicationType.class, C0023a.G)); public static final List b = n.listOf((Object[]) new c.i.d.o[]{ComponentRuntimeTypeAdapter.INSTANCE.a(), new NullSerializableTypeAdapterFactory()}); /* compiled from: kotlin-style lambda group */ @@ -92,6 +94,8 @@ public final class a { public static final C0023a J = new C0023a(27); public static final C0023a K = new C0023a(28); public static final C0023a L = new C0023a(29); + public static final C0023a M = new C0023a(30); + public static final C0023a N = new C0023a(31); public static final C0023a i = new C0023a(0); public static final C0023a j = new C0023a(1); public static final C0023a k = new C0023a(2); @@ -118,78 +122,82 @@ public final class a { /* renamed from: z reason: collision with root package name */ public static final C0023a f44z = new C0023a(17); - public final /* synthetic */ int M; + public final /* synthetic */ int O; /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public C0023a(int i2) { super(0); - this.M = i2; + this.O = i2; } @Override // kotlin.jvm.functions.Function0 /* renamed from: invoke */ public final Object mo1invoke() { - switch (this.M) { + switch (this.O) { case 0: - return new GuildVerificationLevelTypeAdapter(); - case 1: - return new GuildExplicitContentFilterTypeAdapter(); - case 2: - return new GuildMaxVideoChannelUsersTypeAdapter(); - case 3: - return new ComponentTypeTypeAdapter(); - case 4: - return new ButtonStyleTypeAdapter(); - case 5: - return new ReportNodeChildTypeAdapter(); - case 6: - return new ReportNodeElementDataTypeAdapter(); - case 7: - return new ReportNodeBottomButtonTypeAdapter(); - case 8: - return new ApplicationCommandPermissionTypeTypeAdapter(); - case 9: - return new StageInstancePrivacyLevelTypeAdapter(); - case 10: - return new FriendSuggestionReasonTypeAdapter(); - case 11: - return new AllowedInSuggestionsTypeAdapter(); - case 12: - return new StickerFormatTypeTypeAdapter(); - case 13: - return new LocalizedStringTypeAdapter(); - case 14: - return new MessageActivityTypeTypeAdapter(); - case 15: - return new EmbedTypeTypeAdapter(); - case 16: - return new StickerTypeTypeAdapter(); - case 17: - return new GuildScheduledEventStatusTypeAdapter(); - case 18: - return new GuildScheduledEventEntityTypeTypeAdapter(); - case 19: - return new AnalyticsSchemaTypeAdapter(); - case 20: - return new ApplicationStatusTypeAdapter(); - case 21: - return new GuildRoleSubscriptionBenefitTypeAdapter(); - case 22: - return new PriceTierTypeAdapter(); - case 23: - return new UtcDateTimeTypeAdapter(); - case 24: - return new NsfwAllowanceTypeAdapter(); - case 25: - return new PremiumTierTypeAdapter(); - case 26: - return new ActivityTypeTypeAdapter(); - case 27: - return new PhoneTypeAdapter(); - case 28: - return new CommandTypeAdapter(); - case 29: return new OAuthScopeTypeAdapter(); + case 1: + return new GuildVerificationLevelTypeAdapter(); + case 2: + return new GuildExplicitContentFilterTypeAdapter(); + case 3: + return new GuildMaxVideoChannelUsersTypeAdapter(); + case 4: + return new ComponentTypeTypeAdapter(); + case 5: + return new ButtonStyleTypeAdapter(); + case 6: + return new ReportNodeChildTypeAdapter(); + case 7: + return new ReportNodeElementDataTypeAdapter(); + case 8: + return new ReportNodeBottomButtonTypeAdapter(); + case 9: + return new ApplicationCommandPermissionTypeTypeAdapter(); + case 10: + return new StageInstancePrivacyLevelTypeAdapter(); + case 11: + return new FriendSuggestionReasonTypeAdapter(); + case 12: + return new AllowedInSuggestionsTypeAdapter(); + case 13: + return new StickerFormatTypeTypeAdapter(); + case 14: + return new LocalizedStringTypeAdapter(); + case 15: + return new MessageActivityTypeTypeAdapter(); + case 16: + return new EmbedTypeTypeAdapter(); + case 17: + return new StickerTypeTypeAdapter(); + case 18: + return new GuildScheduledEventStatusTypeAdapter(); + case 19: + return new GuildScheduledEventEntityTypeTypeAdapter(); + case 20: + return new ActivityTypeTypeAdapter(); + case 21: + return new AnalyticsSchemaTypeAdapter(); + case 22: + return new GuildRoleSubscriptionBenefitTypeAdapter(); + case 23: + return new PriceTierTypeAdapter(); + case 24: + return new ApplicationTypeAdapter(); + case 25: + return new ApplicationStatusTypeAdapter(); + case 26: + return new UtcDateTimeTypeAdapter(); + case 27: + return new NsfwAllowanceTypeAdapter(); + case 28: + return new PremiumTierTypeAdapter(); + case 29: + return new ActivityTypeTypeAdapter(); + case 30: + return new PhoneTypeAdapter(); + case 31: + return new CommandTypeAdapter(); default: throw null; } diff --git a/app/src/main/java/c/a/f/a.java b/app/src/main/java/c/a/f/a.java index e38e44c26a..207f09011c 100644 --- a/app/src/main/java/c/a/f/a.java +++ b/app/src/main/java/c/a/f/a.java @@ -91,7 +91,7 @@ public final class a implements View.OnClickListener { @Override // android.view.View.OnClickListener public void onClick(View view) { m.checkNotNullParameter(view, "v"); - this.p.f1644z.clearFocus(); + this.p.f1649z.clearFocus(); ChipsView chipsView = this.p; Objects.requireNonNull(chipsView); m.checkNotNullParameter(this, "chip"); diff --git a/app/src/main/java/c/a/f/g.java b/app/src/main/java/c/a/f/g.java index 09e89ac842..e6cd640a3a 100644 --- a/app/src/main/java/c/a/f/g.java +++ b/app/src/main/java/c/a/f/g.java @@ -12,7 +12,7 @@ public final class g implements View.OnClickListener { @Override // android.view.View.OnClickListener public final void onClick(View view) { - this.i.f1644z.requestFocus(); + this.i.f1649z.requestFocus(); this.i.f(null); } } diff --git a/app/src/main/java/c/a/k/b.java b/app/src/main/java/c/a/k/b.java index 55d9ab8a46..7c7104dc9f 100644 --- a/app/src/main/java/c/a/k/b.java +++ b/app/src/main/java/c/a/k/b.java @@ -218,7 +218,7 @@ public final class b { m.checkNotNullParameter(objArr, "formatArgs"); m.checkNotNullParameter(renderContext, "renderContext"); Map map = renderContext.a; - List list = renderContext.f2127c; + List list = renderContext.f2133c; boolean z2 = true; if (!map.isEmpty()) { charSequence = a.replace(charSequence, new f(map)); diff --git a/app/src/main/java/c/a/k/f/c.java b/app/src/main/java/c/a/k/f/c.java index 8c2c3a26a9..bb13c8f031 100644 --- a/app/src/main/java/c/a/k/f/c.java +++ b/app/src/main/java/c/a/k/f/c.java @@ -38,7 +38,7 @@ public final class c extends Node.a { spannableStringBuilder.setSpan(obj2, length, spannableStringBuilder.length(), 33); } } - Hook.a aVar2 = hook != null ? hook.f2126c : null; + Hook.a aVar2 = hook != null ? hook.f2132c : null; if (aVar2 != null) { aVar = aVar2; } else if (URLUtil.isValidUrl(this.a)) { diff --git a/app/src/main/java/c/a/m/a/a0.java b/app/src/main/java/c/a/m/a/a0.java index 47f1fe3cf1..f32e48f703 100644 --- a/app/src/main/java/c/a/m/a/a0.java +++ b/app/src/main/java/c/a/m/a/a0.java @@ -1,7 +1,7 @@ package c.a.m.a; import com.discord.models.domain.Model; -import com.discord.models.experiments.dto.GuildExperimentDto; +import com.discord.models.experiments.dto.UserExperimentDto; /* compiled from: lambda */ public final /* synthetic */ class a0 implements Model.JsonReader.ItemFactory { public final /* synthetic */ Model.JsonReader a; @@ -12,6 +12,6 @@ public final /* synthetic */ class a0 implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - return GuildExperimentDto.Parser.parse(this.a); + return UserExperimentDto.Parser.parse(this.a); } } diff --git a/app/src/main/java/c/a/m/a/b0.java b/app/src/main/java/c/a/m/a/b0.java index 9cc020448d..02ffadcf9e 100644 --- a/app/src/main/java/c/a/m/a/b0.java +++ b/app/src/main/java/c/a/m/a/b0.java @@ -1,7 +1,8 @@ package c.a.m.a; +import com.discord.api.channel.Channel; +import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; -import com.discord.models.experiments.dto.UserExperimentDto; /* compiled from: lambda */ public final /* synthetic */ class b0 implements Model.JsonReader.ItemFactory { public final /* synthetic */ Model.JsonReader a; @@ -12,6 +13,6 @@ public final /* synthetic */ class b0 implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - return UserExperimentDto.Parser.parse(this.a); + return (Channel) InboundGatewayGsonParser.fromJson(this.a, Channel.class); } } diff --git a/app/src/main/java/c/a/m/a/c0.java b/app/src/main/java/c/a/m/a/c0.java index 6b6ae51353..1f56254d27 100644 --- a/app/src/main/java/c/a/m/a/c0.java +++ b/app/src/main/java/c/a/m/a/c0.java @@ -1,6 +1,6 @@ package c.a.m.a; -import com.discord.api.channel.Channel; +import com.discord.api.activity.Activity; import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; /* compiled from: lambda */ @@ -13,6 +13,6 @@ public final /* synthetic */ class c0 implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - return (Channel) InboundGatewayGsonParser.fromJson(this.a, Channel.class); + return (Activity) InboundGatewayGsonParser.fromJson(this.a, Activity.class); } } diff --git a/app/src/main/java/c/a/m/a/d0.java b/app/src/main/java/c/a/m/a/d0.java index a473846967..eaf88c73a4 100644 --- a/app/src/main/java/c/a/m/a/d0.java +++ b/app/src/main/java/c/a/m/a/d0.java @@ -1,8 +1,7 @@ package c.a.m.a; -import com.discord.api.activity.Activity; -import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; +import com.discord.models.domain.ModelGuildFolder; /* compiled from: lambda */ public final /* synthetic */ class d0 implements Model.JsonReader.ItemFactory { public final /* synthetic */ Model.JsonReader a; @@ -13,6 +12,6 @@ public final /* synthetic */ class d0 implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - return (Activity) InboundGatewayGsonParser.fromJson(this.a, Activity.class); + return ModelGuildFolder.Parser.INSTANCE.parse(this.a); } } diff --git a/app/src/main/java/c/a/m/a/e0.java b/app/src/main/java/c/a/m/a/e0.java index 0d86a2a990..ae06015514 100644 --- a/app/src/main/java/c/a/m/a/e0.java +++ b/app/src/main/java/c/a/m/a/e0.java @@ -1,17 +1,13 @@ package c.a.m.a; -import com.discord.models.domain.Model; -import com.discord.models.domain.ModelUserProfile; +import java.util.HashMap; +import rx.functions.Func0; /* compiled from: lambda */ -public final /* synthetic */ class e0 implements Model.JsonReader.ItemFactory { - public final /* synthetic */ Model.JsonReader a; +public final /* synthetic */ class e0 implements Func0 { + public static final /* synthetic */ e0 i = new e0(); - public /* synthetic */ e0(Model.JsonReader jsonReader) { - this.a = jsonReader; - } - - @Override // com.discord.models.domain.Model.JsonReader.ItemFactory - public final Object get() { - return (ModelUserProfile.GuildReference) this.a.parse(new ModelUserProfile.GuildReference()); + @Override // rx.functions.Func0, java.util.concurrent.Callable + public final Object call() { + return new HashMap(); } } diff --git a/app/src/main/java/c/a/m/a/f0.java b/app/src/main/java/c/a/m/a/f0.java index d92a027682..5f9aaf1e3f 100644 --- a/app/src/main/java/c/a/m/a/f0.java +++ b/app/src/main/java/c/a/m/a/f0.java @@ -1,17 +1,13 @@ package c.a.m.a; import com.discord.models.domain.Model; -import com.discord.models.domain.ModelConnectedAccount; +import com.discord.models.experiments.dto.UserExperimentDto; /* compiled from: lambda */ -public final /* synthetic */ class f0 implements Model.JsonReader.ItemFactory { - public final /* synthetic */ Model.JsonReader a; +public final /* synthetic */ class f0 implements Model.JsonReader.KeySelector { + public static final /* synthetic */ f0 a = new f0(); - public /* synthetic */ f0(Model.JsonReader jsonReader) { - this.a = jsonReader; - } - - @Override // com.discord.models.domain.Model.JsonReader.ItemFactory - public final Object get() { - return (ModelConnectedAccount) this.a.parse(new ModelConnectedAccount()); + @Override // com.discord.models.domain.Model.JsonReader.KeySelector + public final Object get(Object obj) { + return Long.valueOf(((UserExperimentDto) obj).getNameHash()); } } diff --git a/app/src/main/java/c/a/m/a/g0.java b/app/src/main/java/c/a/m/a/g0.java index b2ba46c344..539f970b72 100644 --- a/app/src/main/java/c/a/m/a/g0.java +++ b/app/src/main/java/c/a/m/a/g0.java @@ -1,7 +1,6 @@ package c.a.m.a; import com.discord.models.domain.Model; -import com.discord.models.domain.ModelGuildFolder; /* compiled from: lambda */ public final /* synthetic */ class g0 implements Model.JsonReader.ItemFactory { public final /* synthetic */ Model.JsonReader a; @@ -12,6 +11,6 @@ public final /* synthetic */ class g0 implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - return ModelGuildFolder.Parser.INSTANCE.parse(this.a); + return this.a.nextStringOrNull(); } } diff --git a/app/src/main/java/c/a/m/a/h0.java b/app/src/main/java/c/a/m/a/h0.java deleted file mode 100644 index 77043d33ea..0000000000 --- a/app/src/main/java/c/a/m/a/h0.java +++ /dev/null @@ -1,13 +0,0 @@ -package c.a.m.a; - -import com.discord.models.domain.Model; -import com.discord.models.domain.ModelUserProfile; -/* compiled from: lambda */ -public final /* synthetic */ class h0 implements Model.JsonReader.KeySelector { - public static final /* synthetic */ h0 a = new h0(); - - @Override // com.discord.models.domain.Model.JsonReader.KeySelector - public final Object get(Object obj) { - return Long.valueOf(((ModelUserProfile.GuildReference) obj).getGuildId()); - } -} diff --git a/app/src/main/java/c/a/m/a/l0/a.java b/app/src/main/java/c/a/m/a/h0/a.java similarity index 96% rename from app/src/main/java/c/a/m/a/l0/a.java rename to app/src/main/java/c/a/m/a/h0/a.java index 0d6c39a376..7d4b416ea2 100644 --- a/app/src/main/java/c/a/m/a/l0/a.java +++ b/app/src/main/java/c/a/m/a/h0/a.java @@ -1,4 +1,4 @@ -package c.a.m.a.l0; +package c.a.m.a.h0; import com.discord.models.domain.Model; import com.discord.models.domain.emoji.ModelEmojiUnicode; diff --git a/app/src/main/java/c/a/m/a/l0/b.java b/app/src/main/java/c/a/m/a/h0/b.java similarity index 96% rename from app/src/main/java/c/a/m/a/l0/b.java rename to app/src/main/java/c/a/m/a/h0/b.java index 8b278c1f6e..e368e8418c 100644 --- a/app/src/main/java/c/a/m/a/l0/b.java +++ b/app/src/main/java/c/a/m/a/h0/b.java @@ -1,4 +1,4 @@ -package c.a.m.a.l0; +package c.a.m.a.h0; import com.discord.models.domain.Model; import com.discord.models.domain.emoji.ModelEmojiUnicode; diff --git a/app/src/main/java/c/a/m/a/l0/c.java b/app/src/main/java/c/a/m/a/h0/c.java similarity index 97% rename from app/src/main/java/c/a/m/a/l0/c.java rename to app/src/main/java/c/a/m/a/h0/c.java index 78f72ef837..72db84aa01 100644 --- a/app/src/main/java/c/a/m/a/l0/c.java +++ b/app/src/main/java/c/a/m/a/h0/c.java @@ -1,4 +1,4 @@ -package c.a.m.a.l0; +package c.a.m.a.h0; import android.os.Parcelable; import com.discord.models.domain.Model; diff --git a/app/src/main/java/c/a/m/a/i0.java b/app/src/main/java/c/a/m/a/i0.java deleted file mode 100644 index fa404aa9eb..0000000000 --- a/app/src/main/java/c/a/m/a/i0.java +++ /dev/null @@ -1,13 +0,0 @@ -package c.a.m.a; - -import java.util.HashMap; -import rx.functions.Func0; -/* compiled from: lambda */ -public final /* synthetic */ class i0 implements Func0 { - public static final /* synthetic */ i0 i = new i0(); - - @Override // rx.functions.Func0, java.util.concurrent.Callable - public final Object call() { - return new HashMap(); - } -} diff --git a/app/src/main/java/c/a/m/a/j0.java b/app/src/main/java/c/a/m/a/j0.java deleted file mode 100644 index 88537b6082..0000000000 --- a/app/src/main/java/c/a/m/a/j0.java +++ /dev/null @@ -1,13 +0,0 @@ -package c.a.m.a; - -import com.discord.models.domain.Model; -import com.discord.models.experiments.dto.UserExperimentDto; -/* compiled from: lambda */ -public final /* synthetic */ class j0 implements Model.JsonReader.KeySelector { - public static final /* synthetic */ j0 a = new j0(); - - @Override // com.discord.models.domain.Model.JsonReader.KeySelector - public final Object get(Object obj) { - return Long.valueOf(((UserExperimentDto) obj).getNameHash()); - } -} diff --git a/app/src/main/java/c/a/m/a/k.java b/app/src/main/java/c/a/m/a/k.java index 61075b100a..865de1bf92 100644 --- a/app/src/main/java/c/a/m/a/k.java +++ b/app/src/main/java/c/a/m/a/k.java @@ -1,7 +1,7 @@ package c.a.m.a; import com.discord.models.domain.Model; -import com.discord.models.domain.ModelConnectedAccountIntegration; +import com.discord.models.domain.ModelNotificationSettings; /* compiled from: lambda */ public final /* synthetic */ class k implements Model.JsonReader.ItemFactory { public final /* synthetic */ Model.JsonReader a; @@ -12,6 +12,6 @@ public final /* synthetic */ class k implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - return ModelConnectedAccountIntegration.Parser.INSTANCE.parse(this.a); + return (ModelNotificationSettings.ChannelOverride) this.a.parse(new ModelNotificationSettings.ChannelOverride()); } } diff --git a/app/src/main/java/c/a/m/a/k0.java b/app/src/main/java/c/a/m/a/k0.java deleted file mode 100644 index 864ff9fcfa..0000000000 --- a/app/src/main/java/c/a/m/a/k0.java +++ /dev/null @@ -1,16 +0,0 @@ -package c.a.m.a; - -import com.discord.models.domain.Model; -/* compiled from: lambda */ -public final /* synthetic */ class k0 implements Model.JsonReader.ItemFactory { - public final /* synthetic */ Model.JsonReader a; - - public /* synthetic */ k0(Model.JsonReader jsonReader) { - this.a = jsonReader; - } - - @Override // com.discord.models.domain.Model.JsonReader.ItemFactory - public final Object get() { - return this.a.nextStringOrNull(); - } -} diff --git a/app/src/main/java/c/a/m/a/l.java b/app/src/main/java/c/a/m/a/l.java index dc42c70b29..2f958a786d 100644 --- a/app/src/main/java/c/a/m/a/l.java +++ b/app/src/main/java/c/a/m/a/l.java @@ -1,7 +1,8 @@ package c.a.m.a; +import com.discord.api.guild.Guild; +import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; -import com.discord.models.domain.ModelNotificationSettings; /* compiled from: lambda */ public final /* synthetic */ class l implements Model.JsonReader.ItemFactory { public final /* synthetic */ Model.JsonReader a; @@ -12,6 +13,6 @@ public final /* synthetic */ class l implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - return (ModelNotificationSettings.ChannelOverride) this.a.parse(new ModelNotificationSettings.ChannelOverride()); + return (Guild) InboundGatewayGsonParser.fromJson(this.a, Guild.class); } } diff --git a/app/src/main/java/c/a/m/a/m.java b/app/src/main/java/c/a/m/a/m.java index ab9f597868..a9637867a3 100644 --- a/app/src/main/java/c/a/m/a/m.java +++ b/app/src/main/java/c/a/m/a/m.java @@ -1,8 +1,7 @@ package c.a.m.a; -import com.discord.api.guild.Guild; -import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; +import com.discord.models.domain.ModelSession; /* compiled from: lambda */ public final /* synthetic */ class m implements Model.JsonReader.ItemFactory { public final /* synthetic */ Model.JsonReader a; @@ -13,6 +12,6 @@ public final /* synthetic */ class m implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - return (Guild) InboundGatewayGsonParser.fromJson(this.a, Guild.class); + return (ModelSession) this.a.parse(new ModelSession()); } } diff --git a/app/src/main/java/c/a/m/a/n.java b/app/src/main/java/c/a/m/a/n.java index 2de85dfdb3..40cea7063b 100644 --- a/app/src/main/java/c/a/m/a/n.java +++ b/app/src/main/java/c/a/m/a/n.java @@ -1,7 +1,8 @@ package c.a.m.a; +import com.discord.api.connectedaccounts.ConnectedAccount; +import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; -import com.discord.models.domain.ModelSession; /* compiled from: lambda */ public final /* synthetic */ class n implements Model.JsonReader.ItemFactory { public final /* synthetic */ Model.JsonReader a; @@ -12,6 +13,6 @@ public final /* synthetic */ class n implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - return (ModelSession) this.a.parse(new ModelSession()); + return (ConnectedAccount) InboundGatewayGsonParser.fromJson(this.a, ConnectedAccount.class); } } diff --git a/app/src/main/java/c/a/m/a/w.java b/app/src/main/java/c/a/m/a/w.java index a170d02922..7e221a5355 100644 --- a/app/src/main/java/c/a/m/a/w.java +++ b/app/src/main/java/c/a/m/a/w.java @@ -1,7 +1,8 @@ package c.a.m.a; +import com.discord.api.user.User; +import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; -import com.discord.models.domain.ModelConnectedAccount; /* compiled from: lambda */ public final /* synthetic */ class w implements Model.JsonReader.ItemFactory { public final /* synthetic */ Model.JsonReader a; @@ -12,6 +13,6 @@ public final /* synthetic */ class w implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - return (ModelConnectedAccount) this.a.parse(new ModelConnectedAccount()); + return (User) InboundGatewayGsonParser.fromJson(this.a, User.class); } } diff --git a/app/src/main/java/c/a/m/a/x.java b/app/src/main/java/c/a/m/a/x.java index 63253d6250..3da3c8b883 100644 --- a/app/src/main/java/c/a/m/a/x.java +++ b/app/src/main/java/c/a/m/a/x.java @@ -1,8 +1,7 @@ package c.a.m.a; -import com.discord.api.user.User; -import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; +import com.discord.models.domain.ModelUserRelationship; /* compiled from: lambda */ public final /* synthetic */ class x implements Model.JsonReader.ItemFactory { public final /* synthetic */ Model.JsonReader a; @@ -13,6 +12,6 @@ public final /* synthetic */ class x implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - return (User) InboundGatewayGsonParser.fromJson(this.a, User.class); + return (ModelUserRelationship) this.a.parse(new ModelUserRelationship()); } } diff --git a/app/src/main/java/c/a/m/a/y.java b/app/src/main/java/c/a/m/a/y.java index 33ca73e491..9e33a634dd 100644 --- a/app/src/main/java/c/a/m/a/y.java +++ b/app/src/main/java/c/a/m/a/y.java @@ -1,7 +1,8 @@ package c.a.m.a; +import com.discord.api.guildjoinrequest.GuildJoinRequest; +import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; -import com.discord.models.domain.ModelUserRelationship; /* compiled from: lambda */ public final /* synthetic */ class y implements Model.JsonReader.ItemFactory { public final /* synthetic */ Model.JsonReader a; @@ -12,6 +13,6 @@ public final /* synthetic */ class y implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - return (ModelUserRelationship) this.a.parse(new ModelUserRelationship()); + return (GuildJoinRequest) InboundGatewayGsonParser.fromJson(this.a, GuildJoinRequest.class); } } diff --git a/app/src/main/java/c/a/m/a/z.java b/app/src/main/java/c/a/m/a/z.java index 0fbfb2df2c..e4d21dba52 100644 --- a/app/src/main/java/c/a/m/a/z.java +++ b/app/src/main/java/c/a/m/a/z.java @@ -1,8 +1,7 @@ package c.a.m.a; -import com.discord.api.guildjoinrequest.GuildJoinRequest; -import com.discord.models.deserialization.gson.InboundGatewayGsonParser; import com.discord.models.domain.Model; +import com.discord.models.experiments.dto.GuildExperimentDto; /* compiled from: lambda */ public final /* synthetic */ class z implements Model.JsonReader.ItemFactory { public final /* synthetic */ Model.JsonReader a; @@ -13,6 +12,6 @@ public final /* synthetic */ class z implements Model.JsonReader.ItemFactory { @Override // com.discord.models.domain.Model.JsonReader.ItemFactory public final Object get() { - return (GuildJoinRequest) InboundGatewayGsonParser.fromJson(this.a, GuildJoinRequest.class); + return GuildExperimentDto.Parser.parse(this.a); } } diff --git a/app/src/main/java/c/a/q/a0.java b/app/src/main/java/c/a/q/a0.java index e6388ad4da..c8a49bc1c4 100644 --- a/app/src/main/java/c/a/q/a0.java +++ b/app/src/main/java/c/a/q/a0.java @@ -24,7 +24,7 @@ public final /* synthetic */ class a0 extends k implements Function1, ? extends RtcConnection.State> pair2 = pair; m.checkNotNullParameter(pair2, "p1"); RtcConnection rtcConnection = (RtcConnection) this.receiver; - if (rtcConnection.f2190a0) { + if (rtcConnection.f2192a0) { Map map = (Map) pair2.component1(); if (m.areEqual((RtcConnection.State) pair2.component2(), RtcConnection.State.f.a)) { rtcConnection.U.i(rtcConnection.k, "local MediaSinkWants: " + map, null); diff --git a/app/src/main/java/c/a/q/b0.java b/app/src/main/java/c/a/q/b0.java index d26d32621d..dfadf296fa 100644 --- a/app/src/main/java/c/a/q/b0.java +++ b/app/src/main/java/c/a/q/b0.java @@ -54,9 +54,9 @@ public final class b0 implements MediaEngineConnection.d { rtcConnection.n = dVar; rtcConnection.o = false; } - if (transportInfo.f2210c.ordinal() != 0) { + if (transportInfo.f2212c.ordinal() != 0) { StringBuilder R = c.d.b.a.a.R("Unsupported protocol: "); - R.append(transportInfo.f2210c); + R.append(transportInfo.f2212c); R.append('.'); RtcConnection.j(rtcConnection, true, R.toString(), null, false, 12); } else { diff --git a/app/src/main/java/c/a/q/h0.java b/app/src/main/java/c/a/q/h0.java index 7a654df259..7db36c9795 100644 --- a/app/src/main/java/c/a/q/h0.java +++ b/app/src/main/java/c/a/q/h0.java @@ -76,7 +76,7 @@ public final class h0 implements a.d { rtcConnection.n = null; rtcConnection.o = false; } - rtcConnection.f2196z = 0; + rtcConnection.f2198z = 0; rtcConnection.C = null; MediaSinkWantsManager mediaSinkWantsManager = rtcConnection.G; if (mediaSinkWantsManager != null) { @@ -261,7 +261,7 @@ public final class h0 implements a.d { r.removeFirst(rtcConnection.u); } if (j > ((long) 500)) { - rtcConnection.f2196z++; + rtcConnection.f2198z++; } double d = (double) j; Objects.requireNonNull(RtcConnection.Quality.Companion); diff --git a/app/src/main/java/c/a/q/j.java b/app/src/main/java/c/a/q/j.java index 0ad8a5e481..ede4db2cd2 100644 --- a/app/src/main/java/c/a/q/j.java +++ b/app/src/main/java/c/a/q/j.java @@ -34,7 +34,7 @@ public final class j extends o implements Function0 { Long l2 = this.$userId; if (l2 == null) { this.this$0.e = null; - } else if (this.this$0.f2188c.contains(l2)) { + } else if (this.this$0.f2190c.contains(l2)) { MediaSinkWantsManager mediaSinkWantsManager2 = this.this$0; Long l3 = this.$userId; mediaSinkWantsManager2.e = l3; diff --git a/app/src/main/java/c/a/q/k0/f.java b/app/src/main/java/c/a/q/k0/f.java index 8167915c6a..647f850983 100644 --- a/app/src/main/java/c/a/q/k0/f.java +++ b/app/src/main/java/c/a/q/k0/f.java @@ -20,7 +20,7 @@ public final class f extends ContentObserver { DiscordAudioManager discordAudioManager = this.a; int streamVolume = discordAudioManager.e.getStreamVolume(3); discordAudioManager.w = streamVolume; - SerializedSubject serializedSubject = discordAudioManager.f2202y; + SerializedSubject serializedSubject = discordAudioManager.f2204y; serializedSubject.j.onNext(Integer.valueOf(streamVolume)); } } diff --git a/app/src/main/java/c/a/q/l.java b/app/src/main/java/c/a/q/l.java index c495d83491..207c0a9685 100644 --- a/app/src/main/java/c/a/q/l.java +++ b/app/src/main/java/c/a/q/l.java @@ -96,10 +96,10 @@ public final class l extends o implements Function0 { } if (arrayList2.isEmpty()) { this.this$0.b.remove(Long.valueOf(this.$userId)); - this.this$0.f2188c.remove(Long.valueOf(this.$userId)); + this.this$0.f2190c.remove(Long.valueOf(this.$userId)); } else { this.this$0.b.put(Long.valueOf(this.$userId), arrayList2); - this.this$0.f2188c.add(Long.valueOf(this.$userId)); + this.this$0.f2190c.add(Long.valueOf(this.$userId)); } this.this$0.d(arrayList2.isEmpty() ? n.emptyList() : d0.t.m.listOf(String.valueOf(this.$userId))); return Unit.a; diff --git a/app/src/main/java/c/a/q/m0/b.java b/app/src/main/java/c/a/q/m0/b.java index bc10b82946..c91ce7d97f 100644 --- a/app/src/main/java/c/a/q/m0/b.java +++ b/app/src/main/java/c/a/q/m0/b.java @@ -216,7 +216,7 @@ public final class b extends ScreenCapturerAndroid { if (thumbnailEmitter != null) { synchronized (thumbnailEmitter) { thumbnailEmitter.d.release(); - thumbnailEmitter.f2213c.release(); + thumbnailEmitter.f2215c.release(); JniCommon.nativeFreeByteBuffer(thumbnailEmitter.b); thumbnailEmitter.a = RecyclerView.FOREVER_NS; } diff --git a/app/src/main/java/c/a/q/m0/c/e.java b/app/src/main/java/c/a/q/m0/c/e.java index dfb2d75895..7dad53c074 100644 --- a/app/src/main/java/c/a/q/m0/c/e.java +++ b/app/src/main/java/c/a/q/m0/c/e.java @@ -288,7 +288,7 @@ public final class e implements MediaEngineConnection { Connection connection2 = connection; d0.z.d.m.checkNotNullParameter(connection2, "$receiver"); connection2.setVADLeadingFramesToBuffer(this.$inputModeOptions.b); - connection2.setVADTrailingFramesToSend(this.$inputModeOptions.f2212c); + connection2.setVADTrailingFramesToSend(this.$inputModeOptions.f2214c); connection2.setVADTriggerThreshold((float) this.$inputModeOptions.a); connection2.setVADAutoThreshold(this.$inputModeOptions.d ? 3 : -1); connection2.setVADUseKrisp(this.$inputModeOptions.e); @@ -473,7 +473,7 @@ public final class e implements MediaEngineConnection { Connection connection2 = connection; d0.z.d.m.checkNotNullParameter(connection2, "$receiver"); MediaEngineConnection.b bVar = this.$quality; - connection2.setEncodingQuality(bVar.a, bVar.b, bVar.f2211c, bVar.d, this.$frameRate); + connection2.setEncodingQuality(bVar.a, bVar.b, bVar.f2213c, bVar.d, this.$frameRate); return Unit.a; } } @@ -610,7 +610,7 @@ public final class e implements MediaEngineConnection { this.d = h0.mutableMapOf(d0.o.to(Long.valueOf(j2), Integer.valueOf(aVar.a))); int i2 = aVar.a; String str = aVar.b; - int i3 = aVar.f2209c; + int i3 = aVar.f2211c; Object[] array = aVar.d.toArray(new StreamParameters[0]); Objects.requireNonNull(array, "null cannot be cast to non-null type kotlin.Array"); Connection connectToServer = discord.connectToServer(i2, j2, str, i3, (StreamParameters[]) array, new d(this)); diff --git a/app/src/main/java/c/a/q/m0/c/k.java b/app/src/main/java/c/a/q/m0/c/k.java index 3ea61000d3..7182ce808d 100644 --- a/app/src/main/java/c/a/q/m0/c/k.java +++ b/app/src/main/java/c/a/q/m0/c/k.java @@ -416,7 +416,7 @@ public final class k implements MediaEngine { discord2.setEchoCancellation(z2, false, new m(kVar2)); } k kVar3 = this.this$0; - boolean z4 = voiceConfig.f2208c; + boolean z4 = voiceConfig.f2210c; Discord discord3 = kVar3.f; if (discord3 != null) { discord3.setNoiseSuppression(z4); diff --git a/app/src/main/java/c/a/q/m0/c/m.java b/app/src/main/java/c/a/q/m0/c/m.java index e1d494b874..aa21de3750 100644 --- a/app/src/main/java/c/a/q/m0/c/m.java +++ b/app/src/main/java/c/a/q/m0/c/m.java @@ -38,7 +38,7 @@ public final class m implements Discord.AecConfigCallback { MediaEngine.EchoCancellationInfo echoCancellationInfo = kVar.i; kVar.i = null; if (echoCancellationInfo != null) { - MediaEngine.EchoCancellationInfo echoCancellationInfo2 = new MediaEngine.EchoCancellationInfo(echoCancellationInfo.a, echoCancellationInfo.b, echoCancellationInfo.f2207c, echoCancellationInfo.d, this.$requestEnable, this.$enabled, this.$requestMobileMode, this.$previouslyEnabled, this.$previouslyMobileMode); + MediaEngine.EchoCancellationInfo echoCancellationInfo2 = new MediaEngine.EchoCancellationInfo(echoCancellationInfo.a, echoCancellationInfo.b, echoCancellationInfo.f2209c, echoCancellationInfo.d, this.$requestEnable, this.$enabled, this.$requestMobileMode, this.$previouslyEnabled, this.$previouslyMobileMode); d.c1("MediaEngineLegacy", "onEchoCancellationUpdated: " + echoCancellationInfo2); this.this$0.a.p.onEchoCancellationUpdated(echoCancellationInfo2); } diff --git a/app/src/main/java/c/a/q/n0/a.java b/app/src/main/java/c/a/q/n0/a.java index 758bbbe71f..d5cee599b7 100644 --- a/app/src/main/java/c/a/q/n0/a.java +++ b/app/src/main/java/c/a/q/n0/a.java @@ -638,7 +638,7 @@ public final class a extends WebSocketListener implements DebugPrintable { aVar.a(1, TimeUnit.MINUTES); SSLSocketFactory sSLSocketFactory = this.E; if (sSLSocketFactory != null) { - h.a aVar2 = f0.e0.k.h.f2845c; + h.a aVar2 = f0.e0.k.h.f2847c; aVar.b(sSLSocketFactory, f0.e0.k.h.a.n()); } String H = c.d.b.a.a.H(new StringBuilder(), this.C, "?v=5"); diff --git a/app/src/main/java/c/a/q/o0/a.java b/app/src/main/java/c/a/q/o0/a.java index 011d03ac06..79f7543257 100644 --- a/app/src/main/java/c/a/q/o0/a.java +++ b/app/src/main/java/c/a/q/o0/a.java @@ -98,13 +98,13 @@ public final /* synthetic */ class a extends k implements Function1 if (booleanValue) { krispOveruseDetector.d.f(KrispOveruseDetector.Status.CPU_OVERUSE); } else if (longValue == 0) { - int i = krispOveruseDetector.f2187c + 1; - krispOveruseDetector.f2187c = i; + int i = krispOveruseDetector.f2189c + 1; + krispOveruseDetector.f2189c = i; if (i > 2) { krispOveruseDetector.d.f(KrispOveruseDetector.Status.FAILED); } } else { - krispOveruseDetector.f2187c = 0; + krispOveruseDetector.f2189c = 0; } } krispOveruseDetector.b = stats2.getOutboundRtpAudio(); diff --git a/app/src/main/java/c/a/q/r.java b/app/src/main/java/c/a/q/r.java index 944c7007e7..2ecc549a1c 100644 --- a/app/src/main/java/c/a/q/r.java +++ b/app/src/main/java/c/a/q/r.java @@ -13,6 +13,6 @@ public final class r extends RtcConnection.b { @Override // com.discord.rtcconnection.RtcConnection.b, com.discord.rtcconnection.RtcConnection.c public void onStateChange(RtcConnection.StateChange stateChange) { m.checkNotNullParameter(stateChange, "stateChange"); - this.i.f2193s.onNext(stateChange); + this.i.f2195s.onNext(stateChange); } } diff --git a/app/src/main/java/c/a/q/s.java b/app/src/main/java/c/a/q/s.java index 4682be22d7..6fb8af9504 100644 --- a/app/src/main/java/c/a/q/s.java +++ b/app/src/main/java/c/a/q/s.java @@ -53,8 +53,8 @@ public final class s extends o implements Function0 { rtcConnection.r("connecting via endpoint: " + replace$default + " token: " + str2); try { URI uri = new URI(w); - rtcConnection.f2194x = uri.getHost(); - rtcConnection.f2195y = Integer.valueOf(uri.getPort()); + rtcConnection.f2196x = uri.getHost(); + rtcConnection.f2197y = Integer.valueOf(uri.getPort()); } catch (Exception e) { rtcConnection.U.e(rtcConnection.k, "Failed to parse RTC endpoint", e, g0.mapOf(d0.o.to("endpoint", replace$default))); } diff --git a/app/src/main/java/c/a/r/b.java b/app/src/main/java/c/a/r/b.java index 01f03be20d..6345556fe4 100644 --- a/app/src/main/java/c/a/r/b.java +++ b/app/src/main/java/c/a/r/b.java @@ -77,7 +77,7 @@ public final class b extends k implements Function2, I ImageRequest imageRequest = this.I; ImageRequest imageRequest2 = this.K; ImageRequest[] imageRequestArr = this.J; - if (imageRequest == null || (uri = imageRequest.f2295c) == null) { + if (imageRequest == null || (uri = imageRequest.f2297c) == null) { if (!(imageRequestArr == null || imageRequestArr.length <= 0 || imageRequestArr[0] == null)) { ImageRequest imageRequest3 = imageRequestArr[0]; - uri = imageRequest3 != null ? imageRequest3.f2295c : null; + uri = imageRequest3 != null ? imageRequest3.f2297c : null; } if (imageRequest2 != null) { - return imageRequest2.f2295c; + return imageRequest2.f2297c; } return null; } diff --git a/app/src/main/java/c/f/g/a/a/d.java b/app/src/main/java/c/f/g/a/a/d.java index d6a1111273..d001e42e33 100644 --- a/app/src/main/java/c/f/g/a/a/d.java +++ b/app/src/main/java/c/f/g/a/a/d.java @@ -85,7 +85,7 @@ public class d extends AbstractDraweeControllerBuilder gVar = new z.g<>(); if (gVar.h(eVar)) { diff --git a/app/src/main/java/c/f/j/c/n.java b/app/src/main/java/c/f/j/c/n.java index ac998e7959..2ef68edd7b 100644 --- a/app/src/main/java/c/f/j/c/n.java +++ b/app/src/main/java/c/f/j/c/n.java @@ -9,11 +9,11 @@ public class n implements i { public static n a; public CacheKey a(ImageRequest imageRequest, Object obj) { - return new b(imageRequest.f2295c.toString(), imageRequest.i, imageRequest.j, imageRequest.h, null, null, obj); + return new b(imageRequest.f2297c.toString(), imageRequest.i, imageRequest.j, imageRequest.h, null, null, obj); } public CacheKey b(ImageRequest imageRequest, Object obj) { - return new f(imageRequest.f2295c.toString()); + return new f(imageRequest.f2297c.toString()); } public CacheKey c(ImageRequest imageRequest, Object obj) { @@ -28,6 +28,6 @@ public class n implements i { cacheKey = null; str = null; } - return new b(imageRequest.f2295c.toString(), imageRequest.i, imageRequest.j, imageRequest.h, cacheKey, str, obj); + return new b(imageRequest.f2297c.toString(), imageRequest.i, imageRequest.j, imageRequest.h, cacheKey, str, obj); } } diff --git a/app/src/main/java/c/f/j/c/v.java b/app/src/main/java/c/f/j/c/v.java index d560e7caab..56cabc8dc7 100644 --- a/app/src/main/java/c/f/j/c/v.java +++ b/app/src/main/java/c/f/j/c/v.java @@ -262,7 +262,7 @@ public class v implements m, w { MemoryCacheParams memoryCacheParams = this.f; int min = Math.min(memoryCacheParams.d, memoryCacheParams.b - e()); MemoryCacheParams memoryCacheParams2 = this.f; - p = p(min, Math.min(memoryCacheParams2.f2288c, memoryCacheParams2.a - f())); + p = p(min, Math.min(memoryCacheParams2.f2290c, memoryCacheParams2.a - f())); h(p); } i(p); diff --git a/app/src/main/java/c/f/j/e/c.java b/app/src/main/java/c/f/j/e/c.java index c37610e865..e87bfacbb3 100644 --- a/app/src/main/java/c/f/j/e/c.java +++ b/app/src/main/java/c/f/j/e/c.java @@ -17,7 +17,7 @@ public class c implements f { public h a(DiskCacheConfig diskCacheConfig) { Objects.requireNonNull(this.a); - e eVar = new e(diskCacheConfig.a, diskCacheConfig.f2276c, diskCacheConfig.b, diskCacheConfig.h); + e eVar = new e(diskCacheConfig.a, diskCacheConfig.f2278c, diskCacheConfig.b, diskCacheConfig.h); ExecutorService newSingleThreadExecutor = Executors.newSingleThreadExecutor(); return new d(eVar, diskCacheConfig.g, new d.c(diskCacheConfig.f, diskCacheConfig.e, diskCacheConfig.d), diskCacheConfig.i, diskCacheConfig.h, diskCacheConfig.j, newSingleThreadExecutor, false); } diff --git a/app/src/main/java/c/f/j/e/h.java b/app/src/main/java/c/f/j/e/h.java index 39b8f51040..2f9352cba3 100644 --- a/app/src/main/java/c/f/j/e/h.java +++ b/app/src/main/java/c/f/j/e/h.java @@ -84,7 +84,7 @@ public class h { ImageRequest.c f = ImageRequest.c.f(imageRequest.m, cVar); String valueOf = String.valueOf(this.i.getAndIncrement()); if (!imageRequest.f) { - if (c.f.d.l.b.e(imageRequest.f2295c)) { + if (c.f.d.l.b.e(imageRequest.f2297c)) { z2 = false; c1 c1Var = new c1(imageRequest, valueOf, str, b0Var, obj, f, false, z2, imageRequest.l, this.l); c.f.j.r.b.b(); diff --git a/app/src/main/java/c/f/j/e/p.java b/app/src/main/java/c/f/j/e/p.java index f038d9ec4e..980ecae196 100644 --- a/app/src/main/java/c/f/j/e/p.java +++ b/app/src/main/java/c/f/j/e/p.java @@ -153,7 +153,7 @@ public class p { try { b.b(); Objects.requireNonNull(imageRequest); - Uri uri = imageRequest.f2295c; + Uri uri = imageRequest.f2297c; d.y(uri, "Uri is null."); int i = imageRequest.d; if (i != 0) { @@ -247,7 +247,7 @@ public class p { } } } - if (this.m && imageRequest.f2296s > 0) { + if (this.m && imageRequest.f2298s > 0) { synchronized (this) { oVar = new o(r0Var, this.b.j.g()); } diff --git a/app/src/main/java/c/f/j/p/a1.java b/app/src/main/java/c/f/j/p/a1.java index 484836698c..8cabfb0176 100644 --- a/app/src/main/java/c/f/j/p/a1.java +++ b/app/src/main/java/c/f/j/p/a1.java @@ -19,7 +19,7 @@ public class a1 extends g0 { @Override // c.f.j.p.g0 public e d(ImageRequest imageRequest) throws IOException { - return c(this.f473c.openInputStream(imageRequest.f2295c), -1); + return c(this.f473c.openInputStream(imageRequest.f2297c), -1); } @Override // c.f.j.p.g0 diff --git a/app/src/main/java/c/f/j/p/d.java b/app/src/main/java/c/f/j/p/d.java index fb8a3caca4..9d6427149c 100644 --- a/app/src/main/java/c/f/j/p/d.java +++ b/app/src/main/java/c/f/j/p/d.java @@ -45,7 +45,7 @@ public class d implements w0 { HashMap hashMap = new HashMap(); this.h = hashMap; hashMap.put(ModelAuditLogEntry.CHANGE_KEY_ID, str); - hashMap.put("uri_source", imageRequest == null ? "null-request" : imageRequest.f2295c); + hashMap.put("uri_source", imageRequest == null ? "null-request" : imageRequest.f2297c); this.d = str2; this.e = y0Var; this.f = obj; diff --git a/app/src/main/java/c/f/j/p/d0.java b/app/src/main/java/c/f/j/p/d0.java index 8d15dae8d0..d45702ad9d 100644 --- a/app/src/main/java/c/f/j/p/d0.java +++ b/app/src/main/java/c/f/j/p/d0.java @@ -25,10 +25,10 @@ public class d0 extends g0 { @Override // c.f.j.p.g0 public e d(ImageRequest imageRequest) throws IOException { int i; - InputStream open = this.f479c.open(imageRequest.f2295c.getPath().substring(1), 2); + InputStream open = this.f479c.open(imageRequest.f2297c.getPath().substring(1), 2); AssetFileDescriptor assetFileDescriptor = null; try { - assetFileDescriptor = this.f479c.openFd(imageRequest.f2295c.getPath().substring(1)); + assetFileDescriptor = this.f479c.openFd(imageRequest.f2297c.getPath().substring(1)); i = (int) assetFileDescriptor.getLength(); } catch (IOException unused) { i = -1; diff --git a/app/src/main/java/c/f/j/p/e0.java b/app/src/main/java/c/f/j/p/e0.java index bd013fb90f..a32dd28038 100644 --- a/app/src/main/java/c/f/j/p/e0.java +++ b/app/src/main/java/c/f/j/p/e0.java @@ -28,7 +28,7 @@ public class e0 extends g0 { @Override // c.f.j.p.g0 public e d(ImageRequest imageRequest) throws IOException { InputStream inputStream; - Uri uri = imageRequest.f2295c; + Uri uri = imageRequest.f2297c; Uri uri2 = b.a; boolean z2 = false; if (uri.getPath() != null && b.c(uri) && "com.android.contacts".equals(uri.getAuthority()) && !uri.getPath().startsWith(b.a.getPath())) { diff --git a/app/src/main/java/c/f/j/p/f0.java b/app/src/main/java/c/f/j/p/f0.java index fa923a65f6..e93c42a0a0 100644 --- a/app/src/main/java/c/f/j/p/f0.java +++ b/app/src/main/java/c/f/j/p/f0.java @@ -42,7 +42,7 @@ public class f0 extends g0 implements j1 { c.f.j.d.e eVar; Cursor query; e f2; - Uri uri = imageRequest.f2295c; + Uri uri = imageRequest.f2297c; if (!b.b(uri) || (eVar = imageRequest.i) == null || (query = this.g.query(uri, f481c, null, null, null)) == null) { return null; } diff --git a/app/src/main/java/c/f/j/p/i0.java b/app/src/main/java/c/f/j/p/i0.java index 6a27cb557b..645a918cc6 100644 --- a/app/src/main/java/c/f/j/p/i0.java +++ b/app/src/main/java/c/f/j/p/i0.java @@ -25,10 +25,10 @@ public class i0 extends g0 { @Override // c.f.j.p.g0 public e d(ImageRequest imageRequest) throws IOException { int i; - InputStream openRawResource = this.f488c.openRawResource(Integer.parseInt(imageRequest.f2295c.getPath().substring(1))); + InputStream openRawResource = this.f488c.openRawResource(Integer.parseInt(imageRequest.f2297c.getPath().substring(1))); AssetFileDescriptor assetFileDescriptor = null; try { - assetFileDescriptor = this.f488c.openRawResourceFd(Integer.parseInt(imageRequest.f2295c.getPath().substring(1))); + assetFileDescriptor = this.f488c.openRawResourceFd(Integer.parseInt(imageRequest.f2297c.getPath().substring(1))); i = (int) assetFileDescriptor.getLength(); } catch (Resources.NotFoundException unused) { i = -1; diff --git a/app/src/main/java/c/f/j/p/j0.java b/app/src/main/java/c/f/j/p/j0.java index 5b63b16534..8e2a59000b 100644 --- a/app/src/main/java/c/f/j/p/j0.java +++ b/app/src/main/java/c/f/j/p/j0.java @@ -83,7 +83,7 @@ public class j0 implements v0> { bitmap = ThumbnailUtils.createVideoThumbnail(str, i); } else { try { - ParcelFileDescriptor openFileDescriptor = j0.this.b.openFileDescriptor(this.p.f2295c, "r"); + ParcelFileDescriptor openFileDescriptor = j0.this.b.openFileDescriptor(this.p.f2297c, "r"); MediaMetadataRetriever mediaMetadataRetriever = new MediaMetadataRetriever(); mediaMetadataRetriever.setDataSource(openFileDescriptor.getFileDescriptor()); bitmap = mediaMetadataRetriever.getFrameAtTime(-1); @@ -141,7 +141,7 @@ public class j0 implements v0> { String str; Uri uri; Objects.requireNonNull(j0Var); - Uri uri2 = imageRequest.f2295c; + Uri uri2 = imageRequest.f2297c; if (c.f.d.l.b.d(uri2)) { return imageRequest.a().getPath(); } diff --git a/app/src/main/java/c/f/j/p/m.java b/app/src/main/java/c/f/j/p/m.java index d22e0066ea..305d0345d9 100644 --- a/app/src/main/java/c/f/j/p/m.java +++ b/app/src/main/java/c/f/j/p/m.java @@ -18,7 +18,7 @@ public class m extends g0 { @Override // c.f.j.p.g0 public e d(ImageRequest imageRequest) throws IOException { boolean z2; - String uri = imageRequest.f2295c.toString(); + String uri = imageRequest.f2297c.toString(); d.i(Boolean.valueOf(uri.substring(0, 5).equals("data:"))); int indexOf = uri.indexOf(44); String substring = uri.substring(indexOf + 1, uri.length()); diff --git a/app/src/main/java/c/f/j/p/n.java b/app/src/main/java/c/f/j/p/n.java index 9754b74ab4..b79be07b95 100644 --- a/app/src/main/java/c/f/j/p/n.java +++ b/app/src/main/java/c/f/j/p/n.java @@ -141,7 +141,7 @@ public class n implements v0> { w0Var.d("image_format", eVar.k.b); if (n.this.f || !b.m(i2, 16)) { ImageRequest e2 = this.a.e(); - if (n.this.g || !c.f.d.l.b.e(e2.f2295c)) { + if (n.this.g || !c.f.d.l.b.e(e2.f2297c)) { eVar.p = c.c.a.a0.d.Z(e2.j, e2.i, eVar, this.b); } } @@ -179,7 +179,7 @@ public class n implements v0> { synchronized (c0Var) { j = c0Var.j - c0Var.i; } - String valueOf2 = String.valueOf(cVar2.f497c.e().f2295c); + String valueOf2 = String.valueOf(cVar2.f497c.e().f2297c); int f = (z3 || m) ? eVar.f() : cVar2.o(eVar); i p = (z3 || m) ? h.a : cVar2.p(); cVar2.d.e(cVar2.f497c, "DecodeProducer"); @@ -439,7 +439,7 @@ public class n implements v0> { public void b(l> lVar, w0 w0Var) { try { c.f.j.r.b.b(); - this.e.b(!c.f.d.l.b.e(w0Var.e().f2295c) ? new a(this, lVar, w0Var, this.h, this.i) : new b(this, lVar, w0Var, new d(this.a), this.d, this.h, this.i), w0Var); + this.e.b(!c.f.d.l.b.e(w0Var.e().f2297c) ? new a(this, lVar, w0Var, this.h, this.i) : new b(this, lVar, w0Var, new d(this.a), this.d, this.h, this.i), w0Var); c.f.j.r.b.b(); } catch (Throwable th) { c.f.j.r.b.b(); diff --git a/app/src/main/java/c/f/j/p/o.java b/app/src/main/java/c/f/j/p/o.java index 73e457763c..1a87c579b9 100644 --- a/app/src/main/java/c/f/j/p/o.java +++ b/app/src/main/java/c/f/j/p/o.java @@ -36,7 +36,7 @@ public class o implements v0> { ImageRequest e = w0Var.e(); ScheduledExecutorService scheduledExecutorService = this.b; if (scheduledExecutorService != null) { - scheduledExecutorService.schedule(new a(lVar, w0Var), (long) e.f2296s, TimeUnit.MILLISECONDS); + scheduledExecutorService.schedule(new a(lVar, w0Var), (long) e.f2298s, TimeUnit.MILLISECONDS); } else { this.a.b(lVar, w0Var); } diff --git a/app/src/main/java/c/f/j/p/o0.java b/app/src/main/java/c/f/j/p/o0.java index 5dcc1e7f5c..dc63c86df5 100644 --- a/app/src/main/java/c/f/j/p/o0.java +++ b/app/src/main/java/c/f/j/p/o0.java @@ -64,7 +64,7 @@ public class o0 implements c { this.f499c.b(eVar2, 9); } else { this.f499c.b(eVar2, 8); - ImageRequestBuilder b = ImageRequestBuilder.b(e.f2295c); + ImageRequestBuilder b = ImageRequestBuilder.b(e.f2297c); b.e = e.h; b.o = e.k; b.f = e.b; @@ -73,11 +73,11 @@ public class o0 implements c { b.j = e.q; b.g = e.f; b.i = e.l; - b.f2297c = e.i; + b.f2299c = e.i; b.n = e.r; b.d = e.j; b.m = e.p; - b.p = e.f2296s; + b.p = e.f2298s; int i = f2 - 1; if (i >= 0) { z3 = true; diff --git a/app/src/main/java/c/f/j/p/q0.java b/app/src/main/java/c/f/j/p/q0.java index 9d9f4b1c1f..b128c9185c 100644 --- a/app/src/main/java/c/f/j/p/q0.java +++ b/app/src/main/java/c/f/j/p/q0.java @@ -185,7 +185,7 @@ public class q0 implements v0 { return; } w0Var.o().e(w0Var, "PartialDiskCacheProducer"); - Uri build = e.f2295c.buildUpon().appendQueryParameter("fresco_partial", "true").build(); + Uri build = e.f2297c.buildUpon().appendQueryParameter("fresco_partial", "true").build(); i iVar = this.b; w0Var.b(); Objects.requireNonNull((n) iVar); diff --git a/app/src/main/java/c/f/j/p/y.java b/app/src/main/java/c/f/j/p/y.java index b717420964..9d96dfecfc 100644 --- a/app/src/main/java/c/f/j/p/y.java +++ b/app/src/main/java/c/f/j/p/y.java @@ -34,7 +34,7 @@ public class y implements Runnable { Objects.requireNonNull(a0Var); InputStream inputStream = null; try { - httpURLConnection = a0Var.a(aVar.b.e().f2295c, 5); + httpURLConnection = a0Var.a(aVar.b.e().f2297c, 5); try { aVar.e = a0Var.f472c.now(); if (httpURLConnection != null) { diff --git a/app/src/main/java/c/f/m/j.java b/app/src/main/java/c/f/m/j.java index 367d401573..02cc4c8083 100644 --- a/app/src/main/java/c/f/m/j.java +++ b/app/src/main/java/c/f/m/j.java @@ -12,7 +12,7 @@ public class j implements b { boolean z2; boolean contains; int i2 = ((i & 1) != 0 ? 16 : 0) | 0; - ReentrantReadWriteLock reentrantReadWriteLock = SoLoader.f2299c; + ReentrantReadWriteLock reentrantReadWriteLock = SoLoader.f2301c; reentrantReadWriteLock.readLock().lock(); try { if (SoLoader.d == null) { @@ -49,7 +49,7 @@ public class j implements b { continue; } catch (UnsatisfiedLinkError e) { int i3 = SoLoader.e; - SoLoader.f2299c.writeLock().lock(); + SoLoader.f2301c.writeLock().lock(); try { if (SoLoader.g == null || !SoLoader.g.c()) { z2 = false; @@ -58,21 +58,21 @@ public class j implements b { SoLoader.e = SoLoader.e + 1; z2 = true; } - SoLoader.f2299c.writeLock().unlock(); + SoLoader.f2301c.writeLock().unlock(); if (SoLoader.e == i3) { throw e; } } catch (IOException e2) { throw new RuntimeException(e2); } catch (Throwable th2) { - SoLoader.f2299c.writeLock().unlock(); + SoLoader.f2301c.writeLock().unlock(); throw th2; } } } while (z2); return z5; } finally { - SoLoader.f2299c.readLock().unlock(); + SoLoader.f2301c.readLock().unlock(); } } } diff --git a/app/src/main/java/c/i/a/c/a3/f0.java b/app/src/main/java/c/i/a/c/a3/f0.java index cae1ccfa7e..7977f0f7f3 100644 --- a/app/src/main/java/c/i/a/c/a3/f0.java +++ b/app/src/main/java/c/i/a/c/a3/f0.java @@ -92,8 +92,8 @@ public final class f0 extends l implements e0.b { if (dVar != null) { dVar.a(true); } - loader.f2364c.execute(new Loader.g(e0Var)); - loader.f2364c.shutdown(); + loader.f2366c.execute(new Loader.g(e0Var)); + loader.f2366c.shutdown(); e0Var.f653z.removeCallbacksAndMessages(null); e0Var.A = null; e0Var.V = true; diff --git a/app/src/main/java/c/i/a/c/t2/b0.java b/app/src/main/java/c/i/a/c/t2/b0.java index 3b532ee9d8..a0ed211ac9 100644 --- a/app/src/main/java/c/i/a/c/t2/b0.java +++ b/app/src/main/java/c/i/a/c/t2/b0.java @@ -84,7 +84,7 @@ public final class b0 extends v { public AudioProcessor.a f(AudioProcessor.a aVar) throws AudioProcessor.UnhandledAudioFormatException { int i = aVar.d; if (i == 3 || i == 2 || i == 268435456 || i == 536870912 || i == 805306368 || i == 4) { - return i != 2 ? new AudioProcessor.a(aVar.b, aVar.f2306c, 2) : AudioProcessor.a.a; + return i != 2 ? new AudioProcessor.a(aVar.b, aVar.f2308c, 2) : AudioProcessor.a.a; } throw new AudioProcessor.UnhandledAudioFormatException(aVar); } diff --git a/app/src/main/java/c/i/a/c/t2/e0.java b/app/src/main/java/c/i/a/c/t2/e0.java index 670800151b..07774cd7fe 100644 --- a/app/src/main/java/c/i/a/c/t2/e0.java +++ b/app/src/main/java/c/i/a/c/t2/e0.java @@ -79,7 +79,7 @@ public final class e0 implements AudioProcessor { i = aVar.b; } this.e = aVar; - AudioProcessor.a aVar2 = new AudioProcessor.a(i, aVar.f2306c, 2); + AudioProcessor.a aVar2 = new AudioProcessor.a(i, aVar.f2308c, 2); this.f = aVar2; this.i = true; return aVar2; @@ -128,7 +128,7 @@ public final class e0 implements AudioProcessor { AudioProcessor.a aVar2 = this.f; this.h = aVar2; if (this.i) { - this.j = new d0(aVar.b, aVar.f2306c, this.f889c, this.d, aVar2.b); + this.j = new d0(aVar.b, aVar.f2308c, this.f889c, this.d, aVar2.b); } else { d0 d0Var = this.j; if (d0Var != null) { diff --git a/app/src/main/java/c/i/a/c/t2/w.java b/app/src/main/java/c/i/a/c/t2/w.java index 07a15f8f40..73b4c8b81e 100644 --- a/app/src/main/java/c/i/a/c/t2/w.java +++ b/app/src/main/java/c/i/a/c/t2/w.java @@ -35,11 +35,11 @@ public final class w extends v { return AudioProcessor.a.a; } if (aVar.d == 2) { - boolean z2 = aVar.f2306c != iArr.length; + boolean z2 = aVar.f2308c != iArr.length; int i = 0; while (i < iArr.length) { int i2 = iArr[i]; - if (i2 < aVar.f2306c) { + if (i2 < aVar.f2308c) { z2 |= i2 != i; i++; } else { diff --git a/app/src/main/java/c/i/a/c/t2/y.java b/app/src/main/java/c/i/a/c/t2/y.java index cd747722c0..22d014143b 100644 --- a/app/src/main/java/c/i/a/c/t2/y.java +++ b/app/src/main/java/c/i/a/c/t2/y.java @@ -45,7 +45,7 @@ public final class y extends v { public AudioProcessor.a f(AudioProcessor.a aVar) throws AudioProcessor.UnhandledAudioFormatException { int i2 = aVar.d; if (e0.y(i2)) { - return i2 != 4 ? new AudioProcessor.a(aVar.b, aVar.f2306c, 4) : AudioProcessor.a.a; + return i2 != 4 ? new AudioProcessor.a(aVar.b, aVar.f2308c, 4) : AudioProcessor.a.a; } throw new AudioProcessor.UnhandledAudioFormatException(aVar); } diff --git a/app/src/main/java/c/i/a/c/w2/d.java b/app/src/main/java/c/i/a/c/w2/d.java index 806da575aa..b8c6a7f53f 100644 --- a/app/src/main/java/c/i/a/c/w2/d.java +++ b/app/src/main/java/c/i/a/c/w2/d.java @@ -14,7 +14,7 @@ public final /* synthetic */ class d implements Runnable { public final void run() { DefaultDrmSessionManager.d dVar = this.i; if (!dVar.d) { - DrmSession drmSession = dVar.f2322c; + DrmSession drmSession = dVar.f2324c; if (drmSession != null) { drmSession.b(dVar.b); } diff --git a/app/src/main/java/c/i/a/c/w2/e.java b/app/src/main/java/c/i/a/c/w2/e.java index 365ddad00e..37d809af54 100644 --- a/app/src/main/java/c/i/a/c/w2/e.java +++ b/app/src/main/java/c/i/a/c/w2/e.java @@ -22,7 +22,7 @@ public final /* synthetic */ class e implements Runnable { if (defaultDrmSessionManager.p != 0 && !dVar.d) { Looper looper = defaultDrmSessionManager.t; Objects.requireNonNull(looper); - dVar.f2322c = defaultDrmSessionManager.e(looper, dVar.b, j1Var, false); + dVar.f2324c = defaultDrmSessionManager.e(looper, dVar.b, j1Var, false); DefaultDrmSessionManager.this.n.add(dVar); } } diff --git a/app/src/main/java/c/i/a/c/w2/o.java b/app/src/main/java/c/i/a/c/w2/o.java index 843c883f1f..dc18f5c944 100644 --- a/app/src/main/java/c/i/a/c/w2/o.java +++ b/app/src/main/java/c/i/a/c/w2/o.java @@ -19,7 +19,7 @@ public final /* synthetic */ class o implements MediaDrm.OnEventListener { c0 c0Var = this.a; a0.b bVar = this.b; Objects.requireNonNull(c0Var); - DefaultDrmSessionManager.c cVar = DefaultDrmSessionManager.this.f2321x; + DefaultDrmSessionManager.c cVar = DefaultDrmSessionManager.this.f2323x; Objects.requireNonNull(cVar); cVar.obtainMessage(i, bArr).sendToTarget(); } diff --git a/app/src/main/java/c/i/a/f/c/a/f/a.java b/app/src/main/java/c/i/a/f/c/a/f/a.java index e7df650aa9..4af7b8ef73 100644 --- a/app/src/main/java/c/i/a/f/c/a/f/a.java +++ b/app/src/main/java/c/i/a/f/c/a/f/a.java @@ -17,7 +17,7 @@ public class a extends b { public final synchronized int f() { if (j == 1) { Context context = this.a; - Object obj = GoogleApiAvailability.f2382c; + Object obj = GoogleApiAvailability.f2384c; GoogleApiAvailability googleApiAvailability = GoogleApiAvailability.d; int b = googleApiAvailability.b(context, 12451000); if (b == 0) { diff --git a/app/src/main/java/c/i/a/f/c/a/f/b/a.java b/app/src/main/java/c/i/a/f/c/a/f/b/a.java index 5132d3a536..14bbb8e484 100644 --- a/app/src/main/java/c/i/a/f/c/a/f/b/a.java +++ b/app/src/main/java/c/i/a/f/c/a/f/b/a.java @@ -109,7 +109,7 @@ public class a { if (str5 != null) { jSONObject.put("displayName", str5); } - String str6 = googleSignInAccount.f2377s; + String str6 = googleSignInAccount.f2379s; if (str6 != null) { jSONObject.put("givenName", str6); } @@ -157,7 +157,7 @@ public class a { } jSONObject2.put("idTokenRequested", googleSignInOptions.r); jSONObject2.put("forceCodeForRefreshToken", googleSignInOptions.t); - jSONObject2.put("serverAuthRequested", googleSignInOptions.f2378s); + jSONObject2.put("serverAuthRequested", googleSignInOptions.f2380s); if (!TextUtils.isEmpty(googleSignInOptions.u)) { jSONObject2.put("serverClientId", googleSignInOptions.u); } diff --git a/app/src/main/java/c/i/a/f/e/h/j/a1.java b/app/src/main/java/c/i/a/f/e/h/j/a1.java index f938ef83b3..fbc84cca20 100644 --- a/app/src/main/java/c/i/a/f/e/h/j/a1.java +++ b/app/src/main/java/c/i/a/f/e/h/j/a1.java @@ -16,7 +16,7 @@ public class a1 extends t0 { /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public a1(j jVar, g gVar) { super(jVar, GoogleApiAvailability.d); - Object obj = GoogleApiAvailability.f2382c; + Object obj = GoogleApiAvailability.f2384c; this.o = gVar; jVar.a("ConnectionlessLifecycleHelper", this); } diff --git a/app/src/main/java/c/i/a/f/e/h/j/b0.java b/app/src/main/java/c/i/a/f/e/h/j/b0.java index 9a0fa79ee0..ea447f676d 100644 --- a/app/src/main/java/c/i/a/f/e/h/j/b0.java +++ b/app/src/main/java/c/i/a/f/e/h/j/b0.java @@ -16,7 +16,7 @@ public class b0 extends t0 { /* JADX INFO: super call moved to the top of the method (can break code semantics) */ public b0(j jVar) { super(jVar, GoogleApiAvailability.d); - Object obj = GoogleApiAvailability.f2382c; + Object obj = GoogleApiAvailability.f2384c; jVar.a("GmsAvailabilityHelper", this); } diff --git a/app/src/main/java/c/i/a/f/e/h/j/g.java b/app/src/main/java/c/i/a/f/e/h/j/g.java index 5ded42d2aa..e8ab2ef132 100644 --- a/app/src/main/java/c/i/a/f/e/h/j/g.java +++ b/app/src/main/java/c/i/a/f/e/h/j/g.java @@ -654,7 +654,7 @@ public class g implements Handler.Callback { handlerThread.start(); Looper looper = handlerThread.getLooper(); Context applicationContext = context.getApplicationContext(); - Object obj = GoogleApiAvailability.f2382c; + Object obj = GoogleApiAvailability.f2384c; l = new g(applicationContext, looper, GoogleApiAvailability.d); } gVar = l; diff --git a/app/src/main/java/c/i/a/f/e/k/d.java b/app/src/main/java/c/i/a/f/e/k/d.java index c16c5afdec..4c9e6f7fb8 100644 --- a/app/src/main/java/c/i/a/f/e/k/d.java +++ b/app/src/main/java/c/i/a/f/e/k/d.java @@ -31,7 +31,7 @@ public abstract class d extends b implements a.f { public d(Context context, Looper looper, int i, c cVar, f fVar, l lVar) { super(context, looper, r3, r4, i, new r(fVar), new q(lVar), cVar.f); e a = e.a(context); - Object obj = GoogleApiAvailability.f2382c; + Object obj = GoogleApiAvailability.f2384c; GoogleApiAvailability googleApiAvailability = GoogleApiAvailability.d; Objects.requireNonNull(fVar, "null reference"); Objects.requireNonNull(lVar, "null reference"); diff --git a/app/src/main/java/c/i/a/f/e/o/f.java b/app/src/main/java/c/i/a/f/e/o/f.java index 66e29eb76e..82ae75dc37 100644 --- a/app/src/main/java/c/i/a/f/e/o/f.java +++ b/app/src/main/java/c/i/a/f/e/o/f.java @@ -1763,7 +1763,7 @@ public final class f { } public static final void c(f0.e0.f.a aVar, f0.e0.f.c cVar, String str) { - d.b bVar = f0.e0.f.d.f2815c; + d.b bVar = f0.e0.f.d.f2817c; Logger logger = f0.e0.f.d.b; StringBuilder sb = new StringBuilder(); sb.append(cVar.f); @@ -1772,7 +1772,7 @@ public final class f { m.checkExpressionValueIsNotNull(format, "java.lang.String.format(format, *args)"); sb.append(format); sb.append(": "); - sb.append(aVar.f2813c); + sb.append(aVar.f2815c); logger.fine(sb.toString()); } diff --git a/app/src/main/java/c/i/a/f/g/b.java b/app/src/main/java/c/i/a/f/g/b.java index 04cfa2fe06..cd8d65010d 100644 --- a/app/src/main/java/c/i/a/f/g/b.java +++ b/app/src/main/java/c/i/a/f/g/b.java @@ -10,12 +10,12 @@ public final class b implements DynamiteModule.a { int b = bVar.b(context, str); aVar.a = b; if (b != 0) { - aVar.f2386c = -1; + aVar.f2388c = -1; } else { int a = bVar.a(context, str, true); aVar.b = a; if (a != 0) { - aVar.f2386c = 1; + aVar.f2388c = 1; } } return aVar; diff --git a/app/src/main/java/c/i/a/f/g/c.java b/app/src/main/java/c/i/a/f/g/c.java index d627c71c3a..0032b088fe 100644 --- a/app/src/main/java/c/i/a/f/g/c.java +++ b/app/src/main/java/c/i/a/f/g/c.java @@ -16,11 +16,11 @@ public final class c implements DynamiteModule.a { } int i = aVar.a; if (i == 0 && aVar.b == 0) { - aVar.f2386c = 0; + aVar.f2388c = 0; } else if (i >= aVar.b) { - aVar.f2386c = -1; + aVar.f2388c = -1; } else { - aVar.f2386c = 1; + aVar.f2388c = 1; } return aVar; } diff --git a/app/src/main/java/c/i/a/f/g/d.java b/app/src/main/java/c/i/a/f/g/d.java index d4ea1c671f..4e4adf9959 100644 --- a/app/src/main/java/c/i/a/f/g/d.java +++ b/app/src/main/java/c/i/a/f/g/d.java @@ -12,11 +12,11 @@ public final class d implements DynamiteModule.a { aVar.b = a; int i = aVar.a; if (i == 0 && a == 0) { - aVar.f2386c = 0; + aVar.f2388c = 0; } else if (a >= i) { - aVar.f2386c = 1; + aVar.f2388c = 1; } else { - aVar.f2386c = -1; + aVar.f2388c = -1; } return aVar; } diff --git a/app/src/main/java/c/i/a/f/h/l/g4.java b/app/src/main/java/c/i/a/f/h/l/g4.java index d8ce6282ca..7e56be5221 100644 --- a/app/src/main/java/c/i/a/f/h/l/g4.java +++ b/app/src/main/java/c/i/a/f/h/l/g4.java @@ -11,7 +11,7 @@ public final class g4 implements v7 { public g4(zzhi zzhi) { Charset charset = w4.a; this.a = zzhi; - zzhi.f2387c = this; + zzhi.f2389c = this; } public final void a(int i, double d) throws IOException { @@ -41,7 +41,7 @@ public final class g4 implements v7 { public final void e(int i, Object obj, q6 q6Var) throws IOException { zzhi zzhi = this.a; zzhi.f(i, 3); - q6Var.g((c6) obj, zzhi.f2387c); + q6Var.g((c6) obj, zzhi.f2389c); zzhi.f(i, 4); } diff --git a/app/src/main/java/c/i/a/f/h/l/u4.java b/app/src/main/java/c/i/a/f/h/l/u4.java index 3f7bac0c3a..2ba04ecb84 100644 --- a/app/src/main/java/c/i/a/f/h/l/u4.java +++ b/app/src/main/java/c/i/a/f/h/l/u4.java @@ -270,7 +270,7 @@ public abstract class u4, Build @Override // c.i.a.f.h.l.c6 public final void i(zzhi zzhi) throws IOException { q6 b2 = n6.a.b(this); - g4 g4Var = zzhi.f2387c; + g4 g4Var = zzhi.f2389c; if (g4Var == null) { g4Var = new g4(zzhi); } diff --git a/app/src/main/java/c/i/a/f/i/b/g.java b/app/src/main/java/c/i/a/f/i/b/g.java index 73386e4a70..f2ffb99f0c 100644 --- a/app/src/main/java/c/i/a/f/i/b/g.java +++ b/app/src/main/java/c/i/a/f/i/b/g.java @@ -696,7 +696,7 @@ public final class g extends i9 { contentValues.put("triggered_timestamp", Long.valueOf(zzz.k.k)); contentValues.put("time_to_live", Long.valueOf(zzz.r)); e(); - contentValues.put("expired_event", t9.g0(zzz.f2393s)); + contentValues.put("expired_event", t9.g0(zzz.f2395s)); try { if (t().insertWithOnConflict("conditional_properties", null, contentValues, 5) == -1) { g().f.b("Failed to insert/update conditional user property (got -1)", q3.s(zzz.i)); diff --git a/app/src/main/java/c/i/a/f/i/b/k9.java b/app/src/main/java/c/i/a/f/i/b/k9.java index da94017dc1..35caf34958 100644 --- a/app/src/main/java/c/i/a/f/i/b/k9.java +++ b/app/src/main/java/c/i/a/f/i/b/k9.java @@ -355,7 +355,7 @@ public class k9 implements t5 { T = K().T(zzn.i); if (T != null) { this.k.t(); - if (t9.d0(zzn.j, T.v(), zzn.f2392z, T.y())) { + if (t9.d0(zzn.j, T.v(), zzn.f2394z, T.y())) { this.k.g().i.b("New GMP App Id passed in. Removing cached database data. appId", q3.s(T.o())); g K = K(); String o = T.o(); @@ -404,7 +404,7 @@ public class k9 implements t5 { str2 = "_et"; j2 = 1; } - if (zzn.f2391y) { + if (zzn.f2393y) { bundle2.putLong("_dac", j2); } g K2 = K(); @@ -482,7 +482,7 @@ public class k9 implements t5 { } else { j = 1; } - if (zzn.f2391y) { + if (zzn.f2393y) { bundle3.putLong("_dac", j); } B(new zzaq("_v", new zzap(bundle3), "auto", j4), zzn); @@ -559,7 +559,7 @@ public class k9 implements t5 { if (Z.m) { K().V(zzz.i, zzz.k.j); } - zzaq zzaq = zzz.f2393s; + zzaq zzaq = zzz.f2395s; if (zzaq != null) { Bundle bundle = null; zzap zzap = zzaq.j; @@ -568,7 +568,7 @@ public class k9 implements t5 { } t9 t = this.k.t(); String str = zzz.i; - zzaq zzaq2 = zzz.f2393s; + zzaq zzaq2 = zzz.f2395s; I(t.B(str, zzaq2.i, bundle, Z.j, zzaq2.l, true, x7.b() && this.k.h.o(p.M0)), zzn); } } else { @@ -634,16 +634,16 @@ public class k9 implements t5 { T.m(zzn.j); z2 = true; } - if (!TextUtils.equals(zzn.f2392z, T.y())) { - T.q(zzn.f2392z); + if (!TextUtils.equals(zzn.f2394z, T.y())) { + T.q(zzn.f2394z); z2 = true; } if (da.b() && this.k.h.u(T.o(), p.f1229j0) && !TextUtils.equals(zzn.D, T.B())) { T.u(zzn.D); z2 = true; } - if (!TextUtils.isEmpty(zzn.f2389s) && !zzn.f2389s.equals(T.H())) { - T.A(zzn.f2389s); + if (!TextUtils.isEmpty(zzn.f2391s) && !zzn.f2391s.equals(T.H())) { + T.A(zzn.f2391s); z2 = true; } long j2 = zzn.m; @@ -688,8 +688,8 @@ public class k9 implements t5 { T.n(zzn.w); z2 = true; } - if (zzn.f2390x != T.i()) { - T.r(zzn.f2390x); + if (zzn.f2392x != T.i()) { + T.r(zzn.f2392x); z2 = true; } if (zzn.A != T.j()) { @@ -712,11 +712,11 @@ public class k9 implements t5 { z2 = true; if (!TextUtils.equals(zzn.j, T.v())) { } - if (!TextUtils.equals(zzn.f2392z, T.y())) { + if (!TextUtils.equals(zzn.f2394z, T.y())) { } T.u(zzn.D); z2 = true; - T.A(zzn.f2389s); + T.A(zzn.f2391s); z2 = true; long j2 = zzn.m; T.t(zzn.m); @@ -738,7 +738,7 @@ public class k9 implements t5 { z2 = true; if (zzn.w != T.h()) { } - if (zzn.f2390x != T.i()) { + if (zzn.f2392x != T.i()) { } if (zzn.A != T.j()) { } @@ -774,12 +774,12 @@ public class k9 implements t5 { T.c(c(h)); } T.m(zzn.j); - T.q(zzn.f2392z); + T.q(zzn.f2394z); if (da.b() && this.k.h.u(T.o(), p.f1229j0)) { T.u(zzn.D); } - if (!TextUtils.isEmpty(zzn.f2389s)) { - T.A(zzn.f2389s); + if (!TextUtils.isEmpty(zzn.f2391s)) { + T.A(zzn.f2391s); } long j3 = zzn.m; if (j3 != 0) { @@ -802,7 +802,7 @@ public class k9 implements t5 { T.R(zzn.t); } T.n(zzn.w); - T.r(zzn.f2390x); + T.r(zzn.f2392x); T.b(zzn.A); T.z(zzn.B); T.a.f().b(); @@ -1055,11 +1055,11 @@ public class k9 implements t5 { if (TextUtils.isEmpty(u0.s0()) && !TextUtils.isEmpty(zzn.D)) { u0.u0(zzn.D); } - if (TextUtils.isEmpty(u0.s0()) && TextUtils.isEmpty(u0.x0()) && !TextUtils.isEmpty(zzn.f2392z)) { - u0.r0(zzn.f2392z); + if (TextUtils.isEmpty(u0.s0()) && TextUtils.isEmpty(u0.x0()) && !TextUtils.isEmpty(zzn.f2394z)) { + u0.r0(zzn.f2394z); } - } else if (TextUtils.isEmpty(u0.s0()) && !TextUtils.isEmpty(zzn.f2392z)) { - u0.r0(zzn.f2392z); + } else if (TextUtils.isEmpty(u0.s0()) && !TextUtils.isEmpty(zzn.f2394z)) { + u0.r0(zzn.f2394z); } long j4 = zzn.n; if (j4 != 0) { @@ -1081,7 +1081,7 @@ public class k9 implements t5 { u0.y(((Boolean) obj2).booleanValue()); } } - } else if (!this.k.y().s(this.k.j()) && zzn.f2390x && (!hb.b() || !this.k.a().v(zzn.i, p.G0))) { + } else if (!this.k.y().s(this.k.j()) && zzn.f2392x && (!hb.b() || !this.k.a().v(zzn.i, p.G0))) { String string = Settings.Secure.getString(this.k.j().getContentResolver(), "android_id"); if (string == null) { this.k.g().A().b("null secure ID. appId", q3.s(u0.k0())); @@ -1120,7 +1120,7 @@ public class k9 implements t5 { } else { T2.c(c(h)); } - T2.A(zzn.f2389s); + T2.A(zzn.f2391s); T2.m(zzn.j); if (!t8.b() || !this.k.a().o(p.J0) || h.j()) { T2.x(this.j.t(zzn.i)); @@ -1200,7 +1200,7 @@ public class k9 implements t5 { } public final boolean L(zzn zzn) { - return (!da.b() || !this.k.h.u(zzn.i, p.f1229j0)) ? !TextUtils.isEmpty(zzn.j) || !TextUtils.isEmpty(zzn.f2392z) : !TextUtils.isEmpty(zzn.j) || !TextUtils.isEmpty(zzn.D) || !TextUtils.isEmpty(zzn.f2392z); + return (!da.b() || !this.k.h.u(zzn.i, p.f1229j0)) ? !TextUtils.isEmpty(zzn.j) || !TextUtils.isEmpty(zzn.f2394z) : !TextUtils.isEmpty(zzn.j) || !TextUtils.isEmpty(zzn.D) || !TextUtils.isEmpty(zzn.f2394z); } public final ba M() { @@ -1753,7 +1753,7 @@ public class k9 implements t5 { if (zzz2 != null) { this.k.g().n.d("User property expired", zzz2.i, this.k.u().y(zzz2.k.j), zzz2.k.w0()); K().V(str, zzz2.k.j); - zzaq zzaq4 = zzz2.f2393s; + zzaq zzaq4 = zzz2.f2395s; if (zzaq4 != null) { arrayList.add(zzaq4); } diff --git a/app/src/main/java/c/i/a/f/i/b/q9.java b/app/src/main/java/c/i/a/f/i/b/q9.java index 4ac3950ec4..5c70f7c903 100644 --- a/app/src/main/java/c/i/a/f/i/b/q9.java +++ b/app/src/main/java/c/i/a/f/i/b/q9.java @@ -282,7 +282,7 @@ public final class q9 extends i9 { @WorkerThread public static boolean O(zzaq zzaq, zzn zzn) { Objects.requireNonNull(zzaq, "null reference"); - return !TextUtils.isEmpty(zzn.j) || !TextUtils.isEmpty(zzn.f2392z); + return !TextUtils.isEmpty(zzn.j) || !TextUtils.isEmpty(zzn.f2394z); } public static boolean P(String str) { diff --git a/app/src/main/java/c/i/a/f/i/b/t9.java b/app/src/main/java/c/i/a/f/i/b/t9.java index 108b5fcd6a..9eb801c721 100644 --- a/app/src/main/java/c/i/a/f/i/b/t9.java +++ b/app/src/main/java/c/i/a/f/i/b/t9.java @@ -212,10 +212,10 @@ public final class t9 extends r5 { } bundle.putLong("triggered_timestamp", zzz.k.k); bundle.putLong("time_to_live", zzz.r); - zzaq zzaq3 = zzz.f2393s; + zzaq zzaq3 = zzz.f2395s; if (zzaq3 != null) { bundle.putString("expired_event_name", zzaq3.i); - zzap zzap3 = zzz.f2393s.j; + zzap zzap3 = zzz.f2395s.j; if (zzap3 != null) { bundle.putBundle("expired_event_params", zzap3.x0()); } diff --git a/app/src/main/java/c/i/a/f/i/b/z4.java b/app/src/main/java/c/i/a/f/i/b/z4.java index 14560db1ce..3c70f6e3e0 100644 --- a/app/src/main/java/c/i/a/f/i/b/z4.java +++ b/app/src/main/java/c/i/a/f/i/b/z4.java @@ -286,6 +286,6 @@ public final class z4 extends l3 { public final void y0(zzn zzn) { Objects.requireNonNull(zzn, "null reference"); x0(zzn.i, false); - this.a.k.t().c0(zzn.j, zzn.f2392z, zzn.D); + this.a.k.t().c0(zzn.j, zzn.f2394z, zzn.D); } } diff --git a/app/src/main/java/c/i/a/f/j/b/e/i.java b/app/src/main/java/c/i/a/f/j/b/e/i.java index b4de3d70dc..e00a507d23 100644 --- a/app/src/main/java/c/i/a/f/j/b/e/i.java +++ b/app/src/main/java/c/i/a/f/j/b/e/i.java @@ -68,7 +68,7 @@ public final class i extends MessagesClient { public final Task g(MessageListener messageListener, SubscribeOptions subscribeOptions) { d.o(subscribeOptions.a.r == 0, "Strategy.setBackgroundScanMode() is only supported by background subscribe (the version which takes a PendingIntent)."); k m = m(messageListener); - return k(m, new l(this, m, new s(this, m(subscribeOptions.f2394c), m), subscribeOptions), new m(m)); + return k(m, new l(this, m, new s(this, m(subscribeOptions.f2396c), m), subscribeOptions), new m(m)); } @Override // com.google.android.gms.nearby.messages.MessagesClient diff --git a/app/src/main/java/c/i/a/g/k/b.java b/app/src/main/java/c/i/a/g/k/b.java index d4f2fe5295..122476f333 100644 --- a/app/src/main/java/c/i/a/g/k/b.java +++ b/app/src/main/java/c/i/a/g/k/b.java @@ -18,12 +18,12 @@ public class b implements ViewTreeObserver.OnPreDrawListener { } this.i.getViewTreeObserver().removeOnPreDrawListener(this); ClockFaceView clockFaceView = this.i; - int height = ((this.i.getHeight() / 2) - clockFaceView.l.q) - clockFaceView.f2425s; + int height = ((this.i.getHeight() / 2) - clockFaceView.l.q) - clockFaceView.f2427s; if (height != clockFaceView.j) { clockFaceView.j = height; clockFaceView.a(); ClockHandView clockHandView = clockFaceView.l; - clockHandView.f2429z = clockFaceView.j; + clockHandView.f2431z = clockFaceView.j; clockHandView.invalidate(); } return true; diff --git a/app/src/main/java/c/i/a/g/k/f.java b/app/src/main/java/c/i/a/g/k/f.java index e5441c5822..04fe4b4303 100644 --- a/app/src/main/java/c/i/a/g/k/f.java +++ b/app/src/main/java/c/i/a/g/k/f.java @@ -32,7 +32,7 @@ public class f implements ClockHandView.OnRotateListener, TimePickerView.d, Time TimePickerView timePickerView2 = this.l; timePickerView2.p = this; timePickerView2.o = this; - timePickerView2.k.f2427x = this; + timePickerView2.k.f2429x = this; g(i, "%d"); g(j, "%d"); g(k, "%02d"); diff --git a/app/src/main/java/c/i/c/m/d/n/a.java b/app/src/main/java/c/i/c/m/d/n/a.java index db4da475ca..911ac50ea5 100644 --- a/app/src/main/java/c/i/c/m/d/n/a.java +++ b/app/src/main/java/c/i/c/m/d/n/a.java @@ -105,7 +105,7 @@ public class a { } public a c(String str, String str2, String str3, File file) { - MediaType.a aVar = MediaType.f2962c; + MediaType.a aVar = MediaType.f2964c; RequestBody create = RequestBody.create(MediaType.a.b(str3), file); if (this.f == null) { MultipartBody.a aVar2 = new MultipartBody.a(); diff --git a/app/src/main/java/c/i/d/q/x/b.java b/app/src/main/java/c/i/d/q/x/b.java index 0842485e1e..b42c8ac015 100644 --- a/app/src/main/java/c/i/d/q/x/b.java +++ b/app/src/main/java/c/i/d/q/x/b.java @@ -106,7 +106,7 @@ public final class b extends JsonWriter { public final void O(JsonElement jsonElement) { if (this.w != null) { - if (!(jsonElement instanceof j) || this.f2469s) { + if (!(jsonElement instanceof j) || this.f2471s) { ((JsonObject) N()).a.put(this.w, jsonElement); } this.w = null; diff --git a/app/src/main/java/c/i/e/q/j.java b/app/src/main/java/c/i/e/q/j.java index 33715314bb..beb3db6f90 100644 --- a/app/src/main/java/c/i/e/q/j.java +++ b/app/src/main/java/c/i/e/q/j.java @@ -54,7 +54,7 @@ public final class j extends k { if (z3 || !z2) { return k; } - Result result = new Result(k.a.substring(1), k.b, k.f2470c, aVar2); + Result result = new Result(k.a.substring(1), k.b, k.f2472c, aVar2); result.a(k.e); return result; } diff --git a/app/src/main/java/c/i/e/q/k.java b/app/src/main/java/c/i/e/q/k.java index 96109dbbc8..3ada8b4a52 100644 --- a/app/src/main/java/c/i/e/q/k.java +++ b/app/src/main/java/c/i/e/q/k.java @@ -113,7 +113,7 @@ public abstract class k implements i { i = (((Integer) map2.get(jVar)).intValue() + 270) % 360; } c2.b(jVar, Integer.valueOf(i)); - c.i.e.k[] kVarArr = c2.f2470c; + c.i.e.k[] kVarArr = c2.f2472c; if (kVarArr != null) { int i2 = d.b; for (int i3 = 0; i3 < kVarArr.length; i3++) { @@ -171,7 +171,7 @@ public abstract class k implements i { Result b = kVar.b(i10, aVar, enumMap); if (i11 != i4) { b.b(j.ORIENTATION, Integer.valueOf((int) BaseTransientBottomBar.ANIMATION_FADE_DURATION)); - c.i.e.k[] kVarArr = b.f2470c; + c.i.e.k[] kVarArr = b.f2472c; if (kVarArr != null) { float f = (float) i2; map2 = enumMap; diff --git a/app/src/main/java/c/i/e/q/l.java b/app/src/main/java/c/i/e/q/l.java index 5e05733ac0..86c5b8656b 100644 --- a/app/src/main/java/c/i/e/q/l.java +++ b/app/src/main/java/c/i/e/q/l.java @@ -16,7 +16,7 @@ public final class l extends p { public static Result o(Result result) throws FormatException { String str = result.a; if (str.charAt(0) == '0') { - Result result2 = new Result(str.substring(1), null, result.f2470c, a.UPC_A); + Result result2 = new Result(str.substring(1), null, result.f2472c, a.UPC_A); Map map = result.e; if (map != null) { result2.a(map); diff --git a/app/src/main/java/c/i/e/q/p.java b/app/src/main/java/c/i/e/q/p.java index 82afc6930c..27c0e13d21 100644 --- a/app/src/main/java/c/i/e/q/p.java +++ b/app/src/main/java/c/i/e/q/p.java @@ -187,15 +187,15 @@ public abstract class p extends k { Result a2 = this.f.a(i, aVar, i3[1]); result.b(j.UPC_EAN_EXTENSION, a2.a); result.a(a2.e); - k[] kVarArr = a2.f2470c; - k[] kVarArr2 = result.f2470c; + k[] kVarArr = a2.f2472c; + k[] kVarArr2 = result.f2472c; if (kVarArr2 == null) { - result.f2470c = kVarArr; + result.f2472c = kVarArr; } else if (kVarArr != null && kVarArr.length > 0) { k[] kVarArr3 = new k[(kVarArr2.length + kVarArr.length)]; System.arraycopy(kVarArr2, 0, kVarArr3, 0, kVarArr2.length); System.arraycopy(kVarArr, 0, kVarArr3, kVarArr2.length, kVarArr.length); - result.f2470c = kVarArr3; + result.f2472c = kVarArr3; } i2 = a2.a.length(); } catch (ReaderException unused) { diff --git a/app/src/main/java/c/k/a/a/e.java b/app/src/main/java/c/k/a/a/e.java index a0e479d1aa..1883c3ebdd 100644 --- a/app/src/main/java/c/k/a/a/e.java +++ b/app/src/main/java/c/k/a/a/e.java @@ -26,13 +26,13 @@ public class e implements SeekBar.OnSeekBarChangeListener { int i2 = 255 - i; int i3 = 0; while (true) { - bVar = this.a.f2473s; + bVar = this.a.f2475s; int[] iArr = bVar.j; if (i3 >= iArr.length) { break; } int i4 = iArr[i3]; - this.a.f2473s.j[i3] = Color.argb(i2, Color.red(i4), Color.green(i4), Color.blue(i4)); + this.a.f2475s.j[i3] = Color.argb(i2, Color.red(i4), Color.green(i4), Color.blue(i4)); i3++; } bVar.notifyDataSetChanged(); diff --git a/app/src/main/java/c/o/a/n/g.java b/app/src/main/java/c/o/a/n/g.java index 35fd77f50f..e582631484 100644 --- a/app/src/main/java/c/o/a/n/g.java +++ b/app/src/main/java/c/o/a/n/g.java @@ -426,7 +426,7 @@ public abstract class g extends i { if (aVar != null) { CameraView.b bVar = (CameraView.b) this.l; bVar.b.a(1, "dispatchOnPictureTaken", aVar); - CameraView.this.f2498s.post(new c.o.a.i(bVar, aVar)); + CameraView.this.f2500s.post(new c.o.a.i(bVar, aVar)); return; } i.i.a(3, "onPictureResult", "result is null: something went wrong.", exc); diff --git a/app/src/main/java/c/o/a/n/k.java b/app/src/main/java/c/o/a/n/k.java index aa2c07cce7..6b34af1e6b 100644 --- a/app/src/main/java/c/o/a/n/k.java +++ b/app/src/main/java/c/o/a/n/k.java @@ -23,7 +23,7 @@ public class k implements f { if (cVar2 != null) { CameraView.b bVar = (CameraView.b) this.a.l; bVar.b.a(1, "dispatchOnCameraOpened", cVar2); - CameraView.this.f2498s.post(new c.o.a.f(bVar, cVar2)); + CameraView.this.f2500s.post(new c.o.a.f(bVar, cVar2)); return c.i.a.f.e.o.f.R(null); } throw new RuntimeException("Null options!"); diff --git a/app/src/main/java/c/o/a/n/m.java b/app/src/main/java/c/o/a/n/m.java index ba78b4c7be..0fe99b4202 100644 --- a/app/src/main/java/c/o/a/n/m.java +++ b/app/src/main/java/c/o/a/n/m.java @@ -16,6 +16,6 @@ public class m implements e { public void onSuccess(Void r6) { CameraView.b bVar = (CameraView.b) this.a.l; bVar.b.a(1, "dispatchOnCameraClosed"); - CameraView.this.f2498s.post(new g(bVar)); + CameraView.this.f2500s.post(new g(bVar)); } } diff --git a/app/src/main/java/c/o/a/r/f.java b/app/src/main/java/c/o/a/r/f.java index 19209eb986..0060dfec6c 100644 --- a/app/src/main/java/c/o/a/r/f.java +++ b/app/src/main/java/c/o/a/r/f.java @@ -65,17 +65,17 @@ public class f { int i3 = cameraView.w.g; if (!cameraView.l) { int i4 = (360 - i3) % 360; - c.o.a.n.t.a e = cameraView.f2499x.e(); + c.o.a.n.t.a e = cameraView.f2501x.e(); e.e(i4); e.e = i4; e.d(); } else { - c.o.a.n.t.a e2 = cameraView.f2499x.e(); + c.o.a.n.t.a e2 = cameraView.f2501x.e(); e2.e(i2); e2.e = i2; e2.d(); } - CameraView.this.f2498s.post(new j(bVar, (i2 + i3) % 360)); + CameraView.this.f2500s.post(new j(bVar, (i2 + i3) % 360)); return; } return; diff --git a/app/src/main/java/c/o/a/v/d.java b/app/src/main/java/c/o/a/v/d.java index d6f7432b7e..b3a75eacfd 100644 --- a/app/src/main/java/c/o/a/v/d.java +++ b/app/src/main/java/c/o/a/v/d.java @@ -34,12 +34,12 @@ public abstract class d { boolean z4 = !z2; CameraView.b bVar = (CameraView.b) ((g) aVar).l; if (z4 && (z3 = (cameraView = CameraView.this).k) && z3) { - if (cameraView.f2501z == null) { - cameraView.f2501z = new MediaActionSound(); + if (cameraView.f2503z == null) { + cameraView.f2503z = new MediaActionSound(); } - cameraView.f2501z.play(0); + cameraView.f2503z.play(0); } - CameraView.this.f2498s.post(new h(bVar)); + CameraView.this.f2500s.post(new h(bVar)); } } diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackDataInfraTest.java b/app/src/main/java/com/discord/analytics/generated/events/TrackDataInfraTest.java index a25dfd5ad7..4ad391867b 100644 --- a/app/src/main/java/com/discord/analytics/generated/events/TrackDataInfraTest.java +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackDataInfraTest.java @@ -8,9 +8,10 @@ import d0.z.d.m; import java.util.List; /* compiled from: TrackDataInfraTest.kt */ public final class TrackDataInfraTest implements AnalyticsSchema, TrackBaseReceiver { - private final transient String analyticsSchemaTypeName = "data_infra_test"; - private final CharSequence pushToken = null; - private final List pushTokenArr = null; + private final transient String analyticsSchemaTypeName; + private final CharSequence pushToken; + private final List pushTokenArr; + private final CharSequence requiredStr; private TrackBase trackBase; @Override // com.discord.api.science.AnalyticsSchema @@ -26,7 +27,7 @@ public final class TrackDataInfraTest implements AnalyticsSchema, TrackBaseRecei return false; } TrackDataInfraTest trackDataInfraTest = (TrackDataInfraTest) obj; - return m.areEqual(this.pushToken, trackDataInfraTest.pushToken) && m.areEqual(this.pushTokenArr, trackDataInfraTest.pushTokenArr); + return m.areEqual(this.pushToken, trackDataInfraTest.pushToken) && m.areEqual(this.pushTokenArr, trackDataInfraTest.pushTokenArr) && m.areEqual(this.requiredStr, trackDataInfraTest.requiredStr); } public int hashCode() { @@ -34,16 +35,20 @@ public final class TrackDataInfraTest implements AnalyticsSchema, TrackBaseRecei int i = 0; int hashCode = (charSequence != null ? charSequence.hashCode() : 0) * 31; List list = this.pushTokenArr; - if (list != null) { - i = list.hashCode(); + int hashCode2 = (hashCode + (list != null ? list.hashCode() : 0)) * 31; + CharSequence charSequence2 = this.requiredStr; + if (charSequence2 != null) { + i = charSequence2.hashCode(); } - return hashCode + i; + return hashCode2 + i; } public String toString() { StringBuilder R = a.R("TrackDataInfraTest(pushToken="); R.append(this.pushToken); R.append(", pushTokenArr="); - return a.J(R, this.pushTokenArr, ")"); + R.append(this.pushTokenArr); + R.append(", requiredStr="); + return a.D(R, this.requiredStr, ")"); } } diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackDismissibleContentDismissed.java b/app/src/main/java/com/discord/analytics/generated/events/TrackDismissibleContentDismissed.java new file mode 100644 index 0000000000..e8549031ef --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackDismissibleContentDismissed.java @@ -0,0 +1,53 @@ +package com.discord.analytics.generated.events; + +import c.d.b.a.a; +import com.discord.analytics.generated.traits.TrackBase; +import com.discord.analytics.generated.traits.TrackBaseReceiver; +import com.discord.api.science.AnalyticsSchema; +import d0.z.d.m; +/* compiled from: TrackDismissibleContentDismissed.kt */ +public final class TrackDismissibleContentDismissed implements AnalyticsSchema, TrackBaseReceiver { + private final CharSequence action = null; + private final transient String analyticsSchemaTypeName = "dismissible_content_dismissed"; + private final Long contentCount = null; + private TrackBase trackBase; + private final CharSequence type = null; + + @Override // com.discord.api.science.AnalyticsSchema + public String b() { + return this.analyticsSchemaTypeName; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof TrackDismissibleContentDismissed)) { + return false; + } + TrackDismissibleContentDismissed trackDismissibleContentDismissed = (TrackDismissibleContentDismissed) obj; + return m.areEqual(this.type, trackDismissibleContentDismissed.type) && m.areEqual(this.action, trackDismissibleContentDismissed.action) && m.areEqual(this.contentCount, trackDismissibleContentDismissed.contentCount); + } + + public int hashCode() { + CharSequence charSequence = this.type; + int i = 0; + int hashCode = (charSequence != null ? charSequence.hashCode() : 0) * 31; + CharSequence charSequence2 = this.action; + int hashCode2 = (hashCode + (charSequence2 != null ? charSequence2.hashCode() : 0)) * 31; + Long l = this.contentCount; + if (l != null) { + i = l.hashCode(); + } + return hashCode2 + i; + } + + public String toString() { + StringBuilder R = a.R("TrackDismissibleContentDismissed(type="); + R.append(this.type); + R.append(", action="); + R.append(this.action); + R.append(", contentCount="); + return a.F(R, this.contentCount, ")"); + } +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackDismissibleContentDismissedReceiver.java b/app/src/main/java/com/discord/analytics/generated/events/TrackDismissibleContentDismissedReceiver.java new file mode 100644 index 0000000000..c700aa648b --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackDismissibleContentDismissedReceiver.java @@ -0,0 +1,6 @@ +package com.discord.analytics.generated.events; + +import com.discord.api.science.AnalyticsSchema; +/* compiled from: TrackDismissibleContentDismissed.kt */ +public interface TrackDismissibleContentDismissedReceiver extends AnalyticsSchema { +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackDismissibleContentShown.java b/app/src/main/java/com/discord/analytics/generated/events/TrackDismissibleContentShown.java new file mode 100644 index 0000000000..7450312cbc --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackDismissibleContentShown.java @@ -0,0 +1,48 @@ +package com.discord.analytics.generated.events; + +import c.d.b.a.a; +import com.discord.analytics.generated.traits.TrackBase; +import com.discord.analytics.generated.traits.TrackBaseReceiver; +import com.discord.api.science.AnalyticsSchema; +import d0.z.d.m; +/* compiled from: TrackDismissibleContentShown.kt */ +public final class TrackDismissibleContentShown implements AnalyticsSchema, TrackBaseReceiver { + private final transient String analyticsSchemaTypeName = "dismissible_content_shown"; + private final Long contentCount = null; + private TrackBase trackBase; + private final CharSequence type = null; + + @Override // com.discord.api.science.AnalyticsSchema + public String b() { + return this.analyticsSchemaTypeName; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof TrackDismissibleContentShown)) { + return false; + } + TrackDismissibleContentShown trackDismissibleContentShown = (TrackDismissibleContentShown) obj; + return m.areEqual(this.type, trackDismissibleContentShown.type) && m.areEqual(this.contentCount, trackDismissibleContentShown.contentCount); + } + + public int hashCode() { + CharSequence charSequence = this.type; + int i = 0; + int hashCode = (charSequence != null ? charSequence.hashCode() : 0) * 31; + Long l = this.contentCount; + if (l != null) { + i = l.hashCode(); + } + return hashCode + i; + } + + public String toString() { + StringBuilder R = a.R("TrackDismissibleContentShown(type="); + R.append(this.type); + R.append(", contentCount="); + return a.F(R, this.contentCount, ")"); + } +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackDismissibleContentShownReceiver.java b/app/src/main/java/com/discord/analytics/generated/events/TrackDismissibleContentShownReceiver.java new file mode 100644 index 0000000000..05ea19a607 --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackDismissibleContentShownReceiver.java @@ -0,0 +1,6 @@ +package com.discord.analytics.generated.events; + +import com.discord.api.science.AnalyticsSchema; +/* compiled from: TrackDismissibleContentShown.kt */ +public interface TrackDismissibleContentShownReceiver extends AnalyticsSchema { +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackGuildMemberUpdated.java b/app/src/main/java/com/discord/analytics/generated/events/TrackGuildMemberUpdated.java index c2292a32d9..9013eab003 100644 --- a/app/src/main/java/com/discord/analytics/generated/events/TrackGuildMemberUpdated.java +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackGuildMemberUpdated.java @@ -10,6 +10,8 @@ import java.util.List; public final class TrackGuildMemberUpdated implements AnalyticsSchema, TrackBaseReceiver { private final transient String analyticsSchemaTypeName = "guild_member_updated"; private final CharSequence avatarUpdateType = null; + private final CharSequence bannerUpdateType = null; + private final CharSequence bioUpdateType = null; private final Boolean deaf = null; private final Long deleteMessageDays = null; private final List fieldsUpdated = null; @@ -18,6 +20,7 @@ public final class TrackGuildMemberUpdated implements AnalyticsSchema, TrackBase private final Boolean mute = null; private final CharSequence newNickname = null; private final List newRoles = null; + private final CharSequence nicknameUpdateType = null; private final CharSequence oldNickname = null; private final List oldRoles = null; private final CharSequence reason = null; @@ -39,7 +42,7 @@ public final class TrackGuildMemberUpdated implements AnalyticsSchema, TrackBase return false; } TrackGuildMemberUpdated trackGuildMemberUpdated = (TrackGuildMemberUpdated) obj; - return m.areEqual(this.guildId, trackGuildMemberUpdated.guildId) && m.areEqual(this.guildName, trackGuildMemberUpdated.guildName) && m.areEqual(this.targetUserId, trackGuildMemberUpdated.targetUserId) && m.areEqual(this.updateType, trackGuildMemberUpdated.updateType) && m.areEqual(this.fieldsUpdated, trackGuildMemberUpdated.fieldsUpdated) && m.areEqual(this.oldNickname, trackGuildMemberUpdated.oldNickname) && m.areEqual(this.newNickname, trackGuildMemberUpdated.newNickname) && m.areEqual(this.mute, trackGuildMemberUpdated.mute) && m.areEqual(this.deaf, trackGuildMemberUpdated.deaf) && m.areEqual(this.oldRoles, trackGuildMemberUpdated.oldRoles) && m.areEqual(this.newRoles, trackGuildMemberUpdated.newRoles) && m.areEqual(this.reason, trackGuildMemberUpdated.reason) && m.areEqual(this.deleteMessageDays, trackGuildMemberUpdated.deleteMessageDays) && m.areEqual(this.avatarUpdateType, trackGuildMemberUpdated.avatarUpdateType) && m.areEqual(this.userPremiumTier, trackGuildMemberUpdated.userPremiumTier); + return m.areEqual(this.guildId, trackGuildMemberUpdated.guildId) && m.areEqual(this.guildName, trackGuildMemberUpdated.guildName) && m.areEqual(this.targetUserId, trackGuildMemberUpdated.targetUserId) && m.areEqual(this.updateType, trackGuildMemberUpdated.updateType) && m.areEqual(this.fieldsUpdated, trackGuildMemberUpdated.fieldsUpdated) && m.areEqual(this.oldNickname, trackGuildMemberUpdated.oldNickname) && m.areEqual(this.newNickname, trackGuildMemberUpdated.newNickname) && m.areEqual(this.mute, trackGuildMemberUpdated.mute) && m.areEqual(this.deaf, trackGuildMemberUpdated.deaf) && m.areEqual(this.oldRoles, trackGuildMemberUpdated.oldRoles) && m.areEqual(this.newRoles, trackGuildMemberUpdated.newRoles) && m.areEqual(this.reason, trackGuildMemberUpdated.reason) && m.areEqual(this.deleteMessageDays, trackGuildMemberUpdated.deleteMessageDays) && m.areEqual(this.avatarUpdateType, trackGuildMemberUpdated.avatarUpdateType) && m.areEqual(this.userPremiumTier, trackGuildMemberUpdated.userPremiumTier) && m.areEqual(this.nicknameUpdateType, trackGuildMemberUpdated.nicknameUpdateType) && m.areEqual(this.bannerUpdateType, trackGuildMemberUpdated.bannerUpdateType) && m.areEqual(this.bioUpdateType, trackGuildMemberUpdated.bioUpdateType); } public int hashCode() { @@ -73,10 +76,16 @@ public final class TrackGuildMemberUpdated implements AnalyticsSchema, TrackBase CharSequence charSequence6 = this.avatarUpdateType; int hashCode14 = (hashCode13 + (charSequence6 != null ? charSequence6.hashCode() : 0)) * 31; Long l4 = this.userPremiumTier; - if (l4 != null) { - i = l4.hashCode(); + int hashCode15 = (hashCode14 + (l4 != null ? l4.hashCode() : 0)) * 31; + CharSequence charSequence7 = this.nicknameUpdateType; + int hashCode16 = (hashCode15 + (charSequence7 != null ? charSequence7.hashCode() : 0)) * 31; + CharSequence charSequence8 = this.bannerUpdateType; + int hashCode17 = (hashCode16 + (charSequence8 != null ? charSequence8.hashCode() : 0)) * 31; + CharSequence charSequence9 = this.bioUpdateType; + if (charSequence9 != null) { + i = charSequence9.hashCode(); } - return hashCode14 + i; + return hashCode17 + i; } public String toString() { @@ -109,6 +118,12 @@ public final class TrackGuildMemberUpdated implements AnalyticsSchema, TrackBase R.append(", avatarUpdateType="); R.append(this.avatarUpdateType); R.append(", userPremiumTier="); - return a.F(R, this.userPremiumTier, ")"); + R.append(this.userPremiumTier); + R.append(", nicknameUpdateType="); + R.append(this.nicknameUpdateType); + R.append(", bannerUpdateType="); + R.append(this.bannerUpdateType); + R.append(", bioUpdateType="); + return a.D(R, this.bioUpdateType, ")"); } } diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackGuildScheduledEventReported.java b/app/src/main/java/com/discord/analytics/generated/events/TrackGuildScheduledEventReported.java new file mode 100644 index 0000000000..1bb7852469 --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackGuildScheduledEventReported.java @@ -0,0 +1,71 @@ +package com.discord.analytics.generated.events; + +import c.d.b.a.a; +import com.discord.analytics.generated.traits.TrackBase; +import com.discord.analytics.generated.traits.TrackBaseReceiver; +import com.discord.analytics.generated.traits.TrackGuild; +import com.discord.analytics.generated.traits.TrackGuildReceiver; +import com.discord.api.science.AnalyticsSchema; +import d0.z.d.m; +/* compiled from: TrackGuildScheduledEventReported.kt */ +public final class TrackGuildScheduledEventReported implements AnalyticsSchema, TrackBaseReceiver, TrackGuildReceiver { + private final transient String analyticsSchemaTypeName = "guild_scheduled_event_reported"; + private final CharSequence description = null; + private final Long guildScheduledEventId = null; + private final Long reasonEnum = null; + private final CharSequence reportSubType = null; + private final CharSequence reportType = null; + private final CharSequence subject = null; + private TrackBase trackBase; + private TrackGuild trackGuild; + + @Override // com.discord.api.science.AnalyticsSchema + public String b() { + return this.analyticsSchemaTypeName; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof TrackGuildScheduledEventReported)) { + return false; + } + TrackGuildScheduledEventReported trackGuildScheduledEventReported = (TrackGuildScheduledEventReported) obj; + return m.areEqual(this.reportType, trackGuildScheduledEventReported.reportType) && m.areEqual(this.reportSubType, trackGuildScheduledEventReported.reportSubType) && m.areEqual(this.subject, trackGuildScheduledEventReported.subject) && m.areEqual(this.description, trackGuildScheduledEventReported.description) && m.areEqual(this.reasonEnum, trackGuildScheduledEventReported.reasonEnum) && m.areEqual(this.guildScheduledEventId, trackGuildScheduledEventReported.guildScheduledEventId); + } + + public int hashCode() { + CharSequence charSequence = this.reportType; + int i = 0; + int hashCode = (charSequence != null ? charSequence.hashCode() : 0) * 31; + CharSequence charSequence2 = this.reportSubType; + int hashCode2 = (hashCode + (charSequence2 != null ? charSequence2.hashCode() : 0)) * 31; + CharSequence charSequence3 = this.subject; + int hashCode3 = (hashCode2 + (charSequence3 != null ? charSequence3.hashCode() : 0)) * 31; + CharSequence charSequence4 = this.description; + int hashCode4 = (hashCode3 + (charSequence4 != null ? charSequence4.hashCode() : 0)) * 31; + Long l = this.reasonEnum; + int hashCode5 = (hashCode4 + (l != null ? l.hashCode() : 0)) * 31; + Long l2 = this.guildScheduledEventId; + if (l2 != null) { + i = l2.hashCode(); + } + return hashCode5 + i; + } + + public String toString() { + StringBuilder R = a.R("TrackGuildScheduledEventReported(reportType="); + R.append(this.reportType); + R.append(", reportSubType="); + R.append(this.reportSubType); + R.append(", subject="); + R.append(this.subject); + R.append(", description="); + R.append(this.description); + R.append(", reasonEnum="); + R.append(this.reasonEnum); + R.append(", guildScheduledEventId="); + return a.F(R, this.guildScheduledEventId, ")"); + } +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackGuildScheduledEventReportedReceiver.java b/app/src/main/java/com/discord/analytics/generated/events/TrackGuildScheduledEventReportedReceiver.java new file mode 100644 index 0000000000..9ca64b0581 --- /dev/null +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackGuildScheduledEventReportedReceiver.java @@ -0,0 +1,6 @@ +package com.discord.analytics.generated.events; + +import com.discord.api.science.AnalyticsSchema; +/* compiled from: TrackGuildScheduledEventReported.kt */ +public interface TrackGuildScheduledEventReportedReceiver extends AnalyticsSchema { +} diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackMessageReported.java b/app/src/main/java/com/discord/analytics/generated/events/TrackMessageReported.java index 11500cc52a..158bac26c2 100644 --- a/app/src/main/java/com/discord/analytics/generated/events/TrackMessageReported.java +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackMessageReported.java @@ -22,6 +22,7 @@ public final class TrackMessageReported implements AnalyticsSchema, TrackBaseRec private final Long reportId = null; private final CharSequence reportSubType = null; private final CharSequence reportType = null; + private final Long reportedMessageAuthorId = null; private final CharSequence subject = null; private TrackBase trackBase; private TrackChannel trackChannel; @@ -41,7 +42,7 @@ public final class TrackMessageReported implements AnalyticsSchema, TrackBaseRec return false; } TrackMessageReported trackMessageReported = (TrackMessageReported) obj; - return m.areEqual(this.reportType, trackMessageReported.reportType) && m.areEqual(this.reportSubType, trackMessageReported.reportSubType) && m.areEqual(this.subject, trackMessageReported.subject) && m.areEqual(this.description, trackMessageReported.description) && m.areEqual(this.reasonEnum, trackMessageReported.reasonEnum) && m.areEqual(this.messageId, trackMessageReported.messageId) && m.areEqual(this.reportId, trackMessageReported.reportId) && m.areEqual(this.mutualGuildIds, trackMessageReported.mutualGuildIds); + return m.areEqual(this.reportType, trackMessageReported.reportType) && m.areEqual(this.reportSubType, trackMessageReported.reportSubType) && m.areEqual(this.subject, trackMessageReported.subject) && m.areEqual(this.description, trackMessageReported.description) && m.areEqual(this.reasonEnum, trackMessageReported.reasonEnum) && m.areEqual(this.messageId, trackMessageReported.messageId) && m.areEqual(this.reportId, trackMessageReported.reportId) && m.areEqual(this.mutualGuildIds, trackMessageReported.mutualGuildIds) && m.areEqual(this.reportedMessageAuthorId, trackMessageReported.reportedMessageAuthorId); } public int hashCode() { @@ -61,10 +62,12 @@ public final class TrackMessageReported implements AnalyticsSchema, TrackBaseRec Long l3 = this.reportId; int hashCode7 = (hashCode6 + (l3 != null ? l3.hashCode() : 0)) * 31; List list = this.mutualGuildIds; - if (list != null) { - i = list.hashCode(); + int hashCode8 = (hashCode7 + (list != null ? list.hashCode() : 0)) * 31; + Long l4 = this.reportedMessageAuthorId; + if (l4 != null) { + i = l4.hashCode(); } - return hashCode7 + i; + return hashCode8 + i; } public String toString() { @@ -83,6 +86,8 @@ public final class TrackMessageReported implements AnalyticsSchema, TrackBaseRec R.append(", reportId="); R.append(this.reportId); R.append(", mutualGuildIds="); - return a.J(R, this.mutualGuildIds, ")"); + R.append(this.mutualGuildIds); + R.append(", reportedMessageAuthorId="); + return a.F(R, this.reportedMessageAuthorId, ")"); } } diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackOpenPopout.java b/app/src/main/java/com/discord/analytics/generated/events/TrackOpenPopout.java index 56054a2e37..28c384abe9 100644 --- a/app/src/main/java/com/discord/analytics/generated/events/TrackOpenPopout.java +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackOpenPopout.java @@ -22,7 +22,11 @@ public final class TrackOpenPopout implements AnalyticsSchema, TrackBaseReceiver private final CharSequence gamePlatform = null; private final Long guildId = null; private final Boolean hasCustomStatus = null; + private final Boolean hasGuildMemberAvatar = null; + private final Boolean hasGuildMemberBanner = null; + private final Boolean hasGuildMemberBio = null; private final Boolean hasImages = null; + private final Boolean hasNickname = null; private final Boolean isFriend = null; private final Boolean isStreaming = null; private final Long otherUserId = null; @@ -54,7 +58,7 @@ public final class TrackOpenPopout implements AnalyticsSchema, TrackBaseReceiver return false; } TrackOpenPopout trackOpenPopout = (TrackOpenPopout) obj; - return m.areEqual(this.source, trackOpenPopout.source) && m.areEqual(this.type, trackOpenPopout.type) && m.areEqual(this.otherUserId, trackOpenPopout.otherUserId) && m.areEqual(this.applicationId, trackOpenPopout.applicationId) && m.areEqual(this.applicationName, trackOpenPopout.applicationName) && m.areEqual(this.gameId, trackOpenPopout.gameId) && m.areEqual(this.isFriend, trackOpenPopout.isFriend) && m.areEqual(this.hasImages, trackOpenPopout.hasImages) && m.areEqual(this.partyMax, trackOpenPopout.partyMax) && m.areEqual(this.partyId, trackOpenPopout.partyId) && m.areEqual(this.partyPlatform, trackOpenPopout.partyPlatform) && m.areEqual(this.gameName, trackOpenPopout.gameName) && m.areEqual(this.gamePlatform, trackOpenPopout.gamePlatform) && m.areEqual(this.skuId, trackOpenPopout.skuId) && m.areEqual(this.profileUserStatus, trackOpenPopout.profileUserStatus) && m.areEqual(this.isStreaming, trackOpenPopout.isStreaming) && m.areEqual(this.hasCustomStatus, trackOpenPopout.hasCustomStatus) && m.areEqual(this.guildId, trackOpenPopout.guildId) && m.areEqual(this.emojiId, trackOpenPopout.emojiId) && m.areEqual(this.stickerId, trackOpenPopout.stickerId) && m.areEqual(this.stickerPackId, trackOpenPopout.stickerPackId) && m.areEqual(this.profileHasNitroCustomization, trackOpenPopout.profileHasNitroCustomization); + return m.areEqual(this.source, trackOpenPopout.source) && m.areEqual(this.type, trackOpenPopout.type) && m.areEqual(this.otherUserId, trackOpenPopout.otherUserId) && m.areEqual(this.applicationId, trackOpenPopout.applicationId) && m.areEqual(this.applicationName, trackOpenPopout.applicationName) && m.areEqual(this.gameId, trackOpenPopout.gameId) && m.areEqual(this.isFriend, trackOpenPopout.isFriend) && m.areEqual(this.hasImages, trackOpenPopout.hasImages) && m.areEqual(this.partyMax, trackOpenPopout.partyMax) && m.areEqual(this.partyId, trackOpenPopout.partyId) && m.areEqual(this.partyPlatform, trackOpenPopout.partyPlatform) && m.areEqual(this.gameName, trackOpenPopout.gameName) && m.areEqual(this.gamePlatform, trackOpenPopout.gamePlatform) && m.areEqual(this.skuId, trackOpenPopout.skuId) && m.areEqual(this.profileUserStatus, trackOpenPopout.profileUserStatus) && m.areEqual(this.isStreaming, trackOpenPopout.isStreaming) && m.areEqual(this.hasCustomStatus, trackOpenPopout.hasCustomStatus) && m.areEqual(this.guildId, trackOpenPopout.guildId) && m.areEqual(this.emojiId, trackOpenPopout.emojiId) && m.areEqual(this.stickerId, trackOpenPopout.stickerId) && m.areEqual(this.stickerPackId, trackOpenPopout.stickerPackId) && m.areEqual(this.profileHasNitroCustomization, trackOpenPopout.profileHasNitroCustomization) && m.areEqual(this.hasNickname, trackOpenPopout.hasNickname) && m.areEqual(this.hasGuildMemberAvatar, trackOpenPopout.hasGuildMemberAvatar) && m.areEqual(this.hasGuildMemberBanner, trackOpenPopout.hasGuildMemberBanner) && m.areEqual(this.hasGuildMemberBio, trackOpenPopout.hasGuildMemberBio); } public int hashCode() { @@ -102,10 +106,18 @@ public final class TrackOpenPopout implements AnalyticsSchema, TrackBaseReceiver Long l9 = this.stickerPackId; int hashCode21 = (hashCode20 + (l9 != null ? l9.hashCode() : 0)) * 31; Boolean bool5 = this.profileHasNitroCustomization; - if (bool5 != null) { - i = bool5.hashCode(); + int hashCode22 = (hashCode21 + (bool5 != null ? bool5.hashCode() : 0)) * 31; + Boolean bool6 = this.hasNickname; + int hashCode23 = (hashCode22 + (bool6 != null ? bool6.hashCode() : 0)) * 31; + Boolean bool7 = this.hasGuildMemberAvatar; + int hashCode24 = (hashCode23 + (bool7 != null ? bool7.hashCode() : 0)) * 31; + Boolean bool8 = this.hasGuildMemberBanner; + int hashCode25 = (hashCode24 + (bool8 != null ? bool8.hashCode() : 0)) * 31; + Boolean bool9 = this.hasGuildMemberBio; + if (bool9 != null) { + i = bool9.hashCode(); } - return hashCode21 + i; + return hashCode25 + i; } public String toString() { @@ -152,6 +164,14 @@ public final class TrackOpenPopout implements AnalyticsSchema, TrackBaseReceiver R.append(", stickerPackId="); R.append(this.stickerPackId); R.append(", profileHasNitroCustomization="); - return a.C(R, this.profileHasNitroCustomization, ")"); + R.append(this.profileHasNitroCustomization); + R.append(", hasNickname="); + R.append(this.hasNickname); + R.append(", hasGuildMemberAvatar="); + R.append(this.hasGuildMemberAvatar); + R.append(", hasGuildMemberBanner="); + R.append(this.hasGuildMemberBanner); + R.append(", hasGuildMemberBio="); + return a.C(R, this.hasGuildMemberBio, ")"); } } diff --git a/app/src/main/java/com/discord/analytics/generated/events/TrackSettingsPaneViewed.java b/app/src/main/java/com/discord/analytics/generated/events/TrackSettingsPaneViewed.java index 6d183718cd..52225d8bb9 100644 --- a/app/src/main/java/com/discord/analytics/generated/events/TrackSettingsPaneViewed.java +++ b/app/src/main/java/com/discord/analytics/generated/events/TrackSettingsPaneViewed.java @@ -11,10 +11,12 @@ import com.discord.analytics.generated.traits.TrackLocationMetadata; import com.discord.analytics.generated.traits.TrackLocationMetadataReceiver; import com.discord.analytics.generated.traits.TrackOverlayClientMetadata; import com.discord.analytics.generated.traits.TrackOverlayClientMetadataReceiver; +import com.discord.analytics.generated.traits.TrackSourceMetadata; +import com.discord.analytics.generated.traits.TrackSourceMetadataReceiver; import com.discord.api.science.AnalyticsSchema; import d0.z.d.m; /* compiled from: TrackSettingsPaneViewed.kt */ -public final class TrackSettingsPaneViewed implements AnalyticsSchema, TrackBaseReceiver, TrackGuildReceiver, TrackChannelReceiver, TrackLocationMetadataReceiver, TrackOverlayClientMetadataReceiver { +public final class TrackSettingsPaneViewed implements AnalyticsSchema, TrackBaseReceiver, TrackGuildReceiver, TrackChannelReceiver, TrackLocationMetadataReceiver, TrackOverlayClientMetadataReceiver, TrackSourceMetadataReceiver { private final transient String analyticsSchemaTypeName = "settings_pane_viewed"; private final CharSequence destinationPane = null; private final CharSequence originPane = null; @@ -25,6 +27,7 @@ public final class TrackSettingsPaneViewed implements AnalyticsSchema, TrackBase private TrackGuild trackGuild; private TrackLocationMetadata trackLocationMetadata; private TrackOverlayClientMetadata trackOverlayClientMetadata; + private TrackSourceMetadata trackSourceMetadata; @Override // com.discord.api.science.AnalyticsSchema public String b() { diff --git a/app/src/main/java/com/discord/analytics/generated/traits/TrackEntitlementMetadata.java b/app/src/main/java/com/discord/analytics/generated/traits/TrackEntitlementMetadata.java index eeeee6349a..4b687f79a9 100644 --- a/app/src/main/java/com/discord/analytics/generated/traits/TrackEntitlementMetadata.java +++ b/app/src/main/java/com/discord/analytics/generated/traits/TrackEntitlementMetadata.java @@ -8,6 +8,7 @@ public final class TrackEntitlementMetadata { private final Long entitlementId = null; private final Long entitlementPaymentId = null; private final Long entitlementSubscriptionPlanId = null; + private final Long giftCodeBatchId = null; public boolean equals(Object obj) { if (this == obj) { @@ -17,7 +18,7 @@ public final class TrackEntitlementMetadata { return false; } TrackEntitlementMetadata trackEntitlementMetadata = (TrackEntitlementMetadata) obj; - return m.areEqual(this.entitlementId, trackEntitlementMetadata.entitlementId) && m.areEqual(this.entitlementCreatorId, trackEntitlementMetadata.entitlementCreatorId) && m.areEqual(this.entitlementSubscriptionPlanId, trackEntitlementMetadata.entitlementSubscriptionPlanId) && m.areEqual(this.entitlementPaymentId, trackEntitlementMetadata.entitlementPaymentId); + return m.areEqual(this.entitlementId, trackEntitlementMetadata.entitlementId) && m.areEqual(this.entitlementCreatorId, trackEntitlementMetadata.entitlementCreatorId) && m.areEqual(this.entitlementSubscriptionPlanId, trackEntitlementMetadata.entitlementSubscriptionPlanId) && m.areEqual(this.entitlementPaymentId, trackEntitlementMetadata.entitlementPaymentId) && m.areEqual(this.giftCodeBatchId, trackEntitlementMetadata.giftCodeBatchId); } public int hashCode() { @@ -29,10 +30,12 @@ public final class TrackEntitlementMetadata { Long l3 = this.entitlementSubscriptionPlanId; int hashCode3 = (hashCode2 + (l3 != null ? l3.hashCode() : 0)) * 31; Long l4 = this.entitlementPaymentId; - if (l4 != null) { - i = l4.hashCode(); + int hashCode4 = (hashCode3 + (l4 != null ? l4.hashCode() : 0)) * 31; + Long l5 = this.giftCodeBatchId; + if (l5 != null) { + i = l5.hashCode(); } - return hashCode3 + i; + return hashCode4 + i; } public String toString() { @@ -43,6 +46,8 @@ public final class TrackEntitlementMetadata { R.append(", entitlementSubscriptionPlanId="); R.append(this.entitlementSubscriptionPlanId); R.append(", entitlementPaymentId="); - return a.F(R, this.entitlementPaymentId, ")"); + R.append(this.entitlementPaymentId); + R.append(", giftCodeBatchId="); + return a.F(R, this.giftCodeBatchId, ")"); } } diff --git a/app/src/main/java/com/discord/api/activity/ActivitySecrets.java b/app/src/main/java/com/discord/api/activity/ActivitySecrets.java new file mode 100644 index 0000000000..65d3749a9a --- /dev/null +++ b/app/src/main/java/com/discord/api/activity/ActivitySecrets.java @@ -0,0 +1,38 @@ +package com.discord.api.activity; + +import c.d.b.a.a; +import d0.z.d.m; +/* compiled from: ActivitySecrets.kt */ +public final class ActivitySecrets { + private final String join; + private final String match; + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof ActivitySecrets)) { + return false; + } + ActivitySecrets activitySecrets = (ActivitySecrets) obj; + return m.areEqual(this.match, activitySecrets.match) && m.areEqual(this.join, activitySecrets.join); + } + + public int hashCode() { + String str = this.match; + int i = 0; + int hashCode = (str != null ? str.hashCode() : 0) * 31; + String str2 = this.join; + if (str2 != null) { + i = str2.hashCode(); + } + return hashCode + i; + } + + public String toString() { + StringBuilder R = a.R("ActivitySecrets(match="); + R.append(this.match); + R.append(", join="); + return a.H(R, this.join, ")"); + } +} diff --git a/app/src/main/java/com/discord/api/activity/ActivityType.java b/app/src/main/java/com/discord/api/activity/ActivityType.java index 4e4c5627e5..4db96c9c3e 100644 --- a/app/src/main/java/com/discord/api/activity/ActivityType.java +++ b/app/src/main/java/com/discord/api/activity/ActivityType.java @@ -1,4 +1,6 @@ package com.discord.api.activity; + +import kotlin.jvm.internal.DefaultConstructorMarker; /* compiled from: ActivityType.kt */ public enum ActivityType { PLAYING(0), @@ -9,8 +11,18 @@ public enum ActivityType { COMPETING(5), UNKNOWN(-1); + public static final Companion Companion = new Companion(null); private final int apiInt; + /* compiled from: ActivityType.kt */ + public static final class Companion { + public Companion() { + } + + public Companion(DefaultConstructorMarker defaultConstructorMarker) { + } + } + private ActivityType(int i) { this.apiInt = i; } diff --git a/app/src/main/java/com/discord/api/activity/ActivityTypeTypeAdapter.java b/app/src/main/java/com/discord/api/activity/ActivityTypeTypeAdapter.java index d0d67b24c5..92c0b54e3d 100644 --- a/app/src/main/java/com/discord/api/activity/ActivityTypeTypeAdapter.java +++ b/app/src/main/java/com/discord/api/activity/ActivityTypeTypeAdapter.java @@ -1,31 +1,48 @@ package com.discord.api.activity; +import c.c.a.a0.d; +import com.discord.api.activity.ActivityType; import com.google.gson.TypeAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import d0.z.d.m; +import java.util.Objects; /* compiled from: ActivityType.kt */ public final class ActivityTypeTypeAdapter extends TypeAdapter { /* Return type fixed from 'java.lang.Object' to match base method */ @Override // com.google.gson.TypeAdapter public ActivityType read(JsonReader jsonReader) { - ActivityType activityType; m.checkNotNullParameter(jsonReader, "in"); - int y2 = jsonReader.y(); - ActivityType[] values = ActivityType.values(); - int i = 0; - while (true) { - if (i >= 7) { - activityType = null; - break; - } - activityType = values[i]; - if (activityType.getApiInt$discord_api() == y2) { - break; - } - i++; + ActivityType.Companion companion = ActivityType.Companion; + Integer l1 = d.l1(jsonReader); + Objects.requireNonNull(companion); + ActivityType activityType = ActivityType.PLAYING; + int apiInt$discord_api = activityType.getApiInt$discord_api(); + if (l1 != null && l1.intValue() == apiInt$discord_api) { + return activityType; } - return activityType != null ? activityType : ActivityType.UNKNOWN; + ActivityType activityType2 = ActivityType.STREAMING; + int apiInt$discord_api2 = activityType2.getApiInt$discord_api(); + if (l1 != null && l1.intValue() == apiInt$discord_api2) { + return activityType2; + } + ActivityType activityType3 = ActivityType.LISTENING; + int apiInt$discord_api3 = activityType3.getApiInt$discord_api(); + if (l1 != null && l1.intValue() == apiInt$discord_api3) { + return activityType3; + } + ActivityType activityType4 = ActivityType.WATCHING; + int apiInt$discord_api4 = activityType4.getApiInt$discord_api(); + if (l1 != null && l1.intValue() == apiInt$discord_api4) { + return activityType4; + } + ActivityType activityType5 = ActivityType.CUSTOM_STATUS; + int apiInt$discord_api5 = activityType5.getApiInt$discord_api(); + if (l1 != null && l1.intValue() == apiInt$discord_api5) { + return activityType5; + } + ActivityType activityType6 = ActivityType.COMPETING; + return (l1 != null && l1.intValue() == activityType6.getApiInt$discord_api()) ? activityType6 : ActivityType.UNKNOWN; } /* JADX DEBUG: Method arguments types fixed to match base method, original types: [com.google.gson.stream.JsonWriter, java.lang.Object] */ diff --git a/app/src/main/java/com/discord/api/application/Application.java b/app/src/main/java/com/discord/api/application/Application.java index 1938f612e6..1ee79fc557 100644 --- a/app/src/main/java/com/discord/api/application/Application.java +++ b/app/src/main/java/com/discord/api/application/Application.java @@ -12,6 +12,7 @@ public final class Application { private final String coverImage; private final String deeplinkUri; private final String description; + private final Long guildId; private final String icon; /* renamed from: id reason: collision with root package name */ @@ -19,6 +20,7 @@ public final class Application { private final String name; private final String splash; private final List thirdPartySkus; + private final ApplicationType type; public final String a() { String removeSuffix; @@ -56,8 +58,8 @@ public final class Application { return arrayList2; } - public final String e() { - return this.icon; + public final Long e() { + return this.guildId; } public boolean equals(Object obj) { @@ -68,19 +70,19 @@ public final class Application { return false; } Application application = (Application) obj; - return this.f1592id == application.f1592id && m.areEqual(this.name, application.name) && m.areEqual(this.description, application.description) && m.areEqual(this.splash, application.splash) && m.areEqual(this.coverImage, application.coverImage) && m.areEqual(this.icon, application.icon) && m.areEqual(this.thirdPartySkus, application.thirdPartySkus) && m.areEqual(this.deeplinkUri, application.deeplinkUri); + return this.f1592id == application.f1592id && m.areEqual(this.name, application.name) && m.areEqual(this.description, application.description) && m.areEqual(this.splash, application.splash) && m.areEqual(this.coverImage, application.coverImage) && m.areEqual(this.icon, application.icon) && m.areEqual(this.thirdPartySkus, application.thirdPartySkus) && m.areEqual(this.deeplinkUri, application.deeplinkUri) && m.areEqual(this.type, application.type) && m.areEqual(this.guildId, application.guildId); } - public final long f() { + public final String f() { + return this.icon; + } + + public final long g() { return this.f1592id; } - public final String g() { - return this.name; - } - public final String h() { - return this.splash; + return this.name; } public int hashCode() { @@ -100,10 +102,22 @@ public final class Application { List list = this.thirdPartySkus; int hashCode6 = (hashCode5 + (list != null ? list.hashCode() : 0)) * 31; String str6 = this.deeplinkUri; - if (str6 != null) { - i2 = str6.hashCode(); + int hashCode7 = (hashCode6 + (str6 != null ? str6.hashCode() : 0)) * 31; + ApplicationType applicationType = this.type; + int hashCode8 = (hashCode7 + (applicationType != null ? applicationType.hashCode() : 0)) * 31; + Long l = this.guildId; + if (l != null) { + i2 = l.hashCode(); } - return hashCode6 + i2; + return hashCode8 + i2; + } + + public final String i() { + return this.splash; + } + + public final ApplicationType j() { + return this.type; } public String toString() { @@ -122,6 +136,10 @@ public final class Application { R.append(", thirdPartySkus="); R.append(this.thirdPartySkus); R.append(", deeplinkUri="); - return a.H(R, this.deeplinkUri, ")"); + R.append(this.deeplinkUri); + R.append(", type="); + R.append(this.type); + R.append(", guildId="); + return a.F(R, this.guildId, ")"); } } diff --git a/app/src/main/java/com/discord/api/application/ApplicationType.java b/app/src/main/java/com/discord/api/application/ApplicationType.java new file mode 100644 index 0000000000..187eb2c4d6 --- /dev/null +++ b/app/src/main/java/com/discord/api/application/ApplicationType.java @@ -0,0 +1,31 @@ +package com.discord.api.application; + +import kotlin.jvm.internal.DefaultConstructorMarker; +/* compiled from: ApplicationType.kt */ +public enum ApplicationType { + UNKNOWN(0), + GAME(1), + MUSIC(2), + TICKETED_EVENTS(3), + GUILD_ROLE_SUBSCRIPTIONS(4); + + public static final Companion Companion = new Companion(null); + private final int apiValue; + + /* compiled from: ApplicationType.kt */ + public static final class Companion { + public Companion() { + } + + public Companion(DefaultConstructorMarker defaultConstructorMarker) { + } + } + + private ApplicationType(int i) { + this.apiValue = i; + } + + public final int getApiValue() { + return this.apiValue; + } +} diff --git a/app/src/main/java/com/discord/api/application/ApplicationTypeAdapter.java b/app/src/main/java/com/discord/api/application/ApplicationTypeAdapter.java new file mode 100644 index 0000000000..c71cd57238 --- /dev/null +++ b/app/src/main/java/com/discord/api/application/ApplicationTypeAdapter.java @@ -0,0 +1,45 @@ +package com.discord.api.application; + +import c.c.a.a0.d; +import com.discord.api.application.ApplicationType; +import com.google.gson.TypeAdapter; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import d0.z.d.m; +import java.util.Objects; +/* compiled from: ApplicationType.kt */ +public final class ApplicationTypeAdapter extends TypeAdapter { + + public final /* synthetic */ class WhenMappings { + public static final /* synthetic */ int[] $EnumSwitchMapping$0; + + static { + ApplicationType.values(); + int[] iArr = new int[5]; + $EnumSwitchMapping$0 = iArr; + iArr[ApplicationType.UNKNOWN.ordinal()] = 1; + } + } + + /* Return type fixed from 'java.lang.Object' to match base method */ + @Override // com.google.gson.TypeAdapter + public ApplicationType read(JsonReader jsonReader) { + m.checkNotNullParameter(jsonReader, "in"); + ApplicationType.Companion companion = ApplicationType.Companion; + Integer l1 = d.l1(jsonReader); + Objects.requireNonNull(companion); + return (l1 != null && l1.intValue() == 1) ? ApplicationType.GAME : (l1 != null && l1.intValue() == 2) ? ApplicationType.MUSIC : (l1 != null && l1.intValue() == 3) ? ApplicationType.TICKETED_EVENTS : (l1 != null && l1.intValue() == 4) ? ApplicationType.GUILD_ROLE_SUBSCRIPTIONS : ApplicationType.UNKNOWN; + } + + /* JADX DEBUG: Method arguments types fixed to match base method, original types: [com.google.gson.stream.JsonWriter, java.lang.Object] */ + @Override // com.google.gson.TypeAdapter + public void write(JsonWriter jsonWriter, ApplicationType applicationType) { + ApplicationType applicationType2 = applicationType; + m.checkNotNullParameter(jsonWriter, "out"); + if (applicationType2 != null) { + jsonWriter.D(applicationType2.ordinal() != 0 ? Integer.valueOf(applicationType2.getApiValue()) : null); + } else { + jsonWriter.s(); + } + } +} diff --git a/app/src/main/java/com/discord/api/channel/ChannelUtils$getSortByNameAndType$1.java b/app/src/main/java/com/discord/api/channel/ChannelUtils$getSortByNameAndType$1.java index 4371f29b4e..557df649fb 100644 --- a/app/src/main/java/com/discord/api/channel/ChannelUtils$getSortByNameAndType$1.java +++ b/app/src/main/java/com/discord/api/channel/ChannelUtils$getSortByNameAndType$1.java @@ -36,10 +36,10 @@ public final class ChannelUtils$getSortByNameAndType$1 implements Comparator< return -1; } else { if (channel4.A() != 4) { - if (channel3.A() == 0 && ChannelUtils.s(channel4)) { + if (channel3.A() == 0 && ChannelUtils.t(channel4)) { return -1; } - if (!ChannelUtils.s(channel3) || channel4.A() != 0) { + if (!ChannelUtils.t(channel3) || channel4.A() != 0) { if (channel3.t() != channel4.t()) { i2 = channel3.t(); i = channel4.t(); diff --git a/app/src/main/java/com/discord/api/channel/ChannelUtils.java b/app/src/main/java/com/discord/api/channel/ChannelUtils.java index 69319d22e9..9cea1a2508 100644 --- a/app/src/main/java/com/discord/api/channel/ChannelUtils.java +++ b/app/src/main/java/com/discord/api/channel/ChannelUtils.java @@ -3,15 +3,19 @@ package com.discord.api.channel; import android.content.Context; import com.discord.R; import com.discord.api.channel.Channel; +import com.discord.api.guild.GuildFeature; +import com.discord.api.permission.Permission; import com.discord.api.permission.PermissionOverwrite; import com.discord.api.role.GuildRole; import com.discord.api.thread.ThreadMetadata; import com.discord.api.user.User; +import com.discord.models.guild.Guild; import com.discord.models.presence.Presence; import com.discord.models.user.CoreUser; import com.discord.utilities.PermissionOverwriteUtilsKt; import com.discord.utilities.guilds.GuildUtilsKt; import com.discord.utilities.guilds.RoleUtils; +import com.discord.utilities.permissions.PermissionUtils; import com.discord.utilities.user.UserUtils; import d0.t.n; import d0.t.o; @@ -21,6 +25,7 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.Iterator; import java.util.List; +import java.util.Map; /* compiled from: ChannelUtils.kt */ public final class ChannelUtils { private static final long HQ_DIRECTORY_CHANNEL_ID = 883060064561299456L; @@ -39,7 +44,7 @@ public final class ChannelUtils { public static final boolean B(Channel channel) { m.checkNotNullParameter(channel, "$this$isTextChannel"); - return x(channel) || r(channel); + return x(channel) || s(channel); } public static final boolean C(Channel channel) { @@ -113,7 +118,7 @@ public final class ChannelUtils { m.checkNotNullParameter(context, "context"); String c2 = c(channel); boolean z3 = false; - if (q(channel) || i(channel)) { + if (r(channel) || i(channel)) { if (c2.length() == 0) { z3 = true; } @@ -128,7 +133,7 @@ public final class ChannelUtils { sb.append(c2); return sb.toString(); } - } else if (s(channel)) { + } else if (t(channel)) { if (c2.length() == 0) { z3 = true; } @@ -260,50 +265,83 @@ public final class ChannelUtils { return channel.A() == 3; } - public static final boolean q(Channel channel) { - m.checkNotNullParameter(channel, "$this$isGuildTextChannel"); - return channel.A() == 0 || channel.A() == 15; - } - - public static final boolean r(Channel channel) { - m.checkNotNullParameter(channel, "$this$isGuildTextyChannel"); - return l(channel.A()); - } - - public static final boolean s(Channel channel) { - m.checkNotNullParameter(channel, "$this$isGuildVocalChannel"); - return channel.A() == 2 || channel.A() == 13; - } - - public static final boolean t(Channel channel) { - m.checkNotNullParameter(channel, "$this$isHQDirectoryChannel"); - return channel.h() == HQ_DIRECTORY_CHANNEL_ID; - } - - public static final boolean u(Channel channel) { - m.checkNotNullParameter(channel, "$this$isManaged"); - return channel.b() != 0; - } - - public static final boolean v(Channel channel) { - m.checkNotNullParameter(channel, "$this$isMultiUserDM"); - return channel.A() == 3; - } - - public static final boolean w(Channel channel) { - m.checkNotNullParameter(channel, "$this$isPremium"); - List s2 = channel.s(); - if (s2 != null) { + public static final boolean q(Channel channel, Guild guild, GuildRole guildRole, Map map) { + Object obj; + boolean z2; + m.checkNotNullParameter(channel, "$this$isGuildRoleSubscriptionChannel"); + if (guild != null && guild.hasFeature(GuildFeature.ROLE_SUBSCRIPTIONS_AVAILABLE_FOR_PURCHASE)) { + List s2 = channel.s(); + if (s2 == null) { + s2 = n.emptyList(); + } for (PermissionOverwrite permissionOverwrite : s2) { - GuildRole guildRole = GuildUtilsKt.getGuildRole(Long.valueOf(permissionOverwrite.e())); - if (guildRole != null && RoleUtils.hasSubscriptionListingId(guildRole) && PermissionOverwriteUtilsKt.grantsAccessTo(permissionOverwrite, channel)) { + GuildRole guildRole2 = GuildUtilsKt.getGuildRole(Long.valueOf(permissionOverwrite.e())); + if (guildRole2 != null && RoleUtils.isSubscriptionRolePurchasableOrHasSubscribers(guildRole2) && PermissionOverwriteUtilsKt.grantsAccessTo(permissionOverwrite, channel)) { return true; } } + boolean isFullyGatedGuildRoleSubscriptionGuild = GuildUtilsKt.isFullyGatedGuildRoleSubscriptionGuild(guild, guildRole); + Iterator it = s2.iterator(); + while (true) { + if (!it.hasNext()) { + obj = null; + break; + } + obj = it.next(); + if (((PermissionOverwrite) obj).e() == guild.getId()) { + z2 = true; + continue; + } else { + z2 = false; + continue; + } + if (z2) { + break; + } + } + PermissionOverwrite permissionOverwrite2 = (PermissionOverwrite) obj; + boolean deniesAccessTo = permissionOverwrite2 != null ? PermissionOverwriteUtilsKt.deniesAccessTo(permissionOverwrite2, channel) : false; + if (map != null && !deniesAccessTo && isFullyGatedGuildRoleSubscriptionGuild) { + for (GuildRole guildRole3 : map.values()) { + if (RoleUtils.isSubscriptionRolePurchasableOrHasSubscribers(guildRole3) && PermissionUtils.INSTANCE.canRole(Permission.VIEW_CHANNEL, guildRole3, null)) { + return true; + } + } + } } return false; } + public static final boolean r(Channel channel) { + m.checkNotNullParameter(channel, "$this$isGuildTextChannel"); + return channel.A() == 0 || channel.A() == 15; + } + + public static final boolean s(Channel channel) { + m.checkNotNullParameter(channel, "$this$isGuildTextyChannel"); + return l(channel.A()); + } + + public static final boolean t(Channel channel) { + m.checkNotNullParameter(channel, "$this$isGuildVocalChannel"); + return channel.A() == 2 || channel.A() == 13; + } + + public static final boolean u(Channel channel) { + m.checkNotNullParameter(channel, "$this$isHQDirectoryChannel"); + return channel.h() == HQ_DIRECTORY_CHANNEL_ID; + } + + public static final boolean v(Channel channel) { + m.checkNotNullParameter(channel, "$this$isManaged"); + return channel.b() != 0; + } + + public static final boolean w(Channel channel) { + m.checkNotNullParameter(channel, "$this$isMultiUserDM"); + return channel.A() == 3; + } + public static final boolean x(Channel channel) { m.checkNotNullParameter(channel, "$this$isPrivate"); return channel.A() == 1 || channel.A() == 3; diff --git a/app/src/main/java/com/discord/api/commands/ApplicationCommandType.java b/app/src/main/java/com/discord/api/commands/ApplicationCommandType.java index aef227c3fc..453571bc78 100644 --- a/app/src/main/java/com/discord/api/commands/ApplicationCommandType.java +++ b/app/src/main/java/com/discord/api/commands/ApplicationCommandType.java @@ -13,6 +13,7 @@ public enum ApplicationCommandType { ROLE(8), MENTIONABLE(9), NUMBER(10), + ATTACHMENT(11), UNKNOWN(0); public static final Companion Companion = new Companion(null); diff --git a/app/src/main/java/com/discord/api/commands/CommandTypeAdapter.java b/app/src/main/java/com/discord/api/commands/CommandTypeAdapter.java index 2998ae9d6a..6d460248b8 100644 --- a/app/src/main/java/com/discord/api/commands/CommandTypeAdapter.java +++ b/app/src/main/java/com/discord/api/commands/CommandTypeAdapter.java @@ -36,6 +36,8 @@ public final class CommandTypeAdapter extends TypeAdapter