102.0 - Alpha (102200)

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId 'com.discord'
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 101203
+        versionCode 102200
-        versionName "101.3 - Alpha"
+        versionName "102.0 - Alpha"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/AndroidManifest.xml

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

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);
         }

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<Class<? extends Object>, Function0<Object>> 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<Class<? extends Object>, Function0<Object>> a = h0.mapOf(o.to(ActivityPlatform.class, b.i), o.to(ApplicationStatus.class, C0023a.C), o.to(UtcDateTime.class, C0023a.G), o.to(NsfwAllowance.class, C0023a.H), o.to(PremiumTier.class, C0023a.I), o.to(ActivityType.class, C0023a.J), o.to(Phone.class, C0023a.K), o.to(ApplicationCommandType.class, C0023a.L), o.to(OAuthScope.class, C0023a.M), 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), o.to(ApplicationType.class, C0023a.F));
     public static final List<c.i.d.o> b = n.listOf((Object[]) new c.i.d.o[]{ComponentRuntimeTypeAdapter.INSTANCE.a(), new NullSerializableTypeAdapterFactory()});
 
     /* compiled from: kotlin-style lambda group */
@@ -92,6 +94,7 @@ 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 i = new C0023a(0);
         public static final C0023a j = new C0023a(1);
         public static final C0023a k = new C0023a(2);
@@ -118,18 +121,18 @@ 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 N;
 
         /* 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.N = i2;
         }
 
         @Override // kotlin.jvm.functions.Function0
         /* renamed from: invoke */
         public final Object mo1invoke() {
-            switch (this.M) {
+            switch (this.N) {
                 case 0:
                     return new GuildVerificationLevelTypeAdapter();
                 case 1:
@@ -177,18 +180,20 @@ public final class a {
                 case 22:
                     return new PriceTierTypeAdapter();
                 case 23:
-                    return new UtcDateTimeTypeAdapter();
+                    return new ApplicationTypeAdapter();
                 case 24:
-                    return new NsfwAllowanceTypeAdapter();
+                    return new UtcDateTimeTypeAdapter();
                 case 25:
-                    return new PremiumTierTypeAdapter();
+                    return new NsfwAllowanceTypeAdapter();
                 case 26:
-                    return new ActivityTypeTypeAdapter();
+                    return new PremiumTierTypeAdapter();
                 case 27:
-                    return new PhoneTypeAdapter();
+                    return new ActivityTypeTypeAdapter();
                 case 28:
-                    return new CommandTypeAdapter();
+                    return new PhoneTypeAdapter();
                 case 29:
+                    return new CommandTypeAdapter();
+                case 30:
                     return new OAuthScopeTypeAdapter();
                 default:
                     throw null;

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<String, String> map = renderContext.a;
-        List<? extends Object> list = renderContext.f2127c;
+        List<? extends Object> list = renderContext.f2128c;
         boolean z2 = true;
         if (!map.isEmpty()) {
             charSequence = a.replace(charSequence, new f(map));

app/src/main/java/c/a/k/f/c.java

@@ -38,7 +38,7 @@ public final class c extends Node.a<RenderContext> {
                 spannableStringBuilder.setSpan(obj2, length, spannableStringBuilder.length(), 33);
             }
         }
-        Hook.a aVar2 = hook != null ? hook.f2126c : null;
+        Hook.a aVar2 = hook != null ? hook.f2127c : null;
         if (aVar2 != null) {
             aVar = aVar2;
         } else if (URLUtil.isValidUrl(this.a)) {

app/src/main/java/c/a/q/a0.java

@@ -24,7 +24,7 @@ public final /* synthetic */ class a0 extends k implements Function1<Pair<? exte
         Pair<? extends Map<String, ? extends EncodeQuality>, ? extends RtcConnection.State> pair2 = pair;
         m.checkNotNullParameter(pair2, "p1");
         RtcConnection rtcConnection = (RtcConnection) this.receiver;
-        if (rtcConnection.f2190a0) {
+        if (rtcConnection.f2191a0) {
             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);

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.f2211c.ordinal() != 0) {
             StringBuilder R = c.d.b.a.a.R("Unsupported protocol: ");
-            R.append(transportInfo.f2210c);
+            R.append(transportInfo.f2211c);
             R.append('.');
             RtcConnection.j(rtcConnection, true, R.toString(), null, false, 12);
         } else {

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.f2197z = 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.f2197z++;
         }
         double d = (double) j;
         Objects.requireNonNull(RtcConnection.Quality.Companion);

app/src/main/java/c/a/q/j.java

@@ -34,7 +34,7 @@ public final class j extends o implements Function0<Unit> {
         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.f2189c.contains(l2)) {
             MediaSinkWantsManager mediaSinkWantsManager2 = this.this$0;
             Long l3 = this.$userId;
             mediaSinkWantsManager2.e = l3;

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<Integer, Integer> serializedSubject = discordAudioManager.f2202y;
+        SerializedSubject<Integer, Integer> serializedSubject = discordAudioManager.f2203y;
         serializedSubject.j.onNext(Integer.valueOf(streamVolume));
     }
 }

app/src/main/java/c/a/q/l.java

@@ -96,10 +96,10 @@ public final class l extends o implements Function0<Unit> {
         }
         if (arrayList2.isEmpty()) {
             this.this$0.b.remove(Long.valueOf(this.$userId));
-            this.this$0.f2188c.remove(Long.valueOf(this.$userId));
+            this.this$0.f2189c.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.f2189c.add(Long.valueOf(this.$userId));
         }
         this.this$0.d(arrayList2.isEmpty() ? n.emptyList() : d0.t.m.listOf(String.valueOf(this.$userId)));
         return Unit.a;

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.f2214c.release();
                 JniCommon.nativeFreeByteBuffer(thumbnailEmitter.b);
                 thumbnailEmitter.a = RecyclerView.FOREVER_NS;
             }

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.f2213c);
             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.f2212c, 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.f2210c;
         Object[] array = aVar.d.toArray(new StreamParameters[0]);
         Objects.requireNonNull(array, "null cannot be cast to non-null type kotlin.Array<T>");
         Connection connectToServer = discord.connectToServer(i2, j2, str, i3, (StreamParameters[]) array, new d(this));

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.f2209c;
             Discord discord3 = kVar3.f;
             if (discord3 != null) {
                 discord3.setNoiseSuppression(z4);

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.f2208c, echoCancellationInfo.d, this.$requestEnable, this.$enabled, this.$requestMobileMode, this.$previouslyEnabled, this.$previouslyMobileMode);
                 d.c1("MediaEngineLegacy", "onEchoCancellationUpdated: " + echoCancellationInfo2);
                 this.this$0.a.p.onEchoCancellationUpdated(echoCancellationInfo2);
             }

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.f2846c;
             aVar.b(sSLSocketFactory, f0.e0.k.h.a.n());
         }
         String H = c.d.b.a.a.H(new StringBuilder(), this.C, "?v=5");

app/src/main/java/c/a/q/o0/a.java

@@ -98,13 +98,13 @@ public final /* synthetic */ class a extends k implements Function1<Stats, Unit>
                     if (booleanValue) {
                         krispOveruseDetector.d.f(KrispOveruseDetector.Status.CPU_OVERUSE);
                     } else if (longValue == 0) {
-                        int i = krispOveruseDetector.f2187c + 1;
+                        int i = krispOveruseDetector.f2188c + 1;
-                        krispOveruseDetector.f2187c = i;
+                        krispOveruseDetector.f2188c = i;
                         if (i > 2) {
                             krispOveruseDetector.d.f(KrispOveruseDetector.Status.FAILED);
                         }
                     } else {
-                        krispOveruseDetector.f2187c = 0;
+                        krispOveruseDetector.f2188c = 0;
                     }
                 }
                 krispOveruseDetector.b = stats2.getOutboundRtpAudio();

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.f2194s.onNext(stateChange);
     }
 }

app/src/main/java/c/a/q/s.java

@@ -53,8 +53,8 @@ public final class s extends o implements Function0<Unit> {
                 rtcConnection.r("connecting via endpoint: " + replace$default + " token: " + str2);
                 try {
                     URI uri = new URI(w);
-                    rtcConnection.f2194x = uri.getHost();
+                    rtcConnection.f2195x = uri.getHost();
-                    rtcConnection.f2195y = Integer.valueOf(uri.getPort());
+                    rtcConnection.f2196y = 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)));
                 }

app/src/main/java/c/a/r/b.java

@@ -77,7 +77,7 @@ public final class b extends k implements Function2<CoroutineScope, Continuation
             }
             String joinToString$default = u.joinToString$default(arrayList, "&", null, null, 0, null, null, 62, null);
             RequestBody.Companion companion = RequestBody.Companion;
-            MediaType.a aVar = MediaType.f2962c;
+            MediaType.a aVar = MediaType.f2963c;
             RequestBody a = companion.a(joinToString$default, MediaType.a.a(ShareTarget.ENCODING_TYPE_URL_ENCODED));
             Request.a aVar2 = new Request.a();
             m.checkParameterIsNotNull(a, "body");

app/src/main/java/c/c/a/a0/d.java

@@ -1197,7 +1197,7 @@ public class d {
         function1.invoke(renderContext);
         if (!(objArr.length == 0)) {
             if (!(!renderContext.a.isEmpty())) {
-                renderContext.f2127c = k.toList(objArr);
+                renderContext.f2128c = k.toList(objArr);
             } else {
                 throw new IllegalArgumentException("must provide named arguments OR formatArgs, not both.");
             }

app/src/main/java/c/e/b/c.java

@@ -77,8 +77,8 @@ public abstract class c {
                     q(fVar, replace2, arrayList, w.i);
                     n(fVar, replace2, arrayList, w.g);
                     q(fVar, replace2, arrayList, w.g);
-                    n(fVar, replace2, arrayList, w.f2912c);
+                    n(fVar, replace2, arrayList, w.f2913c);
-                    q(fVar, replace2, arrayList, w.f2912c);
+                    q(fVar, replace2, arrayList, w.f2913c);
                     o(fVar, replace2, arrayList);
                     cls2 = b.a(v, fVar.b());
                 }

app/src/main/java/c/f/g/a/a/c.java

@@ -311,13 +311,13 @@ public class c extends AbstractDraweeController<CloseableReference<c.f.j.j.c>, 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.f2296c) == null) {
             if (!(imageRequestArr == null || imageRequestArr.length <= 0 || imageRequestArr[0] == null)) {
                 ImageRequest imageRequest3 = imageRequestArr[0];
-                uri = imageRequest3 != null ? imageRequest3.f2295c : null;
+                uri = imageRequest3 != null ? imageRequest3.f2296c : null;
             }
             if (imageRequest2 != null) {
-                return imageRequest2.f2295c;
+                return imageRequest2.f2296c;
             }
             return null;
         }

app/src/main/java/c/f/g/a/a/d.java

@@ -85,7 +85,7 @@ public class d extends AbstractDraweeControllerBuilder<d, ImageRequest, Closeabl
         c.f.j.r.b.b();
         try {
             DraweeController draweeController = this.n;
-            String valueOf = String.valueOf(AbstractDraweeControllerBuilder.f2282c.getAndIncrement());
+            String valueOf = String.valueOf(AbstractDraweeControllerBuilder.f2283c.getAndIncrement());
             if (draweeController instanceof c) {
                 cVar = (c) draweeController;
             } else {

app/src/main/java/c/f/g/f/b.java

@@ -30,7 +30,7 @@ public class b extends g implements f0 {
                 if (!draweeHolder.a) {
                     a.m(c.class, "%x: Draw requested for a non-attached controller %x. %s", Integer.valueOf(System.identityHashCode(draweeHolder)), Integer.valueOf(System.identityHashCode(draweeHolder.e)), draweeHolder.toString());
                     draweeHolder.b = true;
-                    draweeHolder.f2286c = true;
+                    draweeHolder.f2287c = true;
                     draweeHolder.b();
                 }
             }

app/src/main/java/c/f/j/c/f.java

@@ -155,7 +155,7 @@ public class f {
         Objects.requireNonNull((z) this.g);
         Executor executor = z.g.a;
         if (eVar instanceof Boolean) {
-            return ((Boolean) eVar).booleanValue() ? z.g.f2993c : z.g.d;
+            return ((Boolean) eVar).booleanValue() ? z.g.f2994c : z.g.d;
         }
         z.g<e> gVar = new z.g<>();
         if (gVar.h(eVar)) {

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.f2296c.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.f2296c.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.f2296c.toString(), imageRequest.i, imageRequest.j, imageRequest.h, cacheKey, str, obj);
     }
 }

app/src/main/java/c/f/j/c/v.java

@@ -262,7 +262,7 @@ public class v<K, V> implements m<K, V>, w<K, V> {
             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.f2289c, memoryCacheParams2.a - f()));
             h(p);
         }
         i(p);

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.f2277c, 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);
     }

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.f2296c)) {
                         z2 = false;
                         c1 c1Var = new c1(imageRequest, valueOf, str, b0Var, obj, f, false, z2, imageRequest.l, this.l);
                         c.f.j.r.b.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.f2296c;
             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.f2297s > 0) {
                 synchronized (this) {
                     oVar = new o(r0Var, this.b.j.g());
                 }

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.f2296c), -1);
     }
 
     @Override // c.f.j.p.g0

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.f2296c);
         this.d = str2;
         this.e = y0Var;
         this.f = obj;

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.f2296c.getPath().substring(1), 2);
         AssetFileDescriptor assetFileDescriptor = null;
         try {
-            assetFileDescriptor = this.f479c.openFd(imageRequest.f2295c.getPath().substring(1));
+            assetFileDescriptor = this.f479c.openFd(imageRequest.f2296c.getPath().substring(1));
             i = (int) assetFileDescriptor.getLength();
         } catch (IOException unused) {
             i = -1;

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.f2296c;
         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())) {

app/src/main/java/c/f/j/p/f0.java

@@ -42,7 +42,7 @@ public class f0 extends g0 implements j1<e> {
         c.f.j.d.e eVar;
         Cursor query;
         e f2;
-        Uri uri = imageRequest.f2295c;
+        Uri uri = imageRequest.f2296c;
         if (!b.b(uri) || (eVar = imageRequest.i) == null || (query = this.g.query(uri, f481c, null, null, null)) == null) {
             return null;
         }

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.f2296c.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.f2296c.getPath().substring(1)));
             i = (int) assetFileDescriptor.getLength();
         } catch (Resources.NotFoundException unused) {
             i = -1;

app/src/main/java/c/f/j/p/j0.java

@@ -83,7 +83,7 @@ public class j0 implements v0<CloseableReference<c>> {
                 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.f2296c, "r");
                     MediaMetadataRetriever mediaMetadataRetriever = new MediaMetadataRetriever();
                     mediaMetadataRetriever.setDataSource(openFileDescriptor.getFileDescriptor());
                     bitmap = mediaMetadataRetriever.getFrameAtTime(-1);
@@ -141,7 +141,7 @@ public class j0 implements v0<CloseableReference<c>> {
         String str;
         Uri uri;
         Objects.requireNonNull(j0Var);
-        Uri uri2 = imageRequest.f2295c;
+        Uri uri2 = imageRequest.f2296c;
         if (c.f.d.l.b.d(uri2)) {
             return imageRequest.a().getPath();
         }

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.f2296c.toString();
         d.i(Boolean.valueOf(uri.substring(0, 5).equals("data:")));
         int indexOf = uri.indexOf(44);
         String substring = uri.substring(indexOf + 1, uri.length());

app/src/main/java/c/f/j/p/n.java

@@ -141,7 +141,7 @@ public class n implements v0<CloseableReference<c.f.j.j.c>> {
                     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.f2296c)) {
                             eVar.p = c.c.a.a0.d.Z(e2.j, e2.i, eVar, this.b);
                         }
                     }
@@ -179,7 +179,7 @@ public class n implements v0<CloseableReference<c.f.j.j.c>> {
                                 synchronized (c0Var) {
                                     j = c0Var.j - c0Var.i;
                                 }
-                                String valueOf2 = String.valueOf(cVar2.f497c.e().f2295c);
+                                String valueOf2 = String.valueOf(cVar2.f497c.e().f2296c);
                                 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<CloseableReference<c.f.j.j.c>> {
     public void b(l<CloseableReference<c.f.j.j.c>> 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().f2296c) ? 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();

app/src/main/java/c/f/j/p/o.java

@@ -36,7 +36,7 @@ public class o implements v0<CloseableReference<c>> {
         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.f2297s, TimeUnit.MILLISECONDS);
         } else {
             this.a.b(lVar, w0Var);
         }

app/src/main/java/c/f/j/p/o0.java

@@ -64,7 +64,7 @@ public class o0 implements c<e, Void> {
                     this.f499c.b(eVar2, 9);
                 } else {
                     this.f499c.b(eVar2, 8);
-                    ImageRequestBuilder b = ImageRequestBuilder.b(e.f2295c);
+                    ImageRequestBuilder b = ImageRequestBuilder.b(e.f2296c);
                     b.e = e.h;
                     b.o = e.k;
                     b.f = e.b;
@@ -73,11 +73,11 @@ public class o0 implements c<e, Void> {
                     b.j = e.q;
                     b.g = e.f;
                     b.i = e.l;
-                    b.f2297c = e.i;
+                    b.f2298c = e.i;
                     b.n = e.r;
                     b.d = e.j;
                     b.m = e.p;
-                    b.p = e.f2296s;
+                    b.p = e.f2297s;
                     int i = f2 - 1;
                     if (i >= 0) {
                         z3 = true;

app/src/main/java/c/f/j/p/q0.java

@@ -185,7 +185,7 @@ public class q0 implements v0<e> {
             return;
         }
         w0Var.o().e(w0Var, "PartialDiskCacheProducer");
-        Uri build = e.f2295c.buildUpon().appendQueryParameter("fresco_partial", "true").build();
+        Uri build = e.f2296c.buildUpon().appendQueryParameter("fresco_partial", "true").build();
         i iVar = this.b;
         w0Var.b();
         Objects.requireNonNull((n) iVar);

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().f2296c, 5);
             try {
                 aVar.e = a0Var.f472c.now();
                 if (httpURLConnection != null) {

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.f2300c;
         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.f2300c.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.f2300c.writeLock().unlock();
                         if (SoLoader.e == i3) {
                             throw e;
                         }
                     } catch (IOException e2) {
                         throw new RuntimeException(e2);
                     } catch (Throwable th2) {
-                        SoLoader.f2299c.writeLock().unlock();
+                        SoLoader.f2300c.writeLock().unlock();
                         throw th2;
                     }
                 }
             } while (z2);
             return z5;
         } finally {
-            SoLoader.f2299c.readLock().unlock();
+            SoLoader.f2300c.readLock().unlock();
         }
     }
 }

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.f2365c.execute(new Loader.g(e0Var));
-        loader.f2364c.shutdown();
+        loader.f2365c.shutdown();
         e0Var.f653z.removeCallbacksAndMessages(null);
         e0Var.A = null;
         e0Var.V = true;

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.f2307c, 2) : AudioProcessor.a.a;
         }
         throw new AudioProcessor.UnhandledAudioFormatException(aVar);
     }

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.f2307c, 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.f2307c, this.f889c, this.d, aVar2.b);
             } else {
                 d0 d0Var = this.j;
                 if (d0Var != null) {

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.f2307c != iArr.length;
             int i = 0;
             while (i < iArr.length) {
                 int i2 = iArr[i];
-                if (i2 < aVar.f2306c) {
+                if (i2 < aVar.f2307c) {
                     z2 |= i2 != i;
                     i++;
                 } else {

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.f2307c, 4) : AudioProcessor.a.a;
         }
         throw new AudioProcessor.UnhandledAudioFormatException(aVar);
     }

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.f2323c;
             if (drmSession != null) {
                 drmSession.b(dVar.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.f2323c = defaultDrmSessionManager.e(looper, dVar.b, j1Var, false);
             DefaultDrmSessionManager.this.n.add(dVar);
         }
     }

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.f2322x;
         Objects.requireNonNull(cVar);
         cVar.obtainMessage(i, bArr).sendToTarget();
     }

app/src/main/java/c/i/a/f/c/a/f/a.java

@@ -17,7 +17,7 @@ public class a extends b<GoogleSignInOptions> {
     public final synchronized int f() {
         if (j == 1) {
             Context context = this.a;
-            Object obj = GoogleApiAvailability.f2382c;
+            Object obj = GoogleApiAvailability.f2383c;
             GoogleApiAvailability googleApiAvailability = GoogleApiAvailability.d;
             int b = googleApiAvailability.b(context, 12451000);
             if (b == 0) {

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.f2378s;
             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.f2379s);
                 if (!TextUtils.isEmpty(googleSignInOptions.u)) {
                     jSONObject2.put("serverClientId", googleSignInOptions.u);
                 }

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.f2383c;
         this.o = gVar;
         jVar.a("ConnectionlessLifecycleHelper", this);
     }

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.f2383c;
         jVar.a("GmsAvailabilityHelper", this);
     }
 

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.f2383c;
                 l = new g(applicationContext, looper, GoogleApiAvailability.d);
             }
             gVar = l;

app/src/main/java/c/i/a/f/e/k/d.java

@@ -31,7 +31,7 @@ public abstract class d<T extends IInterface> extends b<T> 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.f2383c;
         GoogleApiAvailability googleApiAvailability = GoogleApiAvailability.d;
         Objects.requireNonNull(fVar, "null reference");
         Objects.requireNonNull(lVar, "null reference");

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.f2816c;
         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.f2814c);
         logger.fine(sb.toString());
     }
 

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.f2387c = -1;
         } else {
             int a = bVar.a(context, str, true);
             aVar.b = a;
             if (a != 0) {
-                aVar.f2386c = 1;
+                aVar.f2387c = 1;
             }
         }
         return aVar;

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.f2387c = 0;
         } else if (i >= aVar.b) {
-            aVar.f2386c = -1;
+            aVar.f2387c = -1;
         } else {
-            aVar.f2386c = 1;
+            aVar.f2387c = 1;
         }
         return aVar;
     }

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.f2387c = 0;
         } else if (a >= i) {
-            aVar.f2386c = 1;
+            aVar.f2387c = 1;
         } else {
-            aVar.f2386c = -1;
+            aVar.f2387c = -1;
         }
         return aVar;
     }

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.f2388c = 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.f2388c);
         zzhi.f(i, 4);
     }
 

app/src/main/java/c/i/a/f/h/l/u4.java

@@ -270,7 +270,7 @@ public abstract class u4<MessageType extends u4<MessageType, BuilderType>, 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.f2388c;
         if (g4Var == null) {
             g4Var = new g4(zzhi);
         }

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.f2394s));
         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));

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.f2393z, 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.f2392y) {
                                             bundle2.putLong("_dac", j2);
                                         }
                                         g K2 = K();
@@ -482,7 +482,7 @@ public class k9 implements t5 {
                                             } else {
                                                 j = 1;
                                             }
-                                            if (zzn.f2391y) {
+                                            if (zzn.f2392y) {
                                                 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.f2394s;
                     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.f2394s;
                         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())) {
+                if (!TextUtils.equals(zzn.f2393z, T.y())) {
-                    T.q(zzn.f2392z);
+                    T.q(zzn.f2393z);
                     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())) {
+                if (!TextUtils.isEmpty(zzn.f2390s) && !zzn.f2390s.equals(T.H())) {
-                    T.A(zzn.f2389s);
+                    T.A(zzn.f2390s);
                     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()) {
+                if (zzn.f2391x != T.i()) {
-                    T.r(zzn.f2390x);
+                    T.r(zzn.f2391x);
                     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.f2393z, T.y())) {
             }
             T.u(zzn.D);
             z2 = true;
-            T.A(zzn.f2389s);
+            T.A(zzn.f2390s);
             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.f2391x != 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.f2393z);
         if (da.b() && this.k.h.u(T.o(), p.f1229j0)) {
             T.u(zzn.D);
         }
-        if (!TextUtils.isEmpty(zzn.f2389s)) {
+        if (!TextUtils.isEmpty(zzn.f2390s)) {
-            T.A(zzn.f2389s);
+            T.A(zzn.f2390s);
         }
         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.f2391x);
         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)) {
+                if (TextUtils.isEmpty(u0.s0()) && TextUtils.isEmpty(u0.x0()) && !TextUtils.isEmpty(zzn.f2393z)) {
-                    u0.r0(zzn.f2392z);
+                    u0.r0(zzn.f2393z);
                 }
-            } else if (TextUtils.isEmpty(u0.s0()) && !TextUtils.isEmpty(zzn.f2392z)) {
+            } else if (TextUtils.isEmpty(u0.s0()) && !TextUtils.isEmpty(zzn.f2393z)) {
-                u0.r0(zzn.f2392z);
+                u0.r0(zzn.f2393z);
             }
             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.f2391x && (!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.f2390s);
                 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.f2393z) : !TextUtils.isEmpty(zzn.j) || !TextUtils.isEmpty(zzn.D) || !TextUtils.isEmpty(zzn.f2393z);
     }
 
     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.f2394s;
                         if (zzaq4 != null) {
                             arrayList.add(zzaq4);
                         }

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.f2393z);
     }
 
     public static boolean P(String str) {

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.f2394s;
             if (zzaq3 != null) {
                 bundle.putString("expired_event_name", zzaq3.i);
-                zzap zzap3 = zzz.f2393s.j;
+                zzap zzap3 = zzz.f2394s.j;
                 if (zzap3 != null) {
                     bundle.putBundle("expired_event_params", zzap3.x0());
                 }

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.f2393z, zzn.D);
     }
 }

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<Void> 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.f2395c), m), subscribeOptions), new m(m));
     }
 
     @Override // com.google.android.gms.nearby.messages.MessagesClient

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.f2426s;
         if (height != clockFaceView.j) {
             clockFaceView.j = height;
             clockFaceView.a();
             ClockHandView clockHandView = clockFaceView.l;
-            clockHandView.f2429z = clockFaceView.j;
+            clockHandView.f2430z = clockFaceView.j;
             clockHandView.invalidate();
         }
         return true;

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.f2428x = this;
         g(i, "%d");
         g(j, "%d");
         g(k, "%02d");

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.f2963c;
         RequestBody create = RequestBody.create(MediaType.a.b(str3), file);
         if (this.f == null) {
             MultipartBody.a aVar2 = new MultipartBody.a();

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.f2470s) {
                 ((JsonObject) N()).a.put(this.w, jsonElement);
             }
             this.w = null;

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.f2471c, aVar2);
                         result.a(k.e);
                         return result;
                     }

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.f2471c;
             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.f2471c;
                                     if (kVarArr != null) {
                                         float f = (float) i2;
                                         map2 = enumMap;

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.f2471c, a.UPC_A);
             Map<j, Object> map = result.e;
             if (map != null) {
                 result2.a(map);

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[] kVarArr = a2.f2471c;
-                k[] kVarArr2 = result.f2470c;
+                k[] kVarArr2 = result.f2471c;
                 if (kVarArr2 == null) {
-                    result.f2470c = kVarArr;
+                    result.f2471c = 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.f2471c = kVarArr3;
                 }
                 i2 = a2.a.length();
             } catch (ReaderException unused) {

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.f2474s;
             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.f2474s.j[i3] = Color.argb(i2, Color.red(i4), Color.green(i4), Color.blue(i4));
             i3++;
         }
         bVar.notifyDataSetChanged();

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.f2499s.post(new c.o.a.i(bVar, aVar));
             return;
         }
         i.i.a(3, "onPictureResult", "result is null: something went wrong.", exc);

app/src/main/java/c/o/a/n/k.java

@@ -23,7 +23,7 @@ public class k implements f<c, Void> {
         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.f2499s.post(new c.o.a.f(bVar, cVar2));
             return c.i.a.f.e.o.f.R(null);
         }
         throw new RuntimeException("Null options!");

app/src/main/java/c/o/a/n/m.java

@@ -16,6 +16,6 @@ public class m implements e<Void> {
     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.f2499s.post(new g(bVar));
     }
 }

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.f2500x.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.f2500x.e();
                             e2.e(i2);
                             e2.e = i2;
                             e2.d();
                         }
-                        CameraView.this.f2498s.post(new j(bVar, (i2 + i3) % 360));
+                        CameraView.this.f2499s.post(new j(bVar, (i2 + i3) % 360));
                         return;
                     }
                     return;

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) {
+                if (cameraView.f2502z == null) {
-                    cameraView.f2501z = new MediaActionSound();
+                    cameraView.f2502z = new MediaActionSound();
                 }
-                cameraView.f2501z.play(0);
+                cameraView.f2502z.play(0);
             }
-            CameraView.this.f2498s.post(new h(bVar));
+            CameraView.this.f2499s.post(new h(bVar));
         }
     }
 

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<ThirdPartySku> 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() {
+    public final Long e() {
-        return this.icon;
+        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<ThirdPartySku> list = this.thirdPartySkus;
         int hashCode6 = (hashCode5 + (list != null ? list.hashCode() : 0)) * 31;
         String str6 = this.deeplinkUri;
-        if (str6 != null) {
+        int hashCode7 = (hashCode6 + (str6 != null ? str6.hashCode() : 0)) * 31;
-            i2 = str6.hashCode();
+        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, ")");
     }
 }

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;
+    }
+}

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<ApplicationType> {
+
+    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();
+        }
+    }
+}

app/src/main/java/com/discord/databinding/WidgetServerSettingsEmptyGuildRoleSubscriptionBinding.java

@@ -5,15 +5,21 @@ import android.widget.Button;
 import androidx.annotation.NonNull;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.viewbinding.ViewBinding;
+import com.discord.app.AppViewFlipper;
 public final class WidgetServerSettingsEmptyGuildRoleSubscriptionBinding implements ViewBinding {
     @NonNull
     public final CoordinatorLayout a;
     @NonNull
     public final Button b;
+    @NonNull
 
-    public WidgetServerSettingsEmptyGuildRoleSubscriptionBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull Button button) {
+    /* renamed from: c  reason: collision with root package name */
+    public final AppViewFlipper f2004c;
+
+    public WidgetServerSettingsEmptyGuildRoleSubscriptionBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull Button button, @NonNull AppViewFlipper appViewFlipper) {
         this.a = coordinatorLayout;
         this.b = button;
+        this.f2004c = appViewFlipper;
     }
 
     @Override // androidx.viewbinding.ViewBinding

app/src/main/java/com/discord/databinding/WidgetServerSettingsGuildRoleSubscriptionEditTierBinding.java

@@ -21,7 +21,7 @@ public final class WidgetServerSettingsGuildRoleSubscriptionEditTierBinding impl
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final Group f2004c;
+    public final Group f2005c;
     @NonNull
     public final TabLayout d;
     @NonNull
@@ -36,7 +36,7 @@ public final class WidgetServerSettingsGuildRoleSubscriptionEditTierBinding impl
     public WidgetServerSettingsGuildRoleSubscriptionEditTierBinding(@NonNull ConstraintLayout constraintLayout, @NonNull MaterialButton materialButton, @NonNull TextView textView, @NonNull Group group, @NonNull TabLayout tabLayout, @NonNull ViewPager2 viewPager2, @NonNull Barrier barrier, @NonNull AppBarLayout appBarLayout, @NonNull MaterialButton materialButton2, @NonNull FloatingActionButton floatingActionButton, @NonNull AppViewFlipper appViewFlipper) {
         this.a = constraintLayout;
         this.b = materialButton;
-        this.f2004c = group;
+        this.f2005c = group;
         this.d = tabLayout;
         this.e = viewPager2;
         this.f = materialButton2;

app/src/main/java/com/discord/databinding/WidgetServerSettingsGuildRoleSubscriptionTierListBinding.java

@@ -14,12 +14,12 @@ public final class WidgetServerSettingsGuildRoleSubscriptionTierListBinding impl
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final AppViewFlipper f2005c;
+    public final AppViewFlipper f2006c;
 
     public WidgetServerSettingsGuildRoleSubscriptionTierListBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper) {
         this.a = coordinatorLayout;
         this.b = recyclerView;
-        this.f2005c = appViewFlipper;
+        this.f2006c = appViewFlipper;
     }
 
     @Override // androidx.viewbinding.ViewBinding

app/src/main/java/com/discord/databinding/WidgetServerSettingsGuildRoleSubscriptionsBinding.java

@@ -16,12 +16,12 @@ public final class WidgetServerSettingsGuildRoleSubscriptionsBinding implements
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final AppViewFlipper f2006c;
+    public final AppViewFlipper f2007c;
 
     public WidgetServerSettingsGuildRoleSubscriptionsBinding(@NonNull ConstraintLayout constraintLayout, @NonNull FragmentContainerView fragmentContainerView, @NonNull FragmentContainerView fragmentContainerView2, @NonNull AppBarLayout appBarLayout, @NonNull FloatingActionButton floatingActionButton, @NonNull AppViewFlipper appViewFlipper) {
         this.a = constraintLayout;
         this.b = floatingActionButton;
-        this.f2006c = appViewFlipper;
+        this.f2007c = appViewFlipper;
     }
 
     @Override // androidx.viewbinding.ViewBinding

app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteActionsBinding.java

@@ -13,7 +13,7 @@ public final class WidgetServerSettingsInstantInviteActionsBinding implements Vi
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2007c;
+    public final TextView f2008c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -22,7 +22,7 @@ public final class WidgetServerSettingsInstantInviteActionsBinding implements Vi
     public WidgetServerSettingsInstantInviteActionsBinding(@NonNull NestedScrollView nestedScrollView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull TextView textView3, @NonNull TextView textView4) {
         this.a = nestedScrollView;
         this.b = textView;
-        this.f2007c = textView2;
+        this.f2008c = textView2;
         this.d = textView3;
         this.e = textView4;
     }

app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInviteListItemBinding.java

@@ -16,7 +16,7 @@ public final class WidgetServerSettingsInstantInviteListItemBinding implements V
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final TextView f2008c;
+    public final TextView f2009c;
     @NonNull
     public final TextView d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetServerSettingsInstantInviteListItemBinding implements V
     public WidgetServerSettingsInstantInviteListItemBinding(@NonNull CardView cardView, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout, @NonNull View view, @NonNull LinearLayout linearLayout2, @NonNull TextView textView3, @NonNull TextView textView4, @NonNull LinearLayout linearLayout3, @NonNull ImageView imageView, @NonNull TextView textView5, @NonNull TextView textView6, @NonNull SettingsMemberView settingsMemberView) {
         this.a = cardView;
         this.b = textView;
-        this.f2008c = textView2;
+        this.f2009c = textView2;
         this.d = textView3;
         this.e = textView5;
         this.f = settingsMemberView;

app/src/main/java/com/discord/databinding/WidgetServerSettingsInstantInvitesBinding.java

@@ -15,12 +15,12 @@ public final class WidgetServerSettingsInstantInvitesBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final AppViewFlipper f2009c;
+    public final AppViewFlipper f2010c;
 
     public WidgetServerSettingsInstantInvitesBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper) {
         this.a = coordinatorLayout;
         this.b = recyclerView;
-        this.f2009c = appViewFlipper;
+        this.f2010c = appViewFlipper;
     }
 
     @Override // androidx.viewbinding.ViewBinding

app/src/main/java/com/discord/databinding/WidgetServerSettingsIntegrationListItemBinding.java

@@ -18,7 +18,7 @@ public final class WidgetServerSettingsIntegrationListItemBinding implements Vie
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final View f2010c;
+    public final View f2011c;
     @NonNull
     public final ImageView d;
     @NonNull
@@ -35,7 +35,7 @@ public final class WidgetServerSettingsIntegrationListItemBinding implements Vie
     public WidgetServerSettingsIntegrationListItemBinding(@NonNull FrameLayout frameLayout, @NonNull RelativeLayout relativeLayout, @NonNull View view, @NonNull ImageView imageView, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull TextView textView2, @NonNull ImageView imageView2, @NonNull CheckedSetting checkedSetting, @NonNull ProgressBar progressBar) {
         this.a = frameLayout;
         this.b = relativeLayout;
-        this.f2010c = view;
+        this.f2011c = view;
         this.d = imageView;
         this.e = textView;
         this.f = textView2;

app/src/main/java/com/discord/databinding/WidgetServerSettingsIntegrationsBinding.java

@@ -15,12 +15,12 @@ public final class WidgetServerSettingsIntegrationsBinding implements ViewBindin
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final AppViewFlipper f2011c;
+    public final AppViewFlipper f2012c;
 
     public WidgetServerSettingsIntegrationsBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull TextView textView2, @NonNull RecyclerView recyclerView, @NonNull AppViewFlipper appViewFlipper) {
         this.a = coordinatorLayout;
         this.b = recyclerView;
-        this.f2011c = appViewFlipper;
+        this.f2012c = appViewFlipper;
     }
 
     @Override // androidx.viewbinding.ViewBinding

app/src/main/java/com/discord/databinding/WidgetServerSettingsMemberListItemBinding.java

@@ -15,7 +15,7 @@ public final class WidgetServerSettingsMemberListItemBinding implements ViewBind
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final ImageView f2012c;
+    public final ImageView f2013c;
     @NonNull
     public final ImageView d;
     @NonNull
@@ -26,7 +26,7 @@ public final class WidgetServerSettingsMemberListItemBinding implements ViewBind
     public WidgetServerSettingsMemberListItemBinding(@NonNull FrameLayout frameLayout, @NonNull FrameLayout frameLayout2, @NonNull ImageView imageView, @NonNull ImageView imageView2, @NonNull RolesListView rolesListView, @NonNull SettingsMemberView settingsMemberView) {
         this.a = frameLayout;
         this.b = frameLayout2;
-        this.f2012c = imageView;
+        this.f2013c = imageView;
         this.d = imageView2;
         this.e = rolesListView;
         this.f = settingsMemberView;

app/src/main/java/com/discord/databinding/WidgetServerSettingsMembersBinding.java

@@ -18,7 +18,7 @@ public final class WidgetServerSettingsMembersBinding implements ViewBinding {
     @NonNull
 
     /* renamed from: c  reason: collision with root package name */
-    public final RecyclerView f2013c;
+    public final RecyclerView f2014c;
     @NonNull
     public final Spinner d;
     @NonNull
@@ -27,7 +27,7 @@ public final class WidgetServerSettingsMembersBinding implements ViewBinding {
     public WidgetServerSettingsMembersBinding(@NonNull CoordinatorLayout coordinatorLayout, @NonNull TextView textView, @NonNull LinearLayout linearLayout, @NonNull TextInputLayout textInputLayout, @NonNull RecyclerView recyclerView, @NonNull Spinner spinner, @NonNull AppViewFlipper appViewFlipper) {
         this.a = coordinatorLayout;
         this.b = textInputLayout;
-        this.f2013c = recyclerView;
+        this.f2014c = recyclerView;
         this.d = spinner;
         this.e = appViewFlipper;
     }