100.6 - Alpha (100206)

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId 'com.discord'
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 100204
+        versionCode 100206
-        versionName "100.4 - Alpha"
+        versionName "100.6 - 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="100204" android:versionName="100.4 - 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="100206" android:versionName="100.6 - Alpha" android:installLocation="auto" android:compileSdkVersion="30" android:compileSdkVersionCodename="11" package="com.discord" platformBuildVersionCode="30" platformBuildVersionName="11">
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29"/>
     <uses-feature android:name="android.hardware.camera" android:required="false"/>
     <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
@@ -72,6 +72,8 @@
                 <data android:scheme="https" android:host="*.discord.com" android:pathPattern="/query/.*"/>
                 <data android:scheme="http" android:host="discord.com" android:pathPattern="/ra/.*"/>
                 <data android:scheme="https" android:host="discord.com" android:pathPattern="/ra/.*"/>
+                <data android:scheme="https" android:host="*.discord.com" android:pathPattern="/events/.*"/>
+                <data android:scheme="https" android:host="discord.com" android:pathPattern="/events/.*"/>
                 <data android:scheme="https" android:host="*.discordapp.com" android:pathPattern="/app"/>
                 <data android:scheme="https" android:host="discordapp.com" android:pathPattern="/app"/>
                 <data android:scheme="https" android:host="*.discordapp.com" android:pathPattern="/gifts/.*"/>
@@ -91,6 +93,8 @@
                 <data android:scheme="https" android:host="*.discordapp.com" android:pathPattern="/discovery"/>
                 <data android:scheme="http" android:host="discordapp.com" android:pathPattern="/ra/.*"/>
                 <data android:scheme="https" android:host="discordapp.com" android:pathPattern="/ra/.*"/>
+                <data android:scheme="https" android:host="*.discordapp.com" android:pathPattern="/events/.*"/>
+                <data android:scheme="https" android:host="discordapp.com" android:pathPattern="/events/.*"/>
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
@@ -174,7 +178,7 @@
         <meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
         <meta-data android:name="com.google.android.nearby.messages.API_KEY" android:value="AIzaSyD-4L6bgKMixqBRtrG2UktVXK6IexXlsog"/>
         <meta-data android:name="com.google.android.actions" android:resource="@xml/actions"/>
-        <meta-data android:name="libdiscord_version" android:value="89.0.23-export-libdiscord-proguard"/>
+        <meta-data android:name="libdiscord_version" android:value="89.0.24-video-receiver-provisional-stats"/>
         <activity android:theme="@style/res_2131952266_theme_appcompat_light_noactionbar" android:name="com.yalantis.ucrop.UCropActivity"/>
         <service android:name="androidx.sharetarget.ChooserTargetServiceCompat" android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
             <intent-filter>

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

@@ -10,6 +10,7 @@ import c0.z.d.k;
 import c0.z.d.m;
 import com.discord.R;
 import com.discord.app.AppDialog;
+import com.discord.utilities.drawable.DrawableCompat;
 import com.discord.utilities.uri.UriHandler;
 import com.discord.utilities.view.extensions.ViewExtensions;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
@@ -108,11 +109,11 @@ public final class i extends AppDialog {
         super.onViewBound(view);
         String string = getArgumentsOrDefault().getString("ARG_PROFILE_URL", "");
         String string2 = getArgumentsOrDefault().getString("ARG_USERNAME", "");
-        int i2 = getArgumentsOrDefault().getInt("ARG_PLATFORM_IMAGE_RES", 0);
+        int i2 = getArgumentsOrDefault().getInt("ARG_THEMED_PLATFORM_IMAGE_RES", 0);
         if (i2 != 0) {
             TextView textView = g().f103c;
             m.checkNotNullExpressionValue(textView, "binding.connectedAccountActionsDialogHeader");
-            ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView, i2, 0, 0, 0, 14, null);
+            ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView, DrawableCompat.getThemedDrawableRes$default(view, i2, 0, 2, (Object) null), 0, 0, 0, 14, null);
         }
         TextView textView2 = g().f103c;
         m.checkNotNullExpressionValue(textView2, "binding.connectedAccountActionsDialogHeader");

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

@@ -12,7 +12,8 @@ public final class a {
     public static final Regex B;
     public static final Regex C = new Regex("^/ra/([\\w-]+)$");
     public static final Regex D;
-    public static final a E;
+    public static final Regex E;
+    public static final a F;
     public static final String a;
     public static final String b;
 
@@ -54,7 +55,7 @@ public final class a {
 
     static {
         a aVar = new a();
-        E = aVar;
+        F = aVar;
         String b2 = aVar.b(BuildConfig.HOST);
         a = b2;
         String b3 = aVar.b(BuildConfig.HOST_ALTERNATE);
@@ -114,6 +115,7 @@ public final class a {
         A = new Regex("^/query(/\\w+)*/?$", iVar);
         B = new Regex("^/(?:oauth2|connect)/authorize/?$", iVar);
         D = new Regex("^/guild/((?:@me)|(?:\\d+))/premiumguild/?$", iVar);
+        E = new Regex("^/events/(\\d+)/(\\d+)/?$", iVar);
     }
 
     public final boolean a(String str) {

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

@@ -46,7 +46,7 @@ public final /* synthetic */ class a extends k implements Function1<Stats, Unit>
             Transport transport = stats2.getTransport();
             eVar.g(null, Integer.valueOf((transport == null || (receiverReports = transport.getReceiverReports()) == null) ? 0 : receiverReports.length), currentTimeMillis);
             if (!eVar.k.a() && (outboundRtpVideo = stats2.getOutboundRtpVideo()) != null) {
-                eVar.a(eVar.l, new e.g((long) outboundRtpVideo.getResolution().getHeight(), currentTimeMillis, new e.a(outboundRtpVideo.getFramesEncoded(), outboundRtpVideo.getFramesSent(), outboundRtpVideo.getPacketsSent(), (long) outboundRtpVideo.getPacketsLost(), 0, outboundRtpVideo.getBytesSent(), outboundRtpVideo.getNackCount(), outboundRtpVideo.getPliCount(), outboundRtpVideo.getQpSum())));
+                eVar.a(eVar.l, new e.g((long) outboundRtpVideo.getResolution().getHeight(), currentTimeMillis, new e.a(outboundRtpVideo.getFramesEncoded(), outboundRtpVideo.getFramesSent(), outboundRtpVideo.getPacketsSent(), (long) outboundRtpVideo.getPacketsLost(), 0, outboundRtpVideo.getBytesSent(), outboundRtpVideo.getNackCount(), outboundRtpVideo.getPliCount(), outboundRtpVideo.getQpSum(), 0, 0, 0, 0, 0)));
                 if (eVar.l.d == null && outboundRtpVideo.getFramesEncoded() > 0) {
                     eVar.l.d = Long.valueOf(currentTimeMillis - eVar.g);
                     Logger.i$default(eVar.p, "VideoQuality: outboundStats.timeToFirstFrame: " + eVar.l.d, null, 2, null);

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

@@ -1,7 +1,6 @@
 package c.a.q.o0;
 
 import androidx.annotation.AnyThread;
-import androidx.core.app.FrameMetricsAggregator;
 import c0.t.h0;
 import c0.t.n;
 import c0.t.r;
@@ -60,12 +59,17 @@ public final class e {
         public long g;
         public long h;
         public long i;
+        public long j;
+        public long k;
+        public long l;
+        public long m;
+        public long n;
 
         public a() {
-            this(0, 0, 0, 0, 0, 0, 0, 0, 0, FrameMetricsAggregator.EVERY_DURATION);
+            this(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16383);
         }
 
-        public a(long j, long j2, long j3, long j4, long j5, long j6, long j7, long j8, long j9) {
+        public a(long j, long j2, long j3, long j4, long j5, long j6, long j7, long j8, long j9, long j10, long j11, long j12, long j13, long j14) {
             this.a = j;
             this.b = j2;
             this.f232c = j3;
@@ -75,11 +79,16 @@ public final class e {
             this.g = j7;
             this.h = j8;
             this.i = j9;
+            this.j = j10;
+            this.k = j11;
+            this.l = j12;
+            this.m = j13;
+            this.n = j14;
         }
 
         /* JADX INFO: this call moved to the top of the method (can break code semantics) */
-        public /* synthetic */ a(long j, long j2, long j3, long j4, long j5, long j6, long j7, long j8, long j9, int i) {
+        public /* synthetic */ a(long j, long j2, long j3, long j4, long j5, long j6, long j7, long j8, long j9, long j10, long j11, long j12, long j13, long j14, int i) {
-            this((i & 1) != 0 ? 0 : j, (i & 2) != 0 ? 0 : j2, (i & 4) != 0 ? 0 : j3, (i & 8) != 0 ? 0 : j4, (i & 16) != 0 ? 0 : j5, (i & 32) != 0 ? 0 : j6, (i & 64) != 0 ? 0 : j7, (i & 128) != 0 ? 0 : j8, (i & 256) == 0 ? j9 : 0);
+            this((i & 1) != 0 ? 0 : j, (i & 2) != 0 ? 0 : j2, (i & 4) != 0 ? 0 : j3, (i & 8) != 0 ? 0 : j4, (i & 16) != 0 ? 0 : j5, (i & 32) != 0 ? 0 : j6, (i & 64) != 0 ? 0 : j7, (i & 128) != 0 ? 0 : j8, (i & 256) != 0 ? 0 : j9, (i & 512) != 0 ? 0 : j10, (i & 1024) != 0 ? 0 : j11, (i & 2048) != 0 ? 0 : j12, (i & 4096) != 0 ? 0 : j13, (i & 8192) == 0 ? j14 : 0);
         }
 
         public boolean equals(Object obj) {
@@ -90,7 +99,7 @@ public final class e {
                 return false;
             }
             a aVar = (a) obj;
-            return this.a == aVar.a && this.b == aVar.b && this.f232c == aVar.f232c && this.d == aVar.d && this.e == aVar.e && this.f == aVar.f && this.g == aVar.g && this.h == aVar.h && this.i == aVar.i;
+            return this.a == aVar.a && this.b == aVar.b && this.f232c == aVar.f232c && this.d == aVar.d && this.e == aVar.e && this.f == aVar.f && this.g == aVar.g && this.h == aVar.h && this.i == aVar.i && this.j == aVar.j && this.k == aVar.k && this.l == aVar.l && this.m == aVar.m && this.n == aVar.n;
         }
 
         public int hashCode() {
@@ -101,7 +110,12 @@ public final class e {
             int a5 = z.a.a.b.a(this.f);
             int a6 = z.a.a.b.a(this.g);
             int a7 = z.a.a.b.a(this.h);
-            return z.a.a.b.a(this.i) + ((a7 + ((a6 + ((a5 + ((a4 + ((a3 + ((a2 + ((a + (z.a.a.b.a(this.a) * 31)) * 31)) * 31)) * 31)) * 31)) * 31)) * 31)) * 31);
+            int a8 = z.a.a.b.a(this.i);
+            int a9 = z.a.a.b.a(this.j);
+            int a10 = z.a.a.b.a(this.k);
+            int a11 = z.a.a.b.a(this.l);
+            int a12 = z.a.a.b.a(this.m);
+            return z.a.a.b.a(this.n) + ((a12 + ((a11 + ((a10 + ((a9 + ((a8 + ((a7 + ((a6 + ((a5 + ((a4 + ((a3 + ((a2 + ((a + (z.a.a.b.a(this.a) * 31)) * 31)) * 31)) * 31)) * 31)) * 31)) * 31)) * 31)) * 31)) * 31)) * 31)) * 31)) * 31);
         }
 
         public String toString() {
@@ -122,7 +136,17 @@ public final class e {
             O.append(", pliCount=");
             O.append(this.h);
             O.append(", qpSum=");
-            return c.d.b.a.a.A(O, this.i, ")");
+            O.append(this.i);
+            O.append(", freezeCount=");
+            O.append(this.j);
+            O.append(", pauseCount=");
+            O.append(this.k);
+            O.append(", totalFreezesDuration=");
+            O.append(this.l);
+            O.append(", totalPausesDuration=");
+            O.append(this.m);
+            O.append(", totalFramesDuration=");
+            return c.d.b.a.a.A(O, this.n, ")");
         }
     }
 
@@ -189,7 +213,7 @@ public final class e {
         /* renamed from: c  reason: collision with root package name */
         public final Histogram f233c = new Histogram(25600, 0, 2, null);
         public Long d;
-        public a e = new a(0, 0, 0, 0, 0, 0, 0, 0, 0, FrameMetricsAggregator.EVERY_DURATION);
+        public a e = new a(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16383);
         public long f;
         public Map<Integer, Float> g = new LinkedHashMap();
         public Map<Integer, Float> h = new LinkedHashMap();
@@ -227,7 +251,7 @@ public final class e {
         public final a f234c;
 
         public g() {
-            this(0, 0, new a(0, 0, 0, 0, 0, 0, 0, 0, 0, FrameMetricsAggregator.EVERY_DURATION));
+            this(0, 0, new a(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16383));
         }
 
         public g(long j, long j2, a aVar) {
@@ -336,6 +360,11 @@ public final class e {
             aVar.g = fVar.a(aVar2.g, aVar3.g) + aVar.g;
             aVar.h = fVar.a(aVar2.h, aVar3.h) + aVar.h;
             aVar.i = fVar.a(aVar2.i, aVar3.i) + aVar.i;
+            aVar.j = fVar.a(aVar2.j, aVar3.j) + aVar.j;
+            aVar.k = fVar.a(aVar2.j, aVar3.j) + aVar.k;
+            aVar.l = fVar.a(aVar2.l, aVar3.l) + aVar.l;
+            aVar.m = fVar.a(aVar2.m, aVar3.m) + aVar.m;
+            aVar.n = fVar.a(aVar2.n, aVar3.n) + aVar.n;
             a aVar4 = gVar2.f234c;
             long j = aVar4.f;
             long j2 = aVar4.a;
@@ -442,12 +471,12 @@ public final class e {
         return h0.plus(e(this.l), h0.mapOf(c0.o.to("target_bitrate_max", Long.valueOf((i <= 0 || (valueOf3 = Float.valueOf(((float) (fVar.o * ((long) 8))) / f2)) == null) ? 0 : c0.a0.a.roundToLong(valueOf3.floatValue()))), c0.o.to("target_bitrate_network", Long.valueOf((i <= 0 || (valueOf2 = Float.valueOf(((float) (this.l.n * ((long) 8))) / f2)) == null) ? 0 : c0.a0.a.roundToLong(valueOf2.floatValue()))), c0.o.to("target_fps", Long.valueOf((i <= 0 || (valueOf = Float.valueOf(((float) this.l.m) / f2)) == null) ? 0 : c0.a0.a.roundToLong(valueOf.floatValue()))), c0.o.to("duration_encoder_nvidia_cuda", 0L), c0.o.to("duration_encoder_nvidia_direct3d", 0L), c0.o.to("duration_encoder_openh264", 0L), c0.o.to("duration_encoder_videotoolbox", 0L), c0.o.to("duration_encoder_amd_direct3d", 0L), c0.o.to("duration_encoder_intel", 0L), c0.o.to("duration_encoder_intel_direct3d", 0L), c0.o.to("duration_encoder_unknown", 0L)));
     }
 
-    /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x04e0: APUT  
+    /* JADX DEBUG: Can't convert new array creation: APUT found in different block: 0x04e4: APUT  
       (r6v4 kotlin.Pair[])
       (6 ??[int, float, short, byte, char])
-      (wrap: kotlin.Pair : 0x04db: INVOKE  (r1v3 kotlin.Pair) = 
+      (wrap: kotlin.Pair : 0x04df: INVOKE  (r1v3 kotlin.Pair) = 
       ("time_to_first_frame_ms")
-      (wrap: java.lang.Long : 0x04d4: INVOKE  (r1v2 java.lang.Long) = (r4v22 long) type: STATIC call: java.lang.Long.valueOf(long):java.lang.Long)
+      (wrap: java.lang.Long : 0x04d8: INVOKE  (r1v2 java.lang.Long) = (r4v22 long) type: STATIC call: java.lang.Long.valueOf(long):java.lang.Long)
      type: STATIC call: c0.o.to(java.lang.Object, java.lang.Object):kotlin.Pair)
      */
     public final Map<String, Object> e(C0043e eVar) {
@@ -466,7 +495,7 @@ public final class e {
         a aVar = eVar.e;
         long a2 = i > 0 ? b.a(bVar, Float.valueOf(((float) (aVar.f * ((long) 8))) / f2)) : 0;
         long a3 = i > 0 ? b.a(bVar, Float.valueOf(((float) aVar.a) / f2)) : 0;
-        Pair[] pairArr = new Pair[11];
+        Pair[] pairArr = new Pair[16];
         pairArr[0] = c0.o.to("avg_bitrate", Long.valueOf(a2));
         pairArr[1] = c0.o.to("avg_fps", Long.valueOf(a3));
         pairArr[2] = c0.o.to("num_bytes", Long.valueOf(aVar.f));
@@ -479,11 +508,16 @@ public final class e {
         pairArr[8] = c0.o.to("num_nacks", Long.valueOf(aVar.g));
         pairArr[9] = c0.o.to("num_plis", Long.valueOf(aVar.h));
         pairArr[10] = c0.o.to("qp_sum", Long.valueOf(aVar.i));
+        pairArr[11] = c0.o.to("receiver_freeze_count", Long.valueOf(aVar.j));
+        pairArr[12] = c0.o.to("receiver_pause_count", Long.valueOf(aVar.k));
+        pairArr[13] = c0.o.to("receiver_total_freezes_duration", Long.valueOf(aVar.l));
+        pairArr[14] = c0.o.to("receiver_total_pauses_duration", Long.valueOf(aVar.m));
+        pairArr[15] = c0.o.to("receiver_total_frames_duration", Long.valueOf(aVar.n));
         return h0.plus(mapOf, h0.mapOf(pairArr));
     }
 
     public final g f(InboundRtpVideo inboundRtpVideo, long j) {
-        return new g((long) inboundRtpVideo.getResolution().getHeight(), j, new a((long) inboundRtpVideo.getFramesDecoded(), (long) inboundRtpVideo.getFramesReceived(), (long) inboundRtpVideo.getPacketsReceived(), (long) inboundRtpVideo.getPacketsLost(), (long) inboundRtpVideo.getFramesDropped(), inboundRtpVideo.getBytesReceived(), inboundRtpVideo.getNackCount(), inboundRtpVideo.getPliCount(), inboundRtpVideo.getQpSum()));
+        return new g((long) inboundRtpVideo.getResolution().getHeight(), j, new a((long) inboundRtpVideo.getFramesDecoded(), (long) inboundRtpVideo.getFramesReceived(), (long) inboundRtpVideo.getPacketsReceived(), (long) inboundRtpVideo.getPacketsLost(), (long) inboundRtpVideo.getFramesDropped(), inboundRtpVideo.getBytesReceived(), inboundRtpVideo.getNackCount(), inboundRtpVideo.getPliCount(), inboundRtpVideo.getQpSum(), inboundRtpVideo.getFreezeCount(), inboundRtpVideo.getPauseCount(), inboundRtpVideo.getTotalFreezesDuration(), inboundRtpVideo.getTotalPausesDuration(), inboundRtpVideo.getTotalFramesDuration()));
     }
 
     public final void g(Boolean bool, Integer num, long j) {

app/src/main/java/co/discord/media_engine/InboundRtpVideo.java

@@ -1,7 +1,7 @@
 package co.discord.media_engine;
 
-import c.d.b.a.a;
 import c0.z.d.m;
+import z.a.a.a;
 import z.a.a.b;
 /* compiled from: Statistics.kt */
 public final class InboundRtpVideo {
@@ -17,16 +17,22 @@ public final class InboundRtpVideo {
     private final int framesDecoded;
     private final int framesDropped;
     private final int framesReceived;
+    private final long freezeCount;
     private final long nackCount;
     private final int packetsLost;
     private final int packetsReceived;
+    private final long pauseCount;
     private final long pliCount;
     private final long qpSum;
     private final Resolution resolution;
     private final long ssrc;
+    private final double sumOfSquaredFramesDurations;
+    private final long totalFramesDuration;
+    private final long totalFreezesDuration;
+    private final long totalPausesDuration;
     private final String type;
 
-    public InboundRtpVideo(String str, long j, StatsCodec statsCodec, long j2, int i, int i2, int i3, int i4, Resolution resolution, String str2, int i5, int i6, int i7, int i8, int i9, int i10, long j3, long j4, long j5, long j6) {
+    public InboundRtpVideo(String str, long j, StatsCodec statsCodec, long j2, int i, int i2, int i3, int i4, Resolution resolution, String str2, int i5, int i6, int i7, int i8, int i9, int i10, long j3, long j4, long j5, long j6, long j7, long j8, long j9, long j10, long j11, double d) {
         m.checkNotNullParameter(str, "type");
         m.checkNotNullParameter(resolution, "resolution");
         m.checkNotNullParameter(str2, "decoderImplementationName");
@@ -50,10 +56,16 @@ public final class InboundRtpVideo {
         this.nackCount = j4;
         this.pliCount = j5;
         this.qpSum = j6;
+        this.freezeCount = j7;
+        this.pauseCount = j8;
+        this.totalFreezesDuration = j9;
+        this.totalPausesDuration = j10;
+        this.totalFramesDuration = j11;
+        this.sumOfSquaredFramesDurations = d;
     }
 
-    public static /* synthetic */ InboundRtpVideo copy$default(InboundRtpVideo inboundRtpVideo, String str, long j, StatsCodec statsCodec, long j2, int i, int i2, int i3, int i4, Resolution resolution, String str2, int i5, int i6, int i7, int i8, int i9, int i10, long j3, long j4, long j5, long j6, int i11, Object obj) {
+    public static /* synthetic */ InboundRtpVideo copy$default(InboundRtpVideo inboundRtpVideo, String str, long j, StatsCodec statsCodec, long j2, int i, int i2, int i3, int i4, Resolution resolution, String str2, int i5, int i6, int i7, int i8, int i9, int i10, long j3, long j4, long j5, long j6, long j7, long j8, long j9, long j10, long j11, double d, int i11, Object obj) {
-        return inboundRtpVideo.copy((i11 & 1) != 0 ? inboundRtpVideo.type : str, (i11 & 2) != 0 ? inboundRtpVideo.ssrc : j, (i11 & 4) != 0 ? inboundRtpVideo.codec : statsCodec, (i11 & 8) != 0 ? inboundRtpVideo.bytesReceived : j2, (i11 & 16) != 0 ? inboundRtpVideo.packetsReceived : i, (i11 & 32) != 0 ? inboundRtpVideo.packetsLost : i2, (i11 & 64) != 0 ? inboundRtpVideo.bitrate : i3, (i11 & 128) != 0 ? inboundRtpVideo.averageDecodeTime : i4, (i11 & 256) != 0 ? inboundRtpVideo.resolution : resolution, (i11 & 512) != 0 ? inboundRtpVideo.decoderImplementationName : str2, (i11 & 1024) != 0 ? inboundRtpVideo.framesDecoded : i5, (i11 & 2048) != 0 ? inboundRtpVideo.framesDropped : i6, (i11 & 4096) != 0 ? inboundRtpVideo.framesReceived : i7, (i11 & 8192) != 0 ? inboundRtpVideo.frameRateDecode : i8, (i11 & 16384) != 0 ? inboundRtpVideo.frameRateNetwork : i9, (i11 & 32768) != 0 ? inboundRtpVideo.frameRateRender : i10, (i11 & 65536) != 0 ? inboundRtpVideo.firCount : j3, (i11 & 131072) != 0 ? inboundRtpVideo.nackCount : j4, (i11 & 262144) != 0 ? inboundRtpVideo.pliCount : j5, (i11 & 524288) != 0 ? inboundRtpVideo.qpSum : j6);
+        return inboundRtpVideo.copy((i11 & 1) != 0 ? inboundRtpVideo.type : str, (i11 & 2) != 0 ? inboundRtpVideo.ssrc : j, (i11 & 4) != 0 ? inboundRtpVideo.codec : statsCodec, (i11 & 8) != 0 ? inboundRtpVideo.bytesReceived : j2, (i11 & 16) != 0 ? inboundRtpVideo.packetsReceived : i, (i11 & 32) != 0 ? inboundRtpVideo.packetsLost : i2, (i11 & 64) != 0 ? inboundRtpVideo.bitrate : i3, (i11 & 128) != 0 ? inboundRtpVideo.averageDecodeTime : i4, (i11 & 256) != 0 ? inboundRtpVideo.resolution : resolution, (i11 & 512) != 0 ? inboundRtpVideo.decoderImplementationName : str2, (i11 & 1024) != 0 ? inboundRtpVideo.framesDecoded : i5, (i11 & 2048) != 0 ? inboundRtpVideo.framesDropped : i6, (i11 & 4096) != 0 ? inboundRtpVideo.framesReceived : i7, (i11 & 8192) != 0 ? inboundRtpVideo.frameRateDecode : i8, (i11 & 16384) != 0 ? inboundRtpVideo.frameRateNetwork : i9, (i11 & 32768) != 0 ? inboundRtpVideo.frameRateRender : i10, (i11 & 65536) != 0 ? inboundRtpVideo.firCount : j3, (i11 & 131072) != 0 ? inboundRtpVideo.nackCount : j4, (i11 & 262144) != 0 ? inboundRtpVideo.pliCount : j5, (i11 & 524288) != 0 ? inboundRtpVideo.qpSum : j6, (i11 & 1048576) != 0 ? inboundRtpVideo.freezeCount : j7, (i11 & 2097152) != 0 ? inboundRtpVideo.pauseCount : j8, (i11 & 4194304) != 0 ? inboundRtpVideo.totalFreezesDuration : j9, (i11 & 8388608) != 0 ? inboundRtpVideo.totalPausesDuration : j10, (i11 & 16777216) != 0 ? inboundRtpVideo.totalFramesDuration : j11, (i11 & 33554432) != 0 ? inboundRtpVideo.sumOfSquaredFramesDurations : d);
     }
 
     public final String component1() {
@@ -108,6 +120,30 @@ public final class InboundRtpVideo {
         return this.qpSum;
     }
 
+    public final long component21() {
+        return this.freezeCount;
+    }
+
+    public final long component22() {
+        return this.pauseCount;
+    }
+
+    public final long component23() {
+        return this.totalFreezesDuration;
+    }
+
+    public final long component24() {
+        return this.totalPausesDuration;
+    }
+
+    public final long component25() {
+        return this.totalFramesDuration;
+    }
+
+    public final double component26() {
+        return this.sumOfSquaredFramesDurations;
+    }
+
     public final StatsCodec component3() {
         return this.codec;
     }
@@ -136,11 +172,11 @@ public final class InboundRtpVideo {
         return this.resolution;
     }
 
-    public final InboundRtpVideo copy(String str, long j, StatsCodec statsCodec, long j2, int i, int i2, int i3, int i4, Resolution resolution, String str2, int i5, int i6, int i7, int i8, int i9, int i10, long j3, long j4, long j5, long j6) {
+    public final InboundRtpVideo copy(String str, long j, StatsCodec statsCodec, long j2, int i, int i2, int i3, int i4, Resolution resolution, String str2, int i5, int i6, int i7, int i8, int i9, int i10, long j3, long j4, long j5, long j6, long j7, long j8, long j9, long j10, long j11, double d) {
         m.checkNotNullParameter(str, "type");
         m.checkNotNullParameter(resolution, "resolution");
         m.checkNotNullParameter(str2, "decoderImplementationName");
-        return new InboundRtpVideo(str, j, statsCodec, j2, i, i2, i3, i4, resolution, str2, i5, i6, i7, i8, i9, i10, j3, j4, j5, j6);
+        return new InboundRtpVideo(str, j, statsCodec, j2, i, i2, i3, i4, resolution, str2, i5, i6, i7, i8, i9, i10, j3, j4, j5, j6, j7, j8, j9, j10, j11, d);
     }
 
     public boolean equals(Object obj) {
@@ -151,7 +187,7 @@ public final class InboundRtpVideo {
             return false;
         }
         InboundRtpVideo inboundRtpVideo = (InboundRtpVideo) obj;
-        return m.areEqual(this.type, inboundRtpVideo.type) && this.ssrc == inboundRtpVideo.ssrc && m.areEqual(this.codec, inboundRtpVideo.codec) && this.bytesReceived == inboundRtpVideo.bytesReceived && this.packetsReceived == inboundRtpVideo.packetsReceived && this.packetsLost == inboundRtpVideo.packetsLost && this.bitrate == inboundRtpVideo.bitrate && this.averageDecodeTime == inboundRtpVideo.averageDecodeTime && m.areEqual(this.resolution, inboundRtpVideo.resolution) && m.areEqual(this.decoderImplementationName, inboundRtpVideo.decoderImplementationName) && this.framesDecoded == inboundRtpVideo.framesDecoded && this.framesDropped == inboundRtpVideo.framesDropped && this.framesReceived == inboundRtpVideo.framesReceived && this.frameRateDecode == inboundRtpVideo.frameRateDecode && this.frameRateNetwork == inboundRtpVideo.frameRateNetwork && this.frameRateRender == inboundRtpVideo.frameRateRender && this.firCount == inboundRtpVideo.firCount && this.nackCount == inboundRtpVideo.nackCount && this.pliCount == inboundRtpVideo.pliCount && this.qpSum == inboundRtpVideo.qpSum;
+        return m.areEqual(this.type, inboundRtpVideo.type) && this.ssrc == inboundRtpVideo.ssrc && m.areEqual(this.codec, inboundRtpVideo.codec) && this.bytesReceived == inboundRtpVideo.bytesReceived && this.packetsReceived == inboundRtpVideo.packetsReceived && this.packetsLost == inboundRtpVideo.packetsLost && this.bitrate == inboundRtpVideo.bitrate && this.averageDecodeTime == inboundRtpVideo.averageDecodeTime && m.areEqual(this.resolution, inboundRtpVideo.resolution) && m.areEqual(this.decoderImplementationName, inboundRtpVideo.decoderImplementationName) && this.framesDecoded == inboundRtpVideo.framesDecoded && this.framesDropped == inboundRtpVideo.framesDropped && this.framesReceived == inboundRtpVideo.framesReceived && this.frameRateDecode == inboundRtpVideo.frameRateDecode && this.frameRateNetwork == inboundRtpVideo.frameRateNetwork && this.frameRateRender == inboundRtpVideo.frameRateRender && this.firCount == inboundRtpVideo.firCount && this.nackCount == inboundRtpVideo.nackCount && this.pliCount == inboundRtpVideo.pliCount && this.qpSum == inboundRtpVideo.qpSum && this.freezeCount == inboundRtpVideo.freezeCount && this.pauseCount == inboundRtpVideo.pauseCount && this.totalFreezesDuration == inboundRtpVideo.totalFreezesDuration && this.totalPausesDuration == inboundRtpVideo.totalPausesDuration && this.totalFramesDuration == inboundRtpVideo.totalFramesDuration && Double.compare(this.sumOfSquaredFramesDurations, inboundRtpVideo.sumOfSquaredFramesDurations) == 0;
     }
 
     public final int getAverageDecodeTime() {
@@ -202,6 +238,10 @@ public final class InboundRtpVideo {
         return this.framesReceived;
     }
 
+    public final long getFreezeCount() {
+        return this.freezeCount;
+    }
+
     public final long getNackCount() {
         return this.nackCount;
     }
@@ -214,6 +254,10 @@ public final class InboundRtpVideo {
         return this.packetsReceived;
     }
 
+    public final long getPauseCount() {
+        return this.pauseCount;
+    }
+
     public final long getPliCount() {
         return this.pliCount;
     }
@@ -230,6 +274,22 @@ public final class InboundRtpVideo {
         return this.ssrc;
     }
 
+    public final double getSumOfSquaredFramesDurations() {
+        return this.sumOfSquaredFramesDurations;
+    }
+
+    public final long getTotalFramesDuration() {
+        return this.totalFramesDuration;
+    }
+
+    public final long getTotalFreezesDuration() {
+        return this.totalFreezesDuration;
+    }
+
+    public final long getTotalPausesDuration() {
+        return this.totalPausesDuration;
+    }
+
     public final String getType() {
         return this.type;
     }
@@ -246,11 +306,17 @@ public final class InboundRtpVideo {
         if (str2 != null) {
             i = str2.hashCode();
         }
-        return b.a(this.qpSum) + ((b.a(this.pliCount) + ((b.a(this.nackCount) + ((b.a(this.firCount) + ((((((((((((((hashCode + i) * 31) + this.framesDecoded) * 31) + this.framesDropped) * 31) + this.framesReceived) * 31) + this.frameRateDecode) * 31) + this.frameRateNetwork) * 31) + this.frameRateRender) * 31)) * 31)) * 31)) * 31);
+        int a3 = b.a(this.firCount);
+        int a4 = b.a(this.nackCount);
+        int a5 = b.a(this.pliCount);
+        int a6 = b.a(this.qpSum);
+        int a7 = b.a(this.freezeCount);
+        int a8 = b.a(this.pauseCount);
+        return a.a(this.sumOfSquaredFramesDurations) + ((b.a(this.totalFramesDuration) + ((b.a(this.totalPausesDuration) + ((b.a(this.totalFreezesDuration) + ((a8 + ((a7 + ((a6 + ((a5 + ((a4 + ((a3 + ((((((((((((((hashCode + i) * 31) + this.framesDecoded) * 31) + this.framesDropped) * 31) + this.framesReceived) * 31) + this.frameRateDecode) * 31) + this.frameRateNetwork) * 31) + this.frameRateRender) * 31)) * 31)) * 31)) * 31)) * 31)) * 31)) * 31)) * 31)) * 31)) * 31);
     }
 
     public String toString() {
-        StringBuilder O = a.O("InboundRtpVideo(type=");
+        StringBuilder O = c.d.b.a.a.O("InboundRtpVideo(type=");
         O.append(this.type);
         O.append(", ssrc=");
         O.append(this.ssrc);
@@ -289,6 +355,20 @@ public final class InboundRtpVideo {
         O.append(", pliCount=");
         O.append(this.pliCount);
         O.append(", qpSum=");
-        return a.A(O, this.qpSum, ")");
+        O.append(this.qpSum);
+        O.append(", freezeCount=");
+        O.append(this.freezeCount);
+        O.append(", pauseCount=");
+        O.append(this.pauseCount);
+        O.append(", totalFreezesDuration=");
+        O.append(this.totalFreezesDuration);
+        O.append(", totalPausesDuration=");
+        O.append(this.totalPausesDuration);
+        O.append(", totalFramesDuration=");
+        O.append(this.totalFramesDuration);
+        O.append(", sumOfSquaredFramesDurations=");
+        O.append(this.sumOfSquaredFramesDurations);
+        O.append(")");
+        return O.toString();
     }
 }

app/src/main/java/co/discord/media_engine/internal/InboundVideo.java

@@ -1,7 +1,8 @@
 package co.discord.media_engine.internal;
 
-import c.d.b.a.a;
+import androidx.constraintlayout.solver.widgets.analyzer.BasicMeasure;
 import c0.z.d.m;
+import z.a.a.a;
 import z.a.a.b;
 /* compiled from: NativeStatistics.kt */
 public final class InboundVideo {
@@ -16,23 +17,29 @@ public final class InboundVideo {
     private final long framesDecoded;
     private final int framesDropped;
     private final long framesRendered;
+    private final long freezeCount;
     private final int height;
     private final int jitterBuffer;
     private final int maxDecode;
     private final int minPlayoutDelay;
     private final int networkFrameRate;
+    private final long pauseCount;
     private final long qpSum;
     private final int renderDelay;
     private final int renderFrameRate;
     private final InboundRtcpStats rtcpStats;
     private final InboundRtpStats rtpStats;
     private final long ssrc;
+    private final double sumOfSquaredFramesDurations;
     private final float syncOffset;
     private final float targetDelay;
     private final int totalBitrate;
+    private final long totalFramesDuration;
+    private final long totalFreezesDuration;
+    private final long totalPausesDuration;
     private final int width;
 
-    public InboundVideo(String str, int i, int i2, int i3, int i4, int i5, String str2, FrameCounts frameCounts, long j, long j2, int i6, int i7, int i8, int i9, int i10, int i11, long j3, int i12, int i13, InboundRtcpStats inboundRtcpStats, InboundRtpStats inboundRtpStats, long j4, float f, float f2, int i14, int i15) {
+    public InboundVideo(String str, int i, int i2, int i3, int i4, int i5, String str2, FrameCounts frameCounts, long j, long j2, int i6, int i7, int i8, int i9, int i10, int i11, long j3, int i12, int i13, InboundRtcpStats inboundRtcpStats, InboundRtpStats inboundRtpStats, long j4, float f, float f2, int i14, int i15, long j5, long j6, long j7, long j8, long j9, double d) {
         m.checkNotNullParameter(str, "codecName");
         m.checkNotNullParameter(str2, "decoderImplementationName");
         m.checkNotNullParameter(frameCounts, "frameCounts");
@@ -64,10 +71,16 @@ public final class InboundVideo {
         this.targetDelay = f2;
         this.totalBitrate = i14;
         this.width = i15;
+        this.freezeCount = j5;
+        this.pauseCount = j6;
+        this.totalFreezesDuration = j7;
+        this.totalPausesDuration = j8;
+        this.totalFramesDuration = j9;
+        this.sumOfSquaredFramesDurations = d;
     }
 
-    public static /* synthetic */ InboundVideo copy$default(InboundVideo inboundVideo, String str, int i, int i2, int i3, int i4, int i5, String str2, FrameCounts frameCounts, long j, long j2, int i6, int i7, int i8, int i9, int i10, int i11, long j3, int i12, int i13, InboundRtcpStats inboundRtcpStats, InboundRtpStats inboundRtpStats, long j4, float f, float f2, int i14, int i15, int i16, Object obj) {
+    public static /* synthetic */ InboundVideo copy$default(InboundVideo inboundVideo, String str, int i, int i2, int i3, int i4, int i5, String str2, FrameCounts frameCounts, long j, long j2, int i6, int i7, int i8, int i9, int i10, int i11, long j3, int i12, int i13, InboundRtcpStats inboundRtcpStats, InboundRtpStats inboundRtpStats, long j4, float f, float f2, int i14, int i15, long j5, long j6, long j7, long j8, long j9, double d, int i16, Object obj) {
-        return inboundVideo.copy((i16 & 1) != 0 ? inboundVideo.codecName : str, (i16 & 2) != 0 ? inboundVideo.codecPayloadType : i, (i16 & 4) != 0 ? inboundVideo.currentDelay : i2, (i16 & 8) != 0 ? inboundVideo.currentPayloadType : i3, (i16 & 16) != 0 ? inboundVideo.decodeFrameRate : i4, (i16 & 32) != 0 ? inboundVideo.decode : i5, (i16 & 64) != 0 ? inboundVideo.decoderImplementationName : str2, (i16 & 128) != 0 ? inboundVideo.frameCounts : frameCounts, (i16 & 256) != 0 ? inboundVideo.framesDecoded : j, (i16 & 512) != 0 ? inboundVideo.framesRendered : j2, (i16 & 1024) != 0 ? inboundVideo.framesDropped : i6, (i16 & 2048) != 0 ? inboundVideo.height : i7, (i16 & 4096) != 0 ? inboundVideo.jitterBuffer : i8, (i16 & 8192) != 0 ? inboundVideo.maxDecode : i9, (i16 & 16384) != 0 ? inboundVideo.minPlayoutDelay : i10, (i16 & 32768) != 0 ? inboundVideo.networkFrameRate : i11, (i16 & 65536) != 0 ? inboundVideo.qpSum : j3, (i16 & 131072) != 0 ? inboundVideo.renderDelay : i12, (262144 & i16) != 0 ? inboundVideo.renderFrameRate : i13, (i16 & 524288) != 0 ? inboundVideo.rtcpStats : inboundRtcpStats, (i16 & 1048576) != 0 ? inboundVideo.rtpStats : inboundRtpStats, (i16 & 2097152) != 0 ? inboundVideo.ssrc : j4, (i16 & 4194304) != 0 ? inboundVideo.syncOffset : f, (8388608 & i16) != 0 ? inboundVideo.targetDelay : f2, (i16 & 16777216) != 0 ? inboundVideo.totalBitrate : i14, (i16 & 33554432) != 0 ? inboundVideo.width : i15);
+        return inboundVideo.copy((i16 & 1) != 0 ? inboundVideo.codecName : str, (i16 & 2) != 0 ? inboundVideo.codecPayloadType : i, (i16 & 4) != 0 ? inboundVideo.currentDelay : i2, (i16 & 8) != 0 ? inboundVideo.currentPayloadType : i3, (i16 & 16) != 0 ? inboundVideo.decodeFrameRate : i4, (i16 & 32) != 0 ? inboundVideo.decode : i5, (i16 & 64) != 0 ? inboundVideo.decoderImplementationName : str2, (i16 & 128) != 0 ? inboundVideo.frameCounts : frameCounts, (i16 & 256) != 0 ? inboundVideo.framesDecoded : j, (i16 & 512) != 0 ? inboundVideo.framesRendered : j2, (i16 & 1024) != 0 ? inboundVideo.framesDropped : i6, (i16 & 2048) != 0 ? inboundVideo.height : i7, (i16 & 4096) != 0 ? inboundVideo.jitterBuffer : i8, (i16 & 8192) != 0 ? inboundVideo.maxDecode : i9, (i16 & 16384) != 0 ? inboundVideo.minPlayoutDelay : i10, (i16 & 32768) != 0 ? inboundVideo.networkFrameRate : i11, (i16 & 65536) != 0 ? inboundVideo.qpSum : j3, (i16 & 131072) != 0 ? inboundVideo.renderDelay : i12, (262144 & i16) != 0 ? inboundVideo.renderFrameRate : i13, (i16 & 524288) != 0 ? inboundVideo.rtcpStats : inboundRtcpStats, (i16 & 1048576) != 0 ? inboundVideo.rtpStats : inboundRtpStats, (i16 & 2097152) != 0 ? inboundVideo.ssrc : j4, (i16 & 4194304) != 0 ? inboundVideo.syncOffset : f, (8388608 & i16) != 0 ? inboundVideo.targetDelay : f2, (i16 & 16777216) != 0 ? inboundVideo.totalBitrate : i14, (i16 & 33554432) != 0 ? inboundVideo.width : i15, (i16 & 67108864) != 0 ? inboundVideo.freezeCount : j5, (i16 & 134217728) != 0 ? inboundVideo.pauseCount : j6, (i16 & 268435456) != 0 ? inboundVideo.totalFreezesDuration : j7, (i16 & 536870912) != 0 ? inboundVideo.totalPausesDuration : j8, (i16 & BasicMeasure.EXACTLY) != 0 ? inboundVideo.totalFramesDuration : j9, (i16 & Integer.MIN_VALUE) != 0 ? inboundVideo.sumOfSquaredFramesDurations : d);
     }
 
     public final String component1() {
@@ -146,10 +159,34 @@ public final class InboundVideo {
         return this.width;
     }
 
+    public final long component27() {
+        return this.freezeCount;
+    }
+
+    public final long component28() {
+        return this.pauseCount;
+    }
+
+    public final long component29() {
+        return this.totalFreezesDuration;
+    }
+
     public final int component3() {
         return this.currentDelay;
     }
 
+    public final long component30() {
+        return this.totalPausesDuration;
+    }
+
+    public final long component31() {
+        return this.totalFramesDuration;
+    }
+
+    public final double component32() {
+        return this.sumOfSquaredFramesDurations;
+    }
+
     public final int component4() {
         return this.currentPayloadType;
     }
@@ -174,13 +211,13 @@ public final class InboundVideo {
         return this.framesDecoded;
     }
 
-    public final InboundVideo copy(String str, int i, int i2, int i3, int i4, int i5, String str2, FrameCounts frameCounts, long j, long j2, int i6, int i7, int i8, int i9, int i10, int i11, long j3, int i12, int i13, InboundRtcpStats inboundRtcpStats, InboundRtpStats inboundRtpStats, long j4, float f, float f2, int i14, int i15) {
+    public final InboundVideo copy(String str, int i, int i2, int i3, int i4, int i5, String str2, FrameCounts frameCounts, long j, long j2, int i6, int i7, int i8, int i9, int i10, int i11, long j3, int i12, int i13, InboundRtcpStats inboundRtcpStats, InboundRtpStats inboundRtpStats, long j4, float f, float f2, int i14, int i15, long j5, long j6, long j7, long j8, long j9, double d) {
         m.checkNotNullParameter(str, "codecName");
         m.checkNotNullParameter(str2, "decoderImplementationName");
         m.checkNotNullParameter(frameCounts, "frameCounts");
         m.checkNotNullParameter(inboundRtcpStats, "rtcpStats");
         m.checkNotNullParameter(inboundRtpStats, "rtpStats");
-        return new InboundVideo(str, i, i2, i3, i4, i5, str2, frameCounts, j, j2, i6, i7, i8, i9, i10, i11, j3, i12, i13, inboundRtcpStats, inboundRtpStats, j4, f, f2, i14, i15);
+        return new InboundVideo(str, i, i2, i3, i4, i5, str2, frameCounts, j, j2, i6, i7, i8, i9, i10, i11, j3, i12, i13, inboundRtcpStats, inboundRtpStats, j4, f, f2, i14, i15, j5, j6, j7, j8, j9, d);
     }
 
     public boolean equals(Object obj) {
@@ -191,7 +228,7 @@ public final class InboundVideo {
             return false;
         }
         InboundVideo inboundVideo = (InboundVideo) obj;
-        return m.areEqual(this.codecName, inboundVideo.codecName) && this.codecPayloadType == inboundVideo.codecPayloadType && this.currentDelay == inboundVideo.currentDelay && this.currentPayloadType == inboundVideo.currentPayloadType && this.decodeFrameRate == inboundVideo.decodeFrameRate && this.decode == inboundVideo.decode && m.areEqual(this.decoderImplementationName, inboundVideo.decoderImplementationName) && m.areEqual(this.frameCounts, inboundVideo.frameCounts) && this.framesDecoded == inboundVideo.framesDecoded && this.framesRendered == inboundVideo.framesRendered && this.framesDropped == inboundVideo.framesDropped && this.height == inboundVideo.height && this.jitterBuffer == inboundVideo.jitterBuffer && this.maxDecode == inboundVideo.maxDecode && this.minPlayoutDelay == inboundVideo.minPlayoutDelay && this.networkFrameRate == inboundVideo.networkFrameRate && this.qpSum == inboundVideo.qpSum && this.renderDelay == inboundVideo.renderDelay && this.renderFrameRate == inboundVideo.renderFrameRate && m.areEqual(this.rtcpStats, inboundVideo.rtcpStats) && m.areEqual(this.rtpStats, inboundVideo.rtpStats) && this.ssrc == inboundVideo.ssrc && Float.compare(this.syncOffset, inboundVideo.syncOffset) == 0 && Float.compare(this.targetDelay, inboundVideo.targetDelay) == 0 && this.totalBitrate == inboundVideo.totalBitrate && this.width == inboundVideo.width;
+        return m.areEqual(this.codecName, inboundVideo.codecName) && this.codecPayloadType == inboundVideo.codecPayloadType && this.currentDelay == inboundVideo.currentDelay && this.currentPayloadType == inboundVideo.currentPayloadType && this.decodeFrameRate == inboundVideo.decodeFrameRate && this.decode == inboundVideo.decode && m.areEqual(this.decoderImplementationName, inboundVideo.decoderImplementationName) && m.areEqual(this.frameCounts, inboundVideo.frameCounts) && this.framesDecoded == inboundVideo.framesDecoded && this.framesRendered == inboundVideo.framesRendered && this.framesDropped == inboundVideo.framesDropped && this.height == inboundVideo.height && this.jitterBuffer == inboundVideo.jitterBuffer && this.maxDecode == inboundVideo.maxDecode && this.minPlayoutDelay == inboundVideo.minPlayoutDelay && this.networkFrameRate == inboundVideo.networkFrameRate && this.qpSum == inboundVideo.qpSum && this.renderDelay == inboundVideo.renderDelay && this.renderFrameRate == inboundVideo.renderFrameRate && m.areEqual(this.rtcpStats, inboundVideo.rtcpStats) && m.areEqual(this.rtpStats, inboundVideo.rtpStats) && this.ssrc == inboundVideo.ssrc && Float.compare(this.syncOffset, inboundVideo.syncOffset) == 0 && Float.compare(this.targetDelay, inboundVideo.targetDelay) == 0 && this.totalBitrate == inboundVideo.totalBitrate && this.width == inboundVideo.width && this.freezeCount == inboundVideo.freezeCount && this.pauseCount == inboundVideo.pauseCount && this.totalFreezesDuration == inboundVideo.totalFreezesDuration && this.totalPausesDuration == inboundVideo.totalPausesDuration && this.totalFramesDuration == inboundVideo.totalFramesDuration && Double.compare(this.sumOfSquaredFramesDurations, inboundVideo.sumOfSquaredFramesDurations) == 0;
     }
 
     public final String getCodecName() {
@@ -238,6 +275,10 @@ public final class InboundVideo {
         return this.framesRendered;
     }
 
+    public final long getFreezeCount() {
+        return this.freezeCount;
+    }
+
     public final int getHeight() {
         return this.height;
     }
@@ -258,6 +299,10 @@ public final class InboundVideo {
         return this.networkFrameRate;
     }
 
+    public final long getPauseCount() {
+        return this.pauseCount;
+    }
+
     public final long getQpSum() {
         return this.qpSum;
     }
@@ -282,6 +327,10 @@ public final class InboundVideo {
         return this.ssrc;
     }
 
+    public final double getSumOfSquaredFramesDurations() {
+        return this.sumOfSquaredFramesDurations;
+    }
+
     public final float getSyncOffset() {
         return this.syncOffset;
     }
@@ -294,6 +343,18 @@ public final class InboundVideo {
         return this.totalBitrate;
     }
 
+    public final long getTotalFramesDuration() {
+        return this.totalFramesDuration;
+    }
+
+    public final long getTotalFreezesDuration() {
+        return this.totalFreezesDuration;
+    }
+
+    public final long getTotalPausesDuration() {
+        return this.totalPausesDuration;
+    }
+
     public final int getWidth() {
         return this.width;
     }
@@ -312,11 +373,15 @@ public final class InboundVideo {
         if (inboundRtpStats != null) {
             i = inboundRtpStats.hashCode();
         }
-        return ((((Float.floatToIntBits(this.targetDelay) + ((Float.floatToIntBits(this.syncOffset) + ((b.a(this.ssrc) + ((hashCode3 + i) * 31)) * 31)) * 31)) * 31) + this.totalBitrate) * 31) + this.width;
+        int a2 = b.a(this.ssrc);
+        int floatToIntBits = Float.floatToIntBits(this.syncOffset);
+        int floatToIntBits2 = Float.floatToIntBits(this.targetDelay);
+        int a3 = b.a(this.freezeCount);
+        return a.a(this.sumOfSquaredFramesDurations) + ((b.a(this.totalFramesDuration) + ((b.a(this.totalPausesDuration) + ((b.a(this.totalFreezesDuration) + ((b.a(this.pauseCount) + ((a3 + ((((((floatToIntBits2 + ((floatToIntBits + ((a2 + ((hashCode3 + i) * 31)) * 31)) * 31)) * 31) + this.totalBitrate) * 31) + this.width) * 31)) * 31)) * 31)) * 31)) * 31)) * 31);
     }
 
     public String toString() {
-        StringBuilder O = a.O("InboundVideo(codecName=");
+        StringBuilder O = c.d.b.a.a.O("InboundVideo(codecName=");
         O.append(this.codecName);
         O.append(", codecPayloadType=");
         O.append(this.codecPayloadType);
@@ -367,6 +432,20 @@ public final class InboundVideo {
         O.append(", totalBitrate=");
         O.append(this.totalBitrate);
         O.append(", width=");
-        return a.z(O, this.width, ")");
+        O.append(this.width);
+        O.append(", freezeCount=");
+        O.append(this.freezeCount);
+        O.append(", pauseCount=");
+        O.append(this.pauseCount);
+        O.append(", totalFreezesDuration=");
+        O.append(this.totalFreezesDuration);
+        O.append(", totalPausesDuration=");
+        O.append(this.totalPausesDuration);
+        O.append(", totalFramesDuration=");
+        O.append(this.totalFramesDuration);
+        O.append(", sumOfSquaredFramesDurations=");
+        O.append(this.sumOfSquaredFramesDurations);
+        O.append(")");
+        return O.toString();
     }
 }

app/src/main/java/co/discord/media_engine/internal/TransformStats.java

@@ -39,9 +39,9 @@ public final class TransformStats {
     /* JADX WARNING: Removed duplicated region for block: B:47:0x00f7  */
     /* JADX WARNING: Removed duplicated region for block: B:54:0x01c9  */
     /* JADX WARNING: Removed duplicated region for block: B:57:0x01dc  */
-    /* JADX WARNING: Removed duplicated region for block: B:95:0x03bf  */
+    /* JADX WARNING: Removed duplicated region for block: B:95:0x03d7  */
-    /* JADX WARNING: Removed duplicated region for block: B:98:0x03c9  */
+    /* JADX WARNING: Removed duplicated region for block: B:98:0x03e1  */
-    /* JADX WARNING: Removed duplicated region for block: B:99:0x03eb  */
+    /* JADX WARNING: Removed duplicated region for block: B:99:0x0403  */
     public static final Stats transform(String str) {
         OutboundRtpAudio outboundRtpAudio;
         long j;
@@ -127,7 +127,7 @@ public final class TransformStats {
                         InboundVideo video = inbound2.getVideo();
                         long payloadBytes = video.getRtpStats().getPayloadBytes() + video.getRtpStats().getPaddingBytes() + video.getRtpStats().getHeaderBytes();
                         bytesReceived += payloadBytes;
-                        InboundRtpVideo inboundRtpVideo = (InboundRtpVideo) linkedHashMap2.put(id2, new InboundRtpVideo(MediaStreamTrack.VIDEO_TRACK_KIND, video.getSsrc(), video.getCodecPayloadType() != -1 ? new StatsCodec(video.getCodecPayloadType(), video.getCodecName()) : null, payloadBytes, (int) video.getRtpStats().getPackets(), video.getRtpStats().getPacketsLost(), video.getTotalBitrate(), video.getDecode(), new Resolution(video.getWidth(), video.getHeight()), video.getDecoderImplementationName(), (int) video.getFramesDecoded(), video.getFramesDropped(), video.getFrameCounts().getKeyFrames() + video.getFrameCounts().getDeltaFrames(), video.getDecodeFrameRate(), video.getNetworkFrameRate(), video.getRenderFrameRate(), video.getRtcpStats().getFirPackets(), video.getRtcpStats().getNackPackets(), video.getRtcpStats().getPliPackets(), video.getQpSum()));
+                        InboundRtpVideo inboundRtpVideo = (InboundRtpVideo) linkedHashMap2.put(id2, new InboundRtpVideo(MediaStreamTrack.VIDEO_TRACK_KIND, video.getSsrc(), video.getCodecPayloadType() != -1 ? new StatsCodec(video.getCodecPayloadType(), video.getCodecName()) : null, payloadBytes, (int) video.getRtpStats().getPackets(), video.getRtpStats().getPacketsLost(), video.getTotalBitrate(), video.getDecode(), new Resolution(video.getWidth(), video.getHeight()), video.getDecoderImplementationName(), (int) video.getFramesDecoded(), video.getFramesDropped(), video.getFrameCounts().getKeyFrames() + video.getFrameCounts().getDeltaFrames(), video.getDecodeFrameRate(), video.getNetworkFrameRate(), video.getRenderFrameRate(), video.getRtcpStats().getFirPackets(), video.getRtcpStats().getNackPackets(), video.getRtcpStats().getPliPackets(), video.getQpSum(), video.getFreezeCount(), video.getPauseCount(), video.getTotalFreezesDuration(), video.getTotalPausesDuration(), video.getTotalFramesDuration(), video.getSumOfSquaredFramesDurations()));
                     }
                     j7 = bytesReceived;
                 }

app/src/main/java/com/discord/analytics/generated/events/TrackNotifyStreamSettingUpdate.java

@@ -0,0 +1,48 @@
+package com.discord.analytics.generated.events;
+
+import c.d.b.a.a;
+import c0.z.d.m;
+import com.discord.analytics.generated.traits.TrackBase;
+import com.discord.analytics.generated.traits.TrackBaseReceiver;
+import com.discord.api.science.AnalyticsSchema;
+/* compiled from: TrackNotifyStreamSettingUpdate.kt */
+public final class TrackNotifyStreamSettingUpdate implements AnalyticsSchema, TrackBaseReceiver {
+    private final transient String analyticsSchemaTypeName = "notify_stream_setting_update";
+    private final Boolean prechecked = null;
+    private TrackBase trackBase;
+    private final Boolean value = 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 TrackNotifyStreamSettingUpdate)) {
+            return false;
+        }
+        TrackNotifyStreamSettingUpdate trackNotifyStreamSettingUpdate = (TrackNotifyStreamSettingUpdate) obj;
+        return m.areEqual(this.value, trackNotifyStreamSettingUpdate.value) && m.areEqual(this.prechecked, trackNotifyStreamSettingUpdate.prechecked);
+    }
+
+    public int hashCode() {
+        Boolean bool = this.value;
+        int i = 0;
+        int hashCode = (bool != null ? bool.hashCode() : 0) * 31;
+        Boolean bool2 = this.prechecked;
+        if (bool2 != null) {
+            i = bool2.hashCode();
+        }
+        return hashCode + i;
+    }
+
+    public String toString() {
+        StringBuilder O = a.O("TrackNotifyStreamSettingUpdate(value=");
+        O.append(this.value);
+        O.append(", prechecked=");
+        return a.B(O, this.prechecked, ")");
+    }
+}

app/src/main/java/com/discord/analytics/generated/events/TrackNotifyStreamSettingUpdateReceiver.java

@@ -0,0 +1,6 @@
+package com.discord.analytics.generated.events;
+
+import com.discord.api.science.AnalyticsSchema;
+/* compiled from: TrackNotifyStreamSettingUpdate.kt */
+public interface TrackNotifyStreamSettingUpdateReceiver extends AnalyticsSchema {
+}

app/src/main/java/com/discord/app/DiscordConnectService.java

@@ -207,7 +207,7 @@ public final class DiscordConnectService extends Service {
             observable2 = Observable.w(new IllegalStateException("UNAUTHED"));
             m.checkNotNullExpressionValue(observable2, "Observable.error(Illegal…ateException(\"UNAUTHED\"))");
         } else {
-            c.a.d.l0.a aVar = c.a.d.l0.a.E;
+            c.a.d.l0.a aVar = c.a.d.l0.a.F;
             Regex regex = c.a.d.l0.a.s;
             String path = data.getPath();
             if (path == null) {

app/src/main/java/com/discord/models/domain/ModelUserSettings.java

@@ -25,6 +25,7 @@ public class ModelUserSettings implements Model {
     private Boolean allowAccessibilityDetection;
     private Boolean animateEmoji;
     private Integer animateStickers;
+    private Boolean contactSyncUpsellShown;
     private ModelCustomStatusSetting customStatus;
     private Boolean defaultGuildsRestricted;
     private Boolean developerMode;
@@ -252,33 +253,39 @@ public class ModelUserSettings implements Model {
                     break;
                 }
                 break;
+            case 652639068:
+                if (nextName.equals("contact_sync_enabled")) {
+                    c2 = 14;
+                    break;
+                }
+                break;
             case 1168748672:
                 if (nextName.equals("custom_status")) {
-                    c2 = 14;
+                    c2 = 15;
                     break;
                 }
                 break;
             case 1265830244:
                 if (nextName.equals("friend_source_flags")) {
-                    c2 = 15;
+                    c2 = 16;
                     break;
                 }
                 break;
             case 1776929396:
                 if (nextName.equals("animate_stickers")) {
-                    c2 = 16;
+                    c2 = 17;
                     break;
                 }
                 break;
             case 2020489111:
                 if (nextName.equals("friend_discovery_flags")) {
-                    c2 = 17;
+                    c2 = 18;
                     break;
                 }
                 break;
             case 2039062684:
                 if (nextName.equals("default_guilds_restricted")) {
-                    c2 = 18;
+                    c2 = 19;
                     break;
                 }
                 break;
@@ -335,18 +342,21 @@ public class ModelUserSettings implements Model {
                 this.inlineEmbedMedia = jsonReader.nextBooleanOrNull();
                 return;
             case 14:
-                this.customStatus = ModelCustomStatusSetting.Parser.INSTANCE.parse(jsonReader);
+                this.contactSyncUpsellShown = jsonReader.nextBooleanOrNull();
                 return;
             case 15:
-                this.friendSourceFlags = (FriendSourceFlags) jsonReader.parse(new FriendSourceFlags());
+                this.customStatus = ModelCustomStatusSetting.Parser.INSTANCE.parse(jsonReader);
                 return;
             case 16:
-                this.animateStickers = jsonReader.nextIntOrNull();
+                this.friendSourceFlags = (FriendSourceFlags) jsonReader.parse(new FriendSourceFlags());
                 return;
             case 17:
-                this.friendDiscoveryFlags = Integer.valueOf(jsonReader.nextInt(0));
+                this.animateStickers = jsonReader.nextIntOrNull();
                 return;
             case 18:
+                this.friendDiscoveryFlags = Integer.valueOf(jsonReader.nextInt(0));
+                return;
+            case 19:
                 this.defaultGuildsRestricted = jsonReader.nextBooleanOrNull();
                 return;
             default:
@@ -405,6 +415,11 @@ public class ModelUserSettings implements Model {
         if (friendDiscoveryFlags != null ? !friendDiscoveryFlags.equals(friendDiscoveryFlags2) : friendDiscoveryFlags2 != null) {
             return false;
         }
+        Boolean contactSyncUpsellShown = getContactSyncUpsellShown();
+        Boolean contactSyncUpsellShown2 = modelUserSettings.getContactSyncUpsellShown();
+        if (contactSyncUpsellShown != null ? !contactSyncUpsellShown.equals(contactSyncUpsellShown2) : contactSyncUpsellShown2 != null) {
+            return false;
+        }
         Boolean showCurrentGame = getShowCurrentGame();
         Boolean showCurrentGame2 = modelUserSettings.getShowCurrentGame();
         if (showCurrentGame != null ? !showCurrentGame.equals(showCurrentGame2) : showCurrentGame2 != null) {
@@ -472,6 +487,10 @@ public class ModelUserSettings implements Model {
         return this.animateStickers;
     }
 
+    public Boolean getContactSyncUpsellShown() {
+        return this.contactSyncUpsellShown;
+    }
+
     public ModelCustomStatusSetting getCustomStatus() {
         return this.customStatus;
     }
@@ -548,28 +567,30 @@ public class ModelUserSettings implements Model {
         int hashCode6 = (hashCode5 * 59) + (explicitContentFilter == null ? 43 : explicitContentFilter.hashCode());
         Integer friendDiscoveryFlags = getFriendDiscoveryFlags();
         int hashCode7 = (hashCode6 * 59) + (friendDiscoveryFlags == null ? 43 : friendDiscoveryFlags.hashCode());
+        Boolean contactSyncUpsellShown = getContactSyncUpsellShown();
+        int hashCode8 = (hashCode7 * 59) + (contactSyncUpsellShown == null ? 43 : contactSyncUpsellShown.hashCode());
         Boolean showCurrentGame = getShowCurrentGame();
-        int hashCode8 = (hashCode7 * 59) + (showCurrentGame == null ? 43 : showCurrentGame.hashCode());
+        int hashCode9 = (hashCode8 * 59) + (showCurrentGame == null ? 43 : showCurrentGame.hashCode());
         Boolean animateEmoji = getAnimateEmoji();
-        int hashCode9 = (hashCode8 * 59) + (animateEmoji == null ? 43 : animateEmoji.hashCode());
+        int hashCode10 = (hashCode9 * 59) + (animateEmoji == null ? 43 : animateEmoji.hashCode());
         Boolean allowAccessibilityDetection = getAllowAccessibilityDetection();
-        int hashCode10 = (hashCode9 * 59) + (allowAccessibilityDetection == null ? 43 : allowAccessibilityDetection.hashCode());
+        int hashCode11 = (hashCode10 * 59) + (allowAccessibilityDetection == null ? 43 : allowAccessibilityDetection.hashCode());
         Integer animateStickers = getAnimateStickers();
-        int hashCode11 = (hashCode10 * 59) + (animateStickers == null ? 43 : animateStickers.hashCode());
+        int hashCode12 = (hashCode11 * 59) + (animateStickers == null ? 43 : animateStickers.hashCode());
         String theme = getTheme();
-        int hashCode12 = (hashCode11 * 59) + (theme == null ? 43 : theme.hashCode());
+        int hashCode13 = (hashCode12 * 59) + (theme == null ? 43 : theme.hashCode());
         List<ModelGuildFolder> guildFolders = getGuildFolders();
-        int hashCode13 = (hashCode12 * 59) + (guildFolders == null ? 43 : guildFolders.hashCode());
+        int hashCode14 = (hashCode13 * 59) + (guildFolders == null ? 43 : guildFolders.hashCode());
         String locale = getLocale();
-        int hashCode14 = (hashCode13 * 59) + (locale == null ? 43 : locale.hashCode());
+        int hashCode15 = (hashCode14 * 59) + (locale == null ? 43 : locale.hashCode());
         List<Long> restrictedGuilds = getRestrictedGuilds();
-        int hashCode15 = (hashCode14 * 59) + (restrictedGuilds == null ? 43 : restrictedGuilds.hashCode());
+        int hashCode16 = (hashCode15 * 59) + (restrictedGuilds == null ? 43 : restrictedGuilds.hashCode());
         FriendSourceFlags friendSourceFlags = getFriendSourceFlags();
-        int hashCode16 = (hashCode15 * 59) + (friendSourceFlags == null ? 43 : friendSourceFlags.hashCode());
+        int hashCode17 = (hashCode16 * 59) + (friendSourceFlags == null ? 43 : friendSourceFlags.hashCode());
         ClientStatus status = getStatus();
-        int hashCode17 = (hashCode16 * 59) + (status == null ? 43 : status.hashCode());
+        int hashCode18 = (hashCode17 * 59) + (status == null ? 43 : status.hashCode());
         ModelCustomStatusSetting customStatus = getCustomStatus();
-        int i2 = hashCode17 * 59;
+        int i2 = hashCode18 * 59;
         if (customStatus != null) {
             i = customStatus.hashCode();
         }
@@ -601,6 +622,8 @@ public class ModelUserSettings implements Model {
         O.append(getExplicitContentFilter());
         O.append(", friendDiscoveryFlags=");
         O.append(getFriendDiscoveryFlags());
+        O.append(", contactSyncUpsellShown=");
+        O.append(getContactSyncUpsellShown());
         O.append(", status=");
         O.append(getStatus());
         O.append(", customStatus=");

app/src/main/java/com/discord/restapi/RestAPIParams.java

@@ -4284,6 +4284,7 @@ public final class RestAPIParams {
         private final Boolean animateEmoji;
         private final Integer animateStickers;
         private final Boolean blockedMessageBar;
+        private final Boolean contactSyncEnabled;
         private final Boolean defaultGuildsRestricted;
         private final Boolean developerMode;
         private final Integer explicitContentFilter;
@@ -4309,61 +4310,65 @@ public final class RestAPIParams {
             }
 
             public final UserSettings createWithAllowAccessibilityDetection(Boolean bool) {
-                return new UserSettings(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, bool, null, null, 229375, null);
+                return new UserSettings(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, bool, null, null, null, 491519, null);
             }
 
             public final UserSettings createWithAllowAnimatedEmojis(Boolean bool) {
-                return new UserSettings(null, null, null, null, null, null, null, null, null, null, null, null, null, null, bool, null, null, null, 245759, null);
+                return new UserSettings(null, null, null, null, null, null, null, null, null, null, null, null, null, null, bool, null, null, null, null, 507903, null);
             }
 
             public final UserSettings createWithBlockedMessageBar(boolean z2) {
-                return new UserSettings(null, null, null, null, null, Boolean.valueOf(z2), null, null, null, null, null, null, null, null, null, null, null, null, 262111, null);
+                return new UserSettings(null, null, null, null, null, Boolean.valueOf(z2), null, null, null, null, null, null, null, null, null, null, null, null, null, 524255, null);
+            }
+
+            public final UserSettings createWithContactSyncUpsellShown() {
+                return new UserSettings(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, Boolean.TRUE, null, 393215, null);
             }
 
             public final UserSettings createWithDeveloperMode(boolean z2) {
-                return new UserSettings(null, Boolean.valueOf(z2), null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, 262141, null);
+                return new UserSettings(null, Boolean.valueOf(z2), null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, 524285, null);
             }
 
             public final UserSettings createWithExplicitContentFilter(int i) {
-                return new UserSettings(null, null, null, null, null, null, null, null, null, null, null, null, null, Integer.valueOf(i), null, null, null, null, 253951, null);
+                return new UserSettings(null, null, null, null, null, null, null, null, null, null, null, null, null, Integer.valueOf(i), null, null, null, null, null, 516095, null);
             }
 
             public final UserSettings createWithFriendDiscoveryFlags(Integer num) {
-                return new UserSettings(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, num, 131071, null);
+                return new UserSettings(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, num, 262143, null);
             }
 
             public final UserSettings createWithFriendSourceFlags(Boolean bool, Boolean bool2, Boolean bool3) {
-                return new UserSettings(null, null, null, null, null, null, null, null, null, null, null, null, new FriendSourceFlags(bool, bool2, bool3), null, null, null, null, null, 258047, null);
+                return new UserSettings(null, null, null, null, null, null, null, null, null, null, null, null, new FriendSourceFlags(bool, bool2, bool3), null, null, null, null, null, null, 520191, null);
             }
 
             public final UserSettings createWithGuildFolders(List<ModelGuildFolder> list) {
                 m.checkNotNullParameter(list, "guildFolders");
-                return new UserSettings(null, null, null, null, null, null, null, null, null, null, list, null, null, null, null, null, null, null, 261119, null);
+                return new UserSettings(null, null, null, null, null, null, null, null, null, null, list, null, null, null, null, null, null, null, null, 523263, null);
             }
 
             public final UserSettings createWithInlineAttachmentMedia(boolean z2) {
-                return new UserSettings(null, null, null, null, Boolean.valueOf(z2), null, null, null, null, null, null, null, null, null, null, null, null, null, 262127, null);
+                return new UserSettings(null, null, null, null, Boolean.valueOf(z2), null, null, null, null, null, null, null, null, null, null, null, null, null, null, 524271, null);
             }
 
             public final UserSettings createWithInlineEmbedMedia(boolean z2) {
-                return new UserSettings(null, null, null, Boolean.valueOf(z2), null, null, null, null, null, null, null, null, null, null, null, null, null, null, 262135, null);
+                return new UserSettings(null, null, null, Boolean.valueOf(z2), null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, 524279, null);
             }
 
             public final UserSettings createWithLocale(String str) {
                 m.checkNotNullParameter(str, "locale");
-                return new UserSettings(null, null, null, null, null, null, str, null, null, null, null, null, null, null, null, null, null, null, 262079, null);
+                return new UserSettings(null, null, null, null, null, null, str, null, null, null, null, null, null, null, null, null, null, null, null, 524223, null);
             }
 
             public final UserSettings createWithRenderEmbeds(boolean z2) {
-                return new UserSettings(null, null, Boolean.valueOf(z2), null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, 262139, null);
+                return new UserSettings(null, null, Boolean.valueOf(z2), null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, 524283, null);
             }
 
             public final UserSettings createWithRestrictedGuilds(Boolean bool, Collection<Long> collection) {
-                return new UserSettings(null, null, null, null, null, null, null, collection, null, null, null, bool, null, null, null, null, null, null, 259967, null);
+                return new UserSettings(null, null, null, null, null, null, null, collection, null, null, null, bool, null, null, null, null, null, null, null, 522111, null);
             }
 
             public final UserSettings createWithShowCurrentGame(boolean z2) {
-                return new UserSettings(null, null, null, null, null, null, null, null, null, Boolean.valueOf(z2), null, null, null, null, null, null, null, null, 261631, null);
+                return new UserSettings(null, null, null, null, null, null, null, null, null, Boolean.valueOf(z2), null, null, null, null, null, null, null, null, null, 523775, null);
             }
 
             public final UserSettings createWithStatus(ClientStatus clientStatus) {
@@ -4374,16 +4379,16 @@ public final class RestAPIParams {
                 Objects.requireNonNull(name, "null cannot be cast to non-null type java.lang.String");
                 String lowerCase = name.toLowerCase(locale);
                 m.checkNotNullExpressionValue(lowerCase, "(this as java.lang.String).toLowerCase(locale)");
-                return new UserSettings(null, null, null, null, null, null, null, null, lowerCase, null, null, null, null, null, null, null, null, null, 261887, null);
+                return new UserSettings(null, null, null, null, null, null, null, null, lowerCase, null, null, null, null, null, null, null, null, null, null, 524031, null);
             }
 
             public final UserSettings createWithStickerAnimationSettings(Integer num) {
-                return new UserSettings(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, num, null, 196607, null);
+                return new UserSettings(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, num, null, null, 458751, null);
             }
 
             public final UserSettings createWithTheme(String str) {
                 m.checkNotNullParameter(str, "theme");
-                return new UserSettings(str, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, 262142, null);
+                return new UserSettings(str, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, 524286, null);
             }
         }
 
@@ -4400,7 +4405,7 @@ public final class RestAPIParams {
             }
         }
 
-        private UserSettings(String str, Boolean bool, Boolean bool2, Boolean bool3, Boolean bool4, Boolean bool5, String str2, Collection<Long> collection, String str3, Boolean bool6, Collection<ModelGuildFolder> collection2, Boolean bool7, FriendSourceFlags friendSourceFlags, Integer num, Boolean bool8, Boolean bool9, Integer num2, Integer num3) {
+        private UserSettings(String str, Boolean bool, Boolean bool2, Boolean bool3, Boolean bool4, Boolean bool5, String str2, Collection<Long> collection, String str3, Boolean bool6, Collection<ModelGuildFolder> collection2, Boolean bool7, FriendSourceFlags friendSourceFlags, Integer num, Boolean bool8, Boolean bool9, Integer num2, Boolean bool10, Integer num3) {
             this.theme = str;
             this.developerMode = bool;
             this.renderEmbeds = bool2;
@@ -4418,12 +4423,13 @@ public final class RestAPIParams {
             this.animateEmoji = bool8;
             this.allowAccessibilityDetection = bool9;
             this.animateStickers = num2;
+            this.contactSyncEnabled = bool10;
             this.friendDiscoveryFlags = num3;
         }
 
         /* JADX INFO: this call moved to the top of the method (can break code semantics) */
-        public /* synthetic */ UserSettings(String str, Boolean bool, Boolean bool2, Boolean bool3, Boolean bool4, Boolean bool5, String str2, Collection collection, String str3, Boolean bool6, Collection collection2, Boolean bool7, FriendSourceFlags friendSourceFlags, Integer num, Boolean bool8, Boolean bool9, Integer num2, Integer num3, int i, DefaultConstructorMarker defaultConstructorMarker) {
+        public /* synthetic */ UserSettings(String str, Boolean bool, Boolean bool2, Boolean bool3, Boolean bool4, Boolean bool5, String str2, Collection collection, String str3, Boolean bool6, Collection collection2, Boolean bool7, FriendSourceFlags friendSourceFlags, Integer num, Boolean bool8, Boolean bool9, Integer num2, Boolean bool10, Integer num3, int i, DefaultConstructorMarker defaultConstructorMarker) {
-            this((i & 1) != 0 ? null : str, (i & 2) != 0 ? null : bool, (i & 4) != 0 ? null : bool2, (i & 8) != 0 ? null : bool3, (i & 16) != 0 ? null : bool4, (i & 32) != 0 ? null : bool5, (i & 64) != 0 ? null : str2, (i & 128) != 0 ? null : collection, (i & 256) != 0 ? null : str3, (i & 512) != 0 ? null : bool6, (i & 1024) != 0 ? null : collection2, (i & 2048) != 0 ? null : bool7, (i & 4096) != 0 ? null : friendSourceFlags, (i & 8192) != 0 ? null : num, (i & 16384) != 0 ? null : bool8, (i & 32768) != 0 ? null : bool9, (i & 65536) != 0 ? null : num2, (i & 131072) != 0 ? null : num3);
+            this((i & 1) != 0 ? null : str, (i & 2) != 0 ? null : bool, (i & 4) != 0 ? null : bool2, (i & 8) != 0 ? null : bool3, (i & 16) != 0 ? null : bool4, (i & 32) != 0 ? null : bool5, (i & 64) != 0 ? null : str2, (i & 128) != 0 ? null : collection, (i & 256) != 0 ? null : str3, (i & 512) != 0 ? null : bool6, (i & 1024) != 0 ? null : collection2, (i & 2048) != 0 ? null : bool7, (i & 4096) != 0 ? null : friendSourceFlags, (i & 8192) != 0 ? null : num, (i & 16384) != 0 ? null : bool8, (i & 32768) != 0 ? null : bool9, (i & 65536) != 0 ? null : num2, (i & 131072) != 0 ? null : bool10, (i & 262144) != 0 ? null : num3);
         }
 
         public static final UserSettings createWithAllowAccessibilityDetection(Boolean bool) {
@@ -4438,6 +4444,10 @@ public final class RestAPIParams {
             return Companion.createWithBlockedMessageBar(z2);
         }
 
+        public static final UserSettings createWithContactSyncUpsellShown() {
+            return Companion.createWithContactSyncUpsellShown();
+        }
+
         public static final UserSettings createWithDeveloperMode(boolean z2) {
             return Companion.createWithDeveloperMode(z2);
         }

app/src/main/java/com/discord/stores/StoreContactSync.java

@@ -37,9 +37,10 @@ public final class StoreContactSync extends StoreV2 {
     private final RestAPI restAPI;
     private boolean shouldTryUploadContacts;
     private final Persister<Long> uploadTimestampCache = new Persister<>("CONTACT_SYNC_LAST_UPLOAD_TIME", 0L);
+    private final StoreUserSettings userSettingsStore;
     private final StoreUser usersStore;
 
-    public StoreContactSync(Dispatcher dispatcher, RestAPI restAPI, Clock clock, StoreUserConnections storeUserConnections, StoreUser storeUser, StoreExperiments storeExperiments, StoreNotices storeNotices) {
+    public StoreContactSync(Dispatcher dispatcher, RestAPI restAPI, Clock clock, StoreUserConnections storeUserConnections, StoreUser storeUser, StoreExperiments storeExperiments, StoreNotices storeNotices, StoreUserSettings storeUserSettings) {
         m.checkNotNullParameter(dispatcher, "dispatcher");
         m.checkNotNullParameter(restAPI, "restAPI");
         m.checkNotNullParameter(clock, "clock");
@@ -47,6 +48,7 @@ public final class StoreContactSync extends StoreV2 {
         m.checkNotNullParameter(storeUser, "usersStore");
         m.checkNotNullParameter(storeExperiments, "experimentsStore");
         m.checkNotNullParameter(storeNotices, "noticesStore");
+        m.checkNotNullParameter(storeUserSettings, "userSettingsStore");
         this.dispatcher = dispatcher;
         this.restAPI = restAPI;
         this.clock = clock;
@@ -54,6 +56,7 @@ public final class StoreContactSync extends StoreV2 {
         this.usersStore = storeUser;
         this.experimentsStore = storeExperiments;
         this.noticesStore = storeNotices;
+        this.userSettingsStore = storeUserSettings;
     }
 
     private final StoreNotices.Notice createContactSyncNotice() {
@@ -120,15 +123,23 @@ public final class StoreContactSync extends StoreV2 {
         }
         ModelConnectedAccount modelConnectedAccount2 = modelConnectedAccount;
         Boolean bool = this.dismissState.get("CONTACT_SYNC_DISMISS_UPSELL");
+        Boolean contactSyncUpsellShown = this.userSettingsStore.getContactSyncUpsellShown();
         boolean z2 = false;
         Experiment userExperiment = this.experimentsStore.getUserExperiment("2021-04_contact_sync_android_main", modelConnectedAccount2 == null);
         if (userExperiment != null && userExperiment.getBucket() == 1 && modelConnectedAccount2 == null) {
             UserUtils userUtils = UserUtils.INSTANCE;
-            if (userUtils.getHasPhone(me2) && (!m.areEqual(bool, Boolean.TRUE)) && userUtils.getAgeMs(me2, ClockFactory.get()) > 604800000) {
+            if (userUtils.getHasPhone(me2)) {
-                z2 = true;
+                Boolean bool2 = Boolean.TRUE;
+                if ((!m.areEqual(bool, bool2)) && (!m.areEqual(contactSyncUpsellShown, bool2)) && userUtils.getAgeMs(me2, ClockFactory.get()) > 604800000) {
+                    z2 = true;
+                }
             }
         }
         Experiment userExperiment2 = this.experimentsStore.getUserExperiment("2021-04_contact_sync_android_existing_user_phone_prompt", z2);
+        Boolean bool3 = Boolean.TRUE;
+        if (m.areEqual(bool, bool3) && (!m.areEqual(contactSyncUpsellShown, bool3))) {
+            this.userSettingsStore.updateContactSyncShown();
+        }
         if (z2 && userExperiment2 != null && userExperiment2.getBucket() == 1) {
             this.noticesStore.requestToShow(createContactSyncNotice());
         }

app/src/main/java/com/discord/stores/StoreDynamicLink$storeLinkIfExists$1.java

@@ -35,7 +35,7 @@ public final class StoreDynamicLink$storeLinkIfExists$1<T, R> implements b<Uri,
         IntentUtils intentUtils = IntentUtils.INSTANCE;
         m.checkNotNullExpressionValue(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
         Uri uri2 = intentUtils.isHttpDomainUrl(uri) ? uri : null;
-        a aVar = a.E;
+        a aVar = a.F;
         m.checkNotNullParameter(uri, "$this$isInviteLink");
         boolean z2 = false;
         String str8 = "";
@@ -60,7 +60,7 @@ public final class StoreDynamicLink$storeLinkIfExists$1<T, R> implements b<Uri,
                     }
                 }
                 str = str6;
-                a aVar2 = a.E;
+                a aVar2 = a.F;
                 m.checkNotNullParameter(uri, "$this$isGuildTemplateLink");
                 if (t.equals(uri.getHost(), a.e, true) || ((t.equals(uri.getHost(), a.a, true) || t.equals(uri.getHost(), a.b, true)) && (path = uri.getPath()) != null && a.p.matches(path))) {
                     z2 = true;
@@ -100,7 +100,7 @@ public final class StoreDynamicLink$storeLinkIfExists$1<T, R> implements b<Uri,
             }
         }
         str = null;
-        a aVar2 = a.E;
+        a aVar2 = a.F;
         m.checkNotNullParameter(uri, "$this$isGuildTemplateLink");
         z2 = true;
         if (z2) {

app/src/main/java/com/discord/stores/StoreStageChannels.java

@@ -382,83 +382,75 @@ public final class StoreStageChannels extends StoreV2 {
     }
 
     public final Map<Long, StageChannel> getStageChannelsInGuild(long j, Map<Long, Channel> map, long j2, Map<Long, ? extends User> map2, Map<Long, VoiceState> map3) {
-        ArrayList arrayList;
-        Iterator it;
-        StageChannel stageChannel;
         StoreStageChannels storeStageChannels = this;
         Map<Long, ? extends User> map4 = map2;
         m.checkNotNullParameter(map, "channelsInGuild");
         m.checkNotNullParameter(map4, "users");
         m.checkNotNullParameter(map3, "voiceStates");
         Collection<Channel> values = map.values();
-        ArrayList arrayList2 = new ArrayList();
+        ArrayList arrayList = new ArrayList();
-        Iterator it2 = values.iterator();
+        for (Object obj : values) {
-        while (it2.hasNext()) {
+            if (ChannelUtils.z((Channel) obj)) {
-            Channel channel = (Channel) it2.next();
+                arrayList.add(obj);
-            Map map5 = (Map) a.c(channel, storeStageChannels.stageRolesByChannelSnapshot);
-            if (map5 != null) {
-                Set<Number> keySet = map5.keySet();
-                ArrayList arrayList3 = new ArrayList();
-                for (Number number : keySet) {
-                    User user = (User) map4.get(Long.valueOf(number.longValue()));
-                    if (user != null) {
-                        arrayList3.add(user);
-                    }
-                }
-                ArrayList<User> arrayList4 = new ArrayList();
-                for (Object obj : arrayList3) {
-                    StageRoles r11 = storeStageChannels.m28getUserRolesuOBN1zc(((User) obj).getId(), channel.h());
-                    if (r11 != null && StageRoles.m43isSpeakerimpl(r11.m45unboximpl())) {
-                        arrayList4.add(obj);
-                    }
-                }
-                ArrayList arrayList5 = new ArrayList(o.collectionSizeOrDefault(arrayList4, 10));
-                for (User user2 : arrayList4) {
-                    arrayList5.add(Long.valueOf(user2.getId()));
-                }
-                Set set = u.toSet(arrayList5);
-                int size = arrayList3.size() - set.size();
-                Long l = (Long) a.c(channel, storeStageChannels.permissionsStore.getPermissionsByChannel());
-                boolean z2 = PermissionUtils.can(Permission.CONNECT, l) && PermissionUtils.can(Permission.VIEW_CHANNEL, l);
-                Map<Long, GuildMember> map6 = storeStageChannels.guildsStore.getMembers().get(Long.valueOf(j));
-                ArrayList<User> arrayList6 = new ArrayList();
-                for (Object obj2 : arrayList3) {
-                    if (set.contains(Long.valueOf(((User) obj2).getId()))) {
-                        arrayList6.add(obj2);
-                    }
-                }
-                ArrayList arrayList7 = new ArrayList(o.collectionSizeOrDefault(arrayList6, 10));
-                for (User user3 : arrayList6) {
-                    arrayList7.add(new UserGuildMember(user3, map6 != null ? (GuildMember) a.e(user3, map6) : null));
-                }
-                it = it2;
-                arrayList = arrayList2;
-                StageRoles r9 = storeStageChannels.m26getMyRolesvisDeB4(channel.h());
-                StageInstance stageInstanceForChannel = storeStageChannels.stageInstancesStore.getStageInstanceForChannel(channel.h());
-                VoiceState voiceState = map3.get(Long.valueOf(j2));
-                Long a = voiceState != null ? voiceState.a() : null;
-                stageChannel = new StageChannel(channel, arrayList3, r9, set, arrayList7, size, stageInstanceForChannel, z2, a != null && a.longValue() == channel.h(), null);
-            } else {
-                it = it2;
-                arrayList = arrayList2;
-                stageChannel = null;
-            }
-            if (stageChannel != null) {
-                arrayList.add(stageChannel);
-                map4 = map2;
-                arrayList2 = arrayList;
-                it2 = it;
-                storeStageChannels = this;
-            } else {
-                storeStageChannels = this;
-                arrayList2 = arrayList;
-                map4 = map2;
-                it2 = it;
             }
         }
-        LinkedHashMap linkedHashMap = new LinkedHashMap(f.coerceAtLeast(g0.mapCapacity(o.collectionSizeOrDefault(arrayList2, 10)), 16));
+        int i = 10;
-        for (Object obj3 : arrayList2) {
+        ArrayList arrayList2 = new ArrayList(o.collectionSizeOrDefault(arrayList, 10));
-            linkedHashMap.put(Long.valueOf(((StageChannel) obj3).getChannel().h()), obj3);
+        Iterator it = arrayList.iterator();
+        while (it.hasNext()) {
+            Channel channel = (Channel) it.next();
+            Map map5 = (Map) a.c(channel, storeStageChannels.stageRolesByChannelSnapshot);
+            if (map5 == null) {
+                map5 = h0.emptyMap();
+            }
+            Set<Number> keySet = map5.keySet();
+            ArrayList arrayList3 = new ArrayList();
+            for (Number number : keySet) {
+                User user = (User) map4.get(Long.valueOf(number.longValue()));
+                if (user != null) {
+                    arrayList3.add(user);
+                }
+            }
+            ArrayList<User> arrayList4 = new ArrayList();
+            for (Object obj2 : arrayList3) {
+                StageRoles r11 = storeStageChannels.m28getUserRolesuOBN1zc(((User) obj2).getId(), channel.h());
+                if (r11 != null && StageRoles.m43isSpeakerimpl(r11.m45unboximpl())) {
+                    arrayList4.add(obj2);
+                }
+            }
+            ArrayList arrayList5 = new ArrayList(o.collectionSizeOrDefault(arrayList4, 10));
+            for (User user2 : arrayList4) {
+                arrayList5.add(Long.valueOf(user2.getId()));
+            }
+            Set set = u.toSet(arrayList5);
+            int size = arrayList3.size() - set.size();
+            Long l = (Long) a.c(channel, storeStageChannels.permissionsStore.getPermissionsByChannel());
+            boolean z2 = PermissionUtils.can(Permission.CONNECT, l) && PermissionUtils.can(Permission.VIEW_CHANNEL, l);
+            Map<Long, GuildMember> map6 = storeStageChannels.guildsStore.getMembers().get(Long.valueOf(j));
+            ArrayList<User> arrayList6 = new ArrayList();
+            for (Object obj3 : arrayList3) {
+                if (set.contains(Long.valueOf(((User) obj3).getId()))) {
+                    arrayList6.add(obj3);
+                }
+            }
+            ArrayList arrayList7 = new ArrayList(o.collectionSizeOrDefault(arrayList6, 10));
+            for (User user3 : arrayList6) {
+                arrayList7.add(new UserGuildMember(user3, map6 != null ? (GuildMember) a.e(user3, map6) : null));
+            }
+            StageRoles r9 = storeStageChannels.m26getMyRolesvisDeB4(channel.h());
+            StageInstance stageInstanceForChannel = storeStageChannels.stageInstancesStore.getStageInstanceForChannel(channel.h());
+            VoiceState voiceState = map3.get(Long.valueOf(j2));
+            Long a = voiceState != null ? voiceState.a() : null;
+            arrayList2.add(new StageChannel(channel, arrayList3, r9, set, arrayList7, size, stageInstanceForChannel, z2, a != null && a.longValue() == channel.h(), null));
+            i = 10;
+            map4 = map2;
+            arrayList2 = arrayList2;
+            it = it;
+            storeStageChannels = this;
+        }
+        LinkedHashMap linkedHashMap = new LinkedHashMap(f.coerceAtLeast(g0.mapCapacity(o.collectionSizeOrDefault(arrayList2, i)), 16));
+        for (Object obj4 : arrayList2) {
+            linkedHashMap.put(Long.valueOf(((StageChannel) obj4).getChannel().h()), obj4);
         }
         return linkedHashMap;
     }

app/src/main/java/com/discord/stores/StoreStream.java

@@ -1001,7 +1001,7 @@ public final class StoreStream {
         this.stageSelfPresence = storeStageChannelSelfPresence;
         StoreAutocomplete storeAutocomplete = new StoreAutocomplete(ObservationDeckProvider.get(), this.dispatcher);
         this.autocomplete = storeAutocomplete;
-        StoreContactSync storeContactSync = new StoreContactSync(this.dispatcher, companion.getApi(), this.clock, this.userConnections, this.users, this.experiments, this.notices);
+        StoreContactSync storeContactSync = new StoreContactSync(this.dispatcher, companion.getApi(), this.clock, this.userConnections, this.users, this.experiments, this.notices, this.userSettings);
         this.contactSync = storeContactSync;
         Dispatcher dispatcher2 = this.dispatcher;
         StoreFriendSuggestions storeFriendSuggestions = new StoreFriendSuggestions(this, dispatcher2, new FriendSuggestionsFetcher(dispatcher2, companion.getApi(), new StoreStream$friendSuggestions$1(this), new StoreStream$friendSuggestions$2(this)));

app/src/main/java/com/discord/stores/StoreUserSettings.java

@@ -36,6 +36,7 @@ public final class StoreUserSettings extends Store {
     private final Persister<Boolean> allowAccessibilityDetectionPublisher;
     private final Persister<Boolean> allowAnimatedEmojisPublisher;
     private final Persister<Boolean> autoPlayGifsPublisher;
+    private Boolean contactSyncUpsellShown;
     private final SerializedSubject<ModelCustomStatusSetting, ModelCustomStatusSetting> customStatusSubject = new SerializedSubject<>(BehaviorSubject.k0());
     private final SerializedSubject<Boolean, Boolean> defaultGuildsRestrictedSubject = new SerializedSubject<>(BehaviorSubject.k0());
     private final Dispatcher dispatcher;
@@ -179,6 +180,9 @@ public final class StoreUserSettings extends Store {
             SerializedSubject<Integer, Integer> serializedSubject4 = this.friendDiscoveryFlagsSubject;
             serializedSubject4.j.onNext(modelUserSettings.getFriendDiscoveryFlags());
         }
+        if (modelUserSettings.getContactSyncUpsellShown() != null) {
+            this.contactSyncUpsellShown = modelUserSettings.getContactSyncUpsellShown();
+        }
     }
 
     public static /* synthetic */ Observable observeIsAnimatedEmojisEnabled$default(StoreUserSettings storeUserSettings, boolean z2, int i, Object obj) {
@@ -228,6 +232,10 @@ public final class StoreUserSettings extends Store {
         }
     }
 
+    public final Boolean getContactSyncUpsellShown() {
+        return this.contactSyncUpsellShown;
+    }
+
     public final boolean getIsAttachmentMediaInline() {
         return getPrefs().getBoolean("CACHE_KEY_INLINE_ATTACHMENT_MEDIA", true);
     }
@@ -405,6 +413,10 @@ public final class StoreUserSettings extends Store {
         return q;
     }
 
+    public final void setContactSyncUpsellShown(Boolean bool) {
+        this.contactSyncUpsellShown = bool;
+    }
+
     public final void setDefaultGuildsRestricted(AppActivity appActivity, boolean z2, Collection<Long> collection) {
         if (appActivity != null) {
             Companion.updateUserSettings$default(Companion, appActivity, RestAPIParams.UserSettings.Companion.createWithRestrictedGuilds(Boolean.valueOf(z2), collection), null, 2, null);
@@ -551,6 +563,10 @@ public final class StoreUserSettings extends Store {
         }
     }
 
+    public final Observable<ModelUserSettings> updateContactSyncShown() {
+        return RestAPI.Companion.getApi().updateUserSettings(RestAPIParams.UserSettings.Companion.createWithContactSyncUpsellShown());
+    }
+
     public final Observable<ModelUserSettings> updateCustomStatus(ModelCustomStatusSetting modelCustomStatusSetting) {
         return RestAPI.Companion.getApiSerializeNulls().updateUserSettingsCustomStatus(new RestAPIParams.UserSettingsCustomStatus(modelCustomStatusSetting));
     }

app/src/main/java/com/discord/utilities/intent/IntentUtils$pathRouterMap$10.java

@@ -10,12 +10,12 @@ import kotlin.text.MatchResult;
 /* compiled from: IntentUtils.kt */
 public final /* synthetic */ class IntentUtils$pathRouterMap$10 extends k implements Function3<Uri, MatchResult, Context, RouteHandlers.AnalyticsMetadata> {
     public IntentUtils$pathRouterMap$10(RouteHandlers routeHandlers) {
-        super(3, routeHandlers, RouteHandlers.class, "remoteAuth", "remoteAuth(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;", 0);
+        super(3, routeHandlers, RouteHandlers.class, "authorize", "authorize(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;", 0);
     }
 
     public final RouteHandlers.AnalyticsMetadata invoke(Uri uri, MatchResult matchResult, Context context) {
         m.checkNotNullParameter(uri, "p1");
         m.checkNotNullParameter(context, "p3");
-        return ((RouteHandlers) this.receiver).remoteAuth(uri, matchResult, context);
+        return ((RouteHandlers) this.receiver).authorize(uri, matchResult, context);
     }
 }

app/src/main/java/com/discord/utilities/intent/IntentUtils$pathRouterMap$11.java

@@ -10,12 +10,12 @@ import kotlin.text.MatchResult;
 /* compiled from: IntentUtils.kt */
 public final /* synthetic */ class IntentUtils$pathRouterMap$11 extends k implements Function3<Uri, MatchResult, Context, RouteHandlers.AnalyticsMetadata> {
     public IntentUtils$pathRouterMap$11(RouteHandlers routeHandlers) {
-        super(3, routeHandlers, RouteHandlers.class, "selectPremiumGuild", "selectPremiumGuild(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;", 0);
+        super(3, routeHandlers, RouteHandlers.class, "remoteAuth", "remoteAuth(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;", 0);
     }
 
     public final RouteHandlers.AnalyticsMetadata invoke(Uri uri, MatchResult matchResult, Context context) {
         m.checkNotNullParameter(uri, "p1");
         m.checkNotNullParameter(context, "p3");
-        return ((RouteHandlers) this.receiver).selectPremiumGuild(uri, matchResult, context);
+        return ((RouteHandlers) this.receiver).remoteAuth(uri, matchResult, context);
     }
 }

app/src/main/java/com/discord/utilities/intent/IntentUtils$pathRouterMap$12.java

@@ -10,12 +10,12 @@ import kotlin.text.MatchResult;
 /* compiled from: IntentUtils.kt */
 public final /* synthetic */ class IntentUtils$pathRouterMap$12 extends k implements Function3<Uri, MatchResult, Context, RouteHandlers.AnalyticsMetadata> {
     public IntentUtils$pathRouterMap$12(RouteHandlers routeHandlers) {
-        super(3, routeHandlers, RouteHandlers.class, "handleQuery", "handleQuery(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;", 0);
+        super(3, routeHandlers, RouteHandlers.class, "selectPremiumGuild", "selectPremiumGuild(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;", 0);
     }
 
     public final RouteHandlers.AnalyticsMetadata invoke(Uri uri, MatchResult matchResult, Context context) {
         m.checkNotNullParameter(uri, "p1");
         m.checkNotNullParameter(context, "p3");
-        return ((RouteHandlers) this.receiver).handleQuery(uri, matchResult, context);
+        return ((RouteHandlers) this.receiver).selectPremiumGuild(uri, matchResult, context);
     }
 }

app/src/main/java/com/discord/utilities/intent/IntentUtils$pathRouterMap$13.java

@@ -10,12 +10,12 @@ import kotlin.text.MatchResult;
 /* compiled from: IntentUtils.kt */
 public final /* synthetic */ class IntentUtils$pathRouterMap$13 extends k implements Function3<Uri, MatchResult, Context, RouteHandlers.AnalyticsMetadata> {
     public IntentUtils$pathRouterMap$13(RouteHandlers routeHandlers) {
-        super(3, routeHandlers, RouteHandlers.class, "wildCardMatcher", "wildCardMatcher(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;", 0);
+        super(3, routeHandlers, RouteHandlers.class, "handleQuery", "handleQuery(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;", 0);
     }
 
     public final RouteHandlers.AnalyticsMetadata invoke(Uri uri, MatchResult matchResult, Context context) {
         m.checkNotNullParameter(uri, "p1");
         m.checkNotNullParameter(context, "p3");
-        return ((RouteHandlers) this.receiver).wildCardMatcher(uri, matchResult, context);
+        return ((RouteHandlers) this.receiver).handleQuery(uri, matchResult, context);
     }
 }

app/src/main/java/com/discord/utilities/intent/IntentUtils$pathRouterMap$14.java

@@ -0,0 +1,21 @@
+package com.discord.utilities.intent;
+
+import android.content.Context;
+import android.net.Uri;
+import c0.z.d.k;
+import c0.z.d.m;
+import com.discord.utilities.intent.RouteHandlers;
+import kotlin.jvm.functions.Function3;
+import kotlin.text.MatchResult;
+/* compiled from: IntentUtils.kt */
+public final /* synthetic */ class IntentUtils$pathRouterMap$14 extends k implements Function3<Uri, MatchResult, Context, RouteHandlers.AnalyticsMetadata> {
+    public IntentUtils$pathRouterMap$14(RouteHandlers routeHandlers) {
+        super(3, routeHandlers, RouteHandlers.class, "wildCardMatcher", "wildCardMatcher(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;", 0);
+    }
+
+    public final RouteHandlers.AnalyticsMetadata invoke(Uri uri, MatchResult matchResult, Context context) {
+        m.checkNotNullParameter(uri, "p1");
+        m.checkNotNullParameter(context, "p3");
+        return ((RouteHandlers) this.receiver).wildCardMatcher(uri, matchResult, context);
+    }
+}

app/src/main/java/com/discord/utilities/intent/IntentUtils$pathRouterMap$2.java

@@ -10,12 +10,12 @@ import kotlin.text.MatchResult;
 /* compiled from: IntentUtils.kt */
 public final /* synthetic */ class IntentUtils$pathRouterMap$2 extends k implements Function3<Uri, MatchResult, Context, RouteHandlers.AnalyticsMetadata> {
     public IntentUtils$pathRouterMap$2(RouteHandlers routeHandlers) {
-        super(3, routeHandlers, RouteHandlers.class, "navigateToFriendsScreen", "navigateToFriendsScreen(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;", 0);
+        super(3, routeHandlers, RouteHandlers.class, "openEventDetails", "openEventDetails(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;", 0);
     }
 
     public final RouteHandlers.AnalyticsMetadata invoke(Uri uri, MatchResult matchResult, Context context) {
         m.checkNotNullParameter(uri, "p1");
         m.checkNotNullParameter(context, "p3");
-        return ((RouteHandlers) this.receiver).navigateToFriendsScreen(uri, matchResult, context);
+        return ((RouteHandlers) this.receiver).openEventDetails(uri, matchResult, context);
     }
 }

app/src/main/java/com/discord/utilities/intent/IntentUtils$pathRouterMap$3.java

@@ -10,12 +10,12 @@ import kotlin.text.MatchResult;
 /* compiled from: IntentUtils.kt */
 public final /* synthetic */ class IntentUtils$pathRouterMap$3 extends k implements Function3<Uri, MatchResult, Context, RouteHandlers.AnalyticsMetadata> {
     public IntentUtils$pathRouterMap$3(RouteHandlers routeHandlers) {
-        super(3, routeHandlers, RouteHandlers.class, "selectDirectMessage", "selectDirectMessage(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;", 0);
+        super(3, routeHandlers, RouteHandlers.class, "navigateToFriendsScreen", "navigateToFriendsScreen(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;", 0);
     }
 
     public final RouteHandlers.AnalyticsMetadata invoke(Uri uri, MatchResult matchResult, Context context) {
         m.checkNotNullParameter(uri, "p1");
         m.checkNotNullParameter(context, "p3");
-        return ((RouteHandlers) this.receiver).selectDirectMessage(uri, matchResult, context);
+        return ((RouteHandlers) this.receiver).navigateToFriendsScreen(uri, matchResult, context);
     }
 }

app/src/main/java/com/discord/utilities/intent/IntentUtils$pathRouterMap$4.java

@@ -10,12 +10,12 @@ import kotlin.text.MatchResult;
 /* compiled from: IntentUtils.kt */
 public final /* synthetic */ class IntentUtils$pathRouterMap$4 extends k implements Function3<Uri, MatchResult, Context, RouteHandlers.AnalyticsMetadata> {
     public IntentUtils$pathRouterMap$4(RouteHandlers routeHandlers) {
-        super(3, routeHandlers, RouteHandlers.class, "selectUserProfile", "selectUserProfile(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;", 0);
+        super(3, routeHandlers, RouteHandlers.class, "selectDirectMessage", "selectDirectMessage(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;", 0);
     }
 
     public final RouteHandlers.AnalyticsMetadata invoke(Uri uri, MatchResult matchResult, Context context) {
         m.checkNotNullParameter(uri, "p1");
         m.checkNotNullParameter(context, "p3");
-        return ((RouteHandlers) this.receiver).selectUserProfile(uri, matchResult, context);
+        return ((RouteHandlers) this.receiver).selectDirectMessage(uri, matchResult, context);
     }
 }

app/src/main/java/com/discord/utilities/intent/IntentUtils$pathRouterMap$5.java

@@ -10,12 +10,12 @@ import kotlin.text.MatchResult;
 /* compiled from: IntentUtils.kt */
 public final /* synthetic */ class IntentUtils$pathRouterMap$5 extends k implements Function3<Uri, MatchResult, Context, RouteHandlers.AnalyticsMetadata> {
     public IntentUtils$pathRouterMap$5(RouteHandlers routeHandlers) {
-        super(3, routeHandlers, RouteHandlers.class, "selectFeature", "selectFeature(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;", 0);
+        super(3, routeHandlers, RouteHandlers.class, "selectUserProfile", "selectUserProfile(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;", 0);
     }
 
     public final RouteHandlers.AnalyticsMetadata invoke(Uri uri, MatchResult matchResult, Context context) {
         m.checkNotNullParameter(uri, "p1");
         m.checkNotNullParameter(context, "p3");
-        return ((RouteHandlers) this.receiver).selectFeature(uri, matchResult, context);
+        return ((RouteHandlers) this.receiver).selectUserProfile(uri, matchResult, context);
     }
 }

app/src/main/java/com/discord/utilities/intent/IntentUtils$pathRouterMap$7.java

@@ -10,12 +10,12 @@ import kotlin.text.MatchResult;
 /* compiled from: IntentUtils.kt */
 public final /* synthetic */ class IntentUtils$pathRouterMap$7 extends k implements Function3<Uri, MatchResult, Context, RouteHandlers.AnalyticsMetadata> {
     public IntentUtils$pathRouterMap$7(RouteHandlers routeHandlers) {
-        super(3, routeHandlers, RouteHandlers.class, "voiceConnect", "voiceConnect(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;", 0);
+        super(3, routeHandlers, RouteHandlers.class, "selectFeature", "selectFeature(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;", 0);
     }
 
     public final RouteHandlers.AnalyticsMetadata invoke(Uri uri, MatchResult matchResult, Context context) {
         m.checkNotNullParameter(uri, "p1");
         m.checkNotNullParameter(context, "p3");
-        return ((RouteHandlers) this.receiver).voiceConnect(uri, matchResult, context);
+        return ((RouteHandlers) this.receiver).selectFeature(uri, matchResult, context);
     }
 }

app/src/main/java/com/discord/utilities/intent/IntentUtils$pathRouterMap$8.java

@@ -10,12 +10,12 @@ import kotlin.text.MatchResult;
 /* compiled from: IntentUtils.kt */
 public final /* synthetic */ class IntentUtils$pathRouterMap$8 extends k implements Function3<Uri, MatchResult, Context, RouteHandlers.AnalyticsMetadata> {
     public IntentUtils$pathRouterMap$8(RouteHandlers routeHandlers) {
-        super(3, routeHandlers, RouteHandlers.class, "selectLurk", "selectLurk(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;", 0);
+        super(3, routeHandlers, RouteHandlers.class, "voiceConnect", "voiceConnect(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;", 0);
     }
 
     public final RouteHandlers.AnalyticsMetadata invoke(Uri uri, MatchResult matchResult, Context context) {
         m.checkNotNullParameter(uri, "p1");
         m.checkNotNullParameter(context, "p3");
-        return ((RouteHandlers) this.receiver).selectLurk(uri, matchResult, context);
+        return ((RouteHandlers) this.receiver).voiceConnect(uri, matchResult, context);
     }
 }

app/src/main/java/com/discord/utilities/intent/IntentUtils$pathRouterMap$9.java

@@ -10,12 +10,12 @@ import kotlin.text.MatchResult;
 /* compiled from: IntentUtils.kt */
 public final /* synthetic */ class IntentUtils$pathRouterMap$9 extends k implements Function3<Uri, MatchResult, Context, RouteHandlers.AnalyticsMetadata> {
     public IntentUtils$pathRouterMap$9(RouteHandlers routeHandlers) {
-        super(3, routeHandlers, RouteHandlers.class, "authorize", "authorize(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;", 0);
+        super(3, routeHandlers, RouteHandlers.class, "selectLurk", "selectLurk(Landroid/net/Uri;Lkotlin/text/MatchResult;Landroid/content/Context;)Lcom/discord/utilities/intent/RouteHandlers$AnalyticsMetadata;", 0);
     }
 
     public final RouteHandlers.AnalyticsMetadata invoke(Uri uri, MatchResult matchResult, Context context) {
         m.checkNotNullParameter(uri, "p1");
         m.checkNotNullParameter(context, "p3");
-        return ((RouteHandlers) this.receiver).authorize(uri, matchResult, context);
+        return ((RouteHandlers) this.receiver).selectLurk(uri, matchResult, context);
     }
 }

app/src/main/java/com/discord/utilities/intent/IntentUtils.java

@@ -128,7 +128,7 @@ public final class IntentUtils {
             m.checkNotNullExpressionValue(parse, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
             if (parse.getScheme() == null) {
                 if (str != null) {
-                    a aVar = a.E;
+                    a aVar = a.F;
                     if (t.startsWith$default(str, a.e, false, 2, null)) {
                         parse = Uri.parse("https://" + str);
                     }
@@ -145,7 +145,7 @@ public final class IntentUtils {
             m.checkNotNullExpressionValue(parse, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
             if (parse.getScheme() == null) {
                 if (str != null) {
-                    a aVar = a.E;
+                    a aVar = a.F;
                     if (t.startsWith$default(str, a.d, false, 2, null)) {
                         parse = Uri.parse("https://" + str);
                     }
@@ -159,10 +159,10 @@ public final class IntentUtils {
     }
 
     static {
-        a aVar = a.E;
+        a aVar = a.F;
-        Regex regex = a.u;
+        Regex regex = a.E;
         RouteHandlers routeHandlers = RouteHandlers.INSTANCE;
-        pathRouterMap = h0.mapOf(o.to(a.t, IntentUtils$pathRouterMap$1.INSTANCE), o.to(regex, new IntentUtils$pathRouterMap$2(routeHandlers)), o.to(a.f51w, new IntentUtils$pathRouterMap$3(routeHandlers)), o.to(a.f52x, new IntentUtils$pathRouterMap$4(routeHandlers)), o.to(a.f53y, new IntentUtils$pathRouterMap$5(routeHandlers)), o.to(a.f54z, new IntentUtils$pathRouterMap$6(routeHandlers)), o.to(a.s, new IntentUtils$pathRouterMap$7(routeHandlers)), o.to(a.v, new IntentUtils$pathRouterMap$8(routeHandlers)), o.to(a.B, new IntentUtils$pathRouterMap$9(routeHandlers)), o.to(a.C, new IntentUtils$pathRouterMap$10(routeHandlers)), o.to(a.D, new IntentUtils$pathRouterMap$11(routeHandlers)), o.to(a.A, new IntentUtils$pathRouterMap$12(routeHandlers)), o.to(a.m, new IntentUtils$pathRouterMap$13(routeHandlers)));
+        pathRouterMap = h0.mapOf(o.to(a.t, IntentUtils$pathRouterMap$1.INSTANCE), o.to(regex, new IntentUtils$pathRouterMap$2(routeHandlers)), o.to(a.u, new IntentUtils$pathRouterMap$3(routeHandlers)), o.to(a.f51w, new IntentUtils$pathRouterMap$4(routeHandlers)), o.to(a.f52x, new IntentUtils$pathRouterMap$5(routeHandlers)), o.to(a.f53y, new IntentUtils$pathRouterMap$6(routeHandlers)), o.to(a.f54z, new IntentUtils$pathRouterMap$7(routeHandlers)), o.to(a.s, new IntentUtils$pathRouterMap$8(routeHandlers)), o.to(a.v, new IntentUtils$pathRouterMap$9(routeHandlers)), o.to(a.B, new IntentUtils$pathRouterMap$10(routeHandlers)), o.to(a.C, new IntentUtils$pathRouterMap$11(routeHandlers)), o.to(a.D, new IntentUtils$pathRouterMap$12(routeHandlers)), o.to(a.A, new IntentUtils$pathRouterMap$13(routeHandlers)), o.to(a.m, new IntentUtils$pathRouterMap$14(routeHandlers)));
     }
 
     private IntentUtils() {
@@ -179,7 +179,7 @@ public final class IntentUtils {
 
     private final Uri externalize(Uri uri) {
         Uri.Builder scheme = uri.buildUpon().scheme(Constants.SCHEME);
-        a aVar = a.E;
+        a aVar = a.F;
         return scheme.authority(a.a).build();
     }
 
@@ -354,7 +354,7 @@ public final class IntentUtils {
         }
         m.checkNotNullExpressionValue(scheme, "uri.scheme ?: \"\"");
         if (regex.matches(scheme)) {
-            return a.E.a(uri.getHost());
+            return a.F.a(uri.getHost());
         }
         return false;
     }

app/src/main/java/com/discord/utilities/intent/RouteHandlers.java

@@ -17,6 +17,8 @@ import c0.t.n;
 import c0.t.u;
 import c0.z.d.m;
 import com.discord.BuildConfig;
+import com.discord.api.channel.Channel;
+import com.discord.models.guild.Guild;
 import com.discord.stores.StoreAuthentication;
 import com.discord.stores.StoreInviteSettings;
 import com.discord.stores.StoreNavigation;
@@ -29,6 +31,7 @@ import com.discord.utilities.rx.ObservableExtensionsKt$filterNull$1;
 import com.discord.utilities.rx.ObservableExtensionsKt$filterNull$2;
 import com.discord.widgets.chat.input.MentionUtilsKt;
 import com.discord.widgets.guilds.join.WidgetGuildJoin;
+import com.discord.widgets.guildscheduledevent.WidgetGuildScheduledEventDetailsBottomSheet;
 import com.discord.widgets.media.WidgetQRScanner;
 import com.discord.widgets.servers.premiumguild.WidgetPremiumGuildSubscription;
 import com.discord.widgets.tabs.NavigationTab;
@@ -266,6 +269,35 @@ public final class RouteHandlers {
         return new AnalyticsMetadata("friends", null, null, 6, null);
     }
 
+    public final AnalyticsMetadata openEventDetails(Uri uri, MatchResult matchResult, Context context) {
+        List<String> groupValues;
+        String str;
+        List<String> groupValues2;
+        String str2;
+        m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
+        m.checkNotNullParameter(context, "context");
+        long j = 0;
+        long parseLong = (matchResult == null || (groupValues2 = matchResult.getGroupValues()) == null || (str2 = groupValues2.get(1)) == null) ? 0 : Long.parseLong(str2);
+        if (!(matchResult == null || (groupValues = matchResult.getGroupValues()) == null || (str = groupValues.get(2)) == null)) {
+            j = Long.parseLong(str);
+        }
+        StoreStream.Companion companion = StoreStream.Companion;
+        Guild guild = companion.getGuilds().getGuild(parseLong);
+        Channel channel = guild == null ? companion.getChannels().getChannel(parseLong) : null;
+        if (guild == null && channel == null) {
+            WidgetGuildScheduledEventDetailsBottomSheet.Companion.handleInvalidEvent(context);
+        } else {
+            WidgetGuildScheduledEventDetailsBottomSheet.Companion.enqueue(j);
+            if (guild == null) {
+                guild = channel != null ? companion.getGuilds().getGuild(channel.f()) : null;
+            }
+            if (guild != null) {
+                companion.getGuildSelected().set(guild.getId());
+            }
+        }
+        return new AnalyticsMetadata("event", null, null, 6, null);
+    }
+
     public final AnalyticsMetadata remoteAuth(Uri uri, MatchResult matchResult, Context context) {
         List<String> groupValues;
         m.checkNotNullParameter(uri, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);

app/src/main/java/com/discord/utilities/platform/Platform.java

@@ -1,5 +1,6 @@
 package com.discord.utilities.platform;
 
+import androidx.annotation.AttrRes;
 import androidx.annotation.ColorRes;
 import androidx.annotation.DrawableRes;
 import c.d.b.a.a;
@@ -13,23 +14,19 @@ import java.util.Objects;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: Platform.kt */
 public enum Platform {
-    XBOX("Xbox Live", Integer.valueOf((int) R.color.xbox), Integer.valueOf((int) R.drawable.ic_account_xbox), Integer.valueOf((int) R.drawable.ic_xbox_white_24dp), false, true, true, 16, null),
+    BATTLENET("Battle.net", Integer.valueOf((int) R.color.battlenet), Integer.valueOf((int) R.attr.ic_account_battlenet), Integer.valueOf((int) R.drawable.ic_account_battlenet_white_24dp), false, false, false, 112, null),
-    BATTLENET("Battle.Net", Integer.valueOf((int) R.color.battlenet), Integer.valueOf((int) R.drawable.ic_account_bnet), Integer.valueOf((int) R.drawable.ic_bnet_white_24dp), false, false, false, 112, null),
+    FACEBOOK("Facebook", Integer.valueOf((int) R.color.facebook), Integer.valueOf((int) R.attr.ic_account_facebook), Integer.valueOf((int) R.drawable.ic_account_facebook_white_24dp), false, false, true, 48, null),
-    FACEBOOK("Facebook", Integer.valueOf((int) R.color.facebook), Integer.valueOf((int) R.drawable.ic_account_facebook), Integer.valueOf((int) R.drawable.ic_facebook_white_24dp), true, false, true, 32, null),
+    GITHUB("Github", Integer.valueOf((int) R.color.github), Integer.valueOf((int) R.attr.ic_account_github), Integer.valueOf((int) R.drawable.ic_account_github_white_24dp), false, false, true, 48, null),
-    GOOGLE("Google", Integer.valueOf((int) R.color.google), Integer.valueOf((int) R.drawable.ic_account_google), Integer.valueOf((int) R.drawable.ic_google_white_24dp), false, false, false, 112, null),
+    LEAGUEOFLEGENDS("League of Legends", Integer.valueOf((int) R.color.league_of_legends), Integer.valueOf((int) R.attr.ic_account_league_of_legends), Integer.valueOf((int) R.drawable.ic_account_league_of_legends_white_24dp), false, false, false, 112, null),
-    LEAGUEOFLEGENDS("League of Legends", Integer.valueOf((int) R.color.league_of_legends), Integer.valueOf((int) R.drawable.ic_account_lol), Integer.valueOf((int) R.drawable.ic_lol_white_24dp), false, false, false, 112, null),
+    REDDIT("Reddit", Integer.valueOf((int) R.color.reddit), Integer.valueOf((int) R.attr.ic_account_reddit), Integer.valueOf((int) R.drawable.ic_account_reddit_white_24dp), false, false, true, 48, null),
-    OBS("OBS", null, Integer.valueOf((int) R.drawable.ic_account_obs), null, false, false, false, 122, null),
+    SAMSUNG("Samsung Galaxy", null, Integer.valueOf((int) R.attr.ic_account_samsung), Integer.valueOf((int) R.drawable.ic_account_samsung_white_24dp), false, true, false, 82, null),
-    PATREON("Patreon", null, Integer.valueOf((int) R.drawable.ic_account_patreon), null, false, false, false, 122, null),
+    SKYPE("Skype", Integer.valueOf((int) R.color.skype), Integer.valueOf((int) R.attr.ic_account_skype), Integer.valueOf((int) R.drawable.ic_account_skype_white_24dp), false, false, false, 112, null),
-    REDDIT("Reddit", Integer.valueOf((int) R.color.reddit), Integer.valueOf((int) R.drawable.ic_account_reddit), Integer.valueOf((int) R.drawable.ic_reddit_white_24dp), false, false, true, 48, null),
+    SPOTIFY("Spotify", Integer.valueOf((int) R.color.spotify), Integer.valueOf((int) R.attr.ic_account_spotify), Integer.valueOf((int) R.drawable.ic_account_spotify_white_24dp), false, true, true, 16, null),
-    SAMSUNG("Samsung Galaxy", null, null, null, false, true, false, 94, null),
+    STEAM("Steam", Integer.valueOf((int) R.color.steam), Integer.valueOf((int) R.attr.ic_account_steam), Integer.valueOf((int) R.drawable.ic_account_steam_white_24dp), false, false, true, 48, null),
-    SKYPE("Skype", Integer.valueOf((int) R.color.skype), Integer.valueOf((int) R.drawable.ic_account_skype), Integer.valueOf((int) R.drawable.ic_skype_white_24dp), false, false, false, 112, null),
+    TWITCH("Twitch", Integer.valueOf((int) R.color.twitch), Integer.valueOf((int) R.attr.ic_account_twitch), Integer.valueOf((int) R.drawable.ic_account_twitch_white_24dp), false, false, true, 48, null),
-    SPOTIFY("Spotify", Integer.valueOf((int) R.color.spotify), Integer.valueOf((int) R.drawable.ic_account_spotify), Integer.valueOf((int) R.drawable.ic_spotify_white_24dp), false, true, true, 16, null),
+    TWITTER("Twitter", Integer.valueOf((int) R.color.twitter), Integer.valueOf((int) R.attr.ic_account_twitter), Integer.valueOf((int) R.drawable.ic_account_twitter_white_24dp), false, false, true, 48, null),
-    STEAM("Steam", Integer.valueOf((int) R.color.steam), Integer.valueOf((int) R.drawable.ic_account_steam), Integer.valueOf((int) R.drawable.ic_steam_white_24dp), false, false, true, 48, null),
+    XBOX("Xbox Live", Integer.valueOf((int) R.color.xbox), Integer.valueOf((int) R.attr.ic_account_xbox), Integer.valueOf((int) R.drawable.ic_account_xbox_white_24dp), false, true, true, 16, null),
-    TWITCH("Twitch", Integer.valueOf((int) R.color.twitch), Integer.valueOf((int) R.drawable.ic_account_twitch), Integer.valueOf((int) R.drawable.ic_twitch_white_24dp), false, false, true, 48, null),
+    YOUTUBE("Youtube", Integer.valueOf((int) R.color.youtube), Integer.valueOf((int) R.attr.ic_account_youtube), Integer.valueOf((int) R.drawable.ic_account_youtube_white_24dp), false, false, true, 48, null),
-    TWITTER("Twitter", Integer.valueOf((int) R.color.twitter), Integer.valueOf((int) R.drawable.ic_account_twitter), Integer.valueOf((int) R.drawable.ic_twitter_white_24dp), false, false, true, 48, null),
-    XSPLIT("XSplit", null, Integer.valueOf((int) R.drawable.ic_account_xsplit), null, false, false, false, 122, null),
-    YOUTUBE("Youtube", Integer.valueOf((int) R.color.youtube), Integer.valueOf((int) R.drawable.ic_account_youtube), Integer.valueOf((int) R.drawable.ic_youtube_gaming_white_24dp), false, false, true, 48, null),
-    GITHUB("Github", Integer.valueOf((int) R.color.github), Integer.valueOf((int) R.drawable.ic_account_github), Integer.valueOf((int) R.drawable.ic_github_white), false, false, true, 48, null),
     NONE(null, null, null, null, false, false, false, 127, null);
     
     public static final Companion Companion = new Companion(null);
@@ -38,8 +35,8 @@ public enum Platform {
     private final Integer colorResId;
     private final boolean enabled;
     private final String platformId;
-    private final Integer platformImage;
     private final String properName;
+    private final Integer themedPlatformImage;
     private final Integer whitePlatformImage;
 
     /* compiled from: Platform.kt */
@@ -52,9 +49,9 @@ public enum Platform {
                 ActivityPlatform.values();
                 int[] iArr = new int[7];
                 $EnumSwitchMapping$0 = iArr;
-                iArr[ActivityPlatform.XBOX.ordinal()] = 1;
+                iArr[ActivityPlatform.SAMSUNG.ordinal()] = 1;
-                iArr[ActivityPlatform.SAMSUNG.ordinal()] = 2;
+                iArr[ActivityPlatform.SPOTIFY.ordinal()] = 2;
-                iArr[ActivityPlatform.SPOTIFY.ordinal()] = 3;
+                iArr[ActivityPlatform.XBOX.ordinal()] = 3;
             }
         }
 
@@ -111,23 +108,23 @@ public enum Platform {
 
         static {
             Platform.values();
-            int[] iArr = new int[18];
+            int[] iArr = new int[14];
             $EnumSwitchMapping$0 = iArr;
             iArr[Platform.FACEBOOK.ordinal()] = 1;
-            iArr[Platform.SPOTIFY.ordinal()] = 2;
+            iArr[Platform.GITHUB.ordinal()] = 2;
-            iArr[Platform.STEAM.ordinal()] = 3;
+            iArr[Platform.REDDIT.ordinal()] = 3;
-            iArr[Platform.YOUTUBE.ordinal()] = 4;
+            iArr[Platform.SPOTIFY.ordinal()] = 4;
-            iArr[Platform.REDDIT.ordinal()] = 5;
+            iArr[Platform.STEAM.ordinal()] = 5;
-            iArr[Platform.TWITTER.ordinal()] = 6;
+            iArr[Platform.TWITCH.ordinal()] = 6;
-            iArr[Platform.TWITCH.ordinal()] = 7;
+            iArr[Platform.TWITTER.ordinal()] = 7;
-            iArr[Platform.GITHUB.ordinal()] = 8;
+            iArr[Platform.YOUTUBE.ordinal()] = 8;
         }
     }
 
-    private Platform(String str, @ColorRes Integer num, @DrawableRes Integer num2, @DrawableRes Integer num3, boolean z2, boolean z3, boolean z4) {
+    private Platform(String str, @ColorRes Integer num, @AttrRes Integer num2, @DrawableRes Integer num3, boolean z2, boolean z3, boolean z4) {
         this.properName = str;
         this.colorResId = num;
-        this.platformImage = num2;
+        this.themedPlatformImage = num2;
         this.whitePlatformImage = num3;
         this.canSyncFriends = z2;
         this.canShowActivity = z3;
@@ -178,40 +175,36 @@ public enum Platform {
         return this.platformId;
     }
 
-    public final Integer getPlatformImage() {
-        return this.platformImage;
-    }
-
     public final String getProfileUrl(ModelConnectedAccount modelConnectedAccount) {
         m.checkNotNullParameter(modelConnectedAccount, "connectedAccount");
         int ordinal = ordinal();
-        if (ordinal == 2) {
+        if (ordinal == 1) {
             StringBuilder O = a.O("https://www.facebook.com/");
             O.append(modelConnectedAccount.getId());
             return O.toString();
-        } else if (ordinal == 7) {
+        } else if (ordinal == 2) {
-            StringBuilder O2 = a.O("https://reddit.com/u/");
+            StringBuilder O2 = a.O("https://github.com/");
             O2.append(modelConnectedAccount.getUsername());
             return O2.toString();
-        } else if (ordinal == 15) {
+        } else if (ordinal == 4) {
-            StringBuilder O3 = a.O("https://youtube.com/channel/");
+            StringBuilder O3 = a.O("https://reddit.com/u/");
-            O3.append(modelConnectedAccount.getId());
+            O3.append(modelConnectedAccount.getUsername());
             return O3.toString();
-        } else if (ordinal != 16) {
+        } else if (ordinal != 12) {
             switch (ordinal) {
-                case 10:
+                case 7:
                     StringBuilder O4 = a.O("https://open.spotify.com/user/");
                     O4.append(modelConnectedAccount.getId());
                     return O4.toString();
-                case 11:
+                case 8:
                     StringBuilder O5 = a.O("https://steamcommunity.com/profiles/");
                     O5.append(modelConnectedAccount.getId());
                     return O5.toString();
-                case 12:
+                case 9:
                     StringBuilder O6 = a.O("https://twitch.tv/");
                     O6.append(modelConnectedAccount.getUsername());
                     return O6.toString();
-                case 13:
+                case 10:
                     StringBuilder O7 = a.O("https://www.twitter.com/");
                     O7.append(modelConnectedAccount.getUsername());
                     return O7.toString();
@@ -219,8 +212,8 @@ public enum Platform {
                     return null;
             }
         } else {
-            StringBuilder O8 = a.O("https://github.com/");
+            StringBuilder O8 = a.O("https://youtube.com/channel/");
-            O8.append(modelConnectedAccount.getUsername());
+            O8.append(modelConnectedAccount.getId());
             return O8.toString();
         }
     }
@@ -229,6 +222,10 @@ public enum Platform {
         return this.properName;
     }
 
+    public final Integer getThemedPlatformImage() {
+        return this.themedPlatformImage;
+    }
+
     public final Integer getWhitePlatformImage() {
         return this.whitePlatformImage;
     }

app/src/main/java/com/discord/utilities/sms/SmsListener.java

@@ -1,7 +1,7 @@
 package com.discord.utilities.sms;
 
+import android.app.Application;
 import android.content.BroadcastReceiver;
-import android.content.Context;
 import android.content.IntentFilter;
 import c.c.a.a0.d;
 import c.i.a.f.e.h.j.k0;
@@ -10,6 +10,7 @@ import c.i.a.f.h.b.b;
 import c.i.a.f.h.b.h;
 import c.i.a.f.h.b.j;
 import c0.z.d.m;
+import com.discord.utilities.lifecycle.ApplicationProvider;
 import com.discord.widgets.auth.SmsAuthCodeBroadcastReceiver;
 import com.google.android.gms.common.Feature;
 import kotlin.Unit;
@@ -37,22 +38,23 @@ public final class SmsListener {
             SmsListener.access$setBroadcastReceiver$cp(broadcastReceiver);
         }
 
-        public final void startSmsListener(Context context, Function1<? super String, Unit> function1) {
+        public final void startSmsListener(Function1<? super String, Unit> function1) {
-            m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(function1, "onSuccess");
-            h hVar = new h(context);
+            Application application = ApplicationProvider.INSTANCE.get();
+            h hVar = new h(application);
             p.a aVar = new p.a(null);
             aVar.a = new j(hVar);
             aVar.b = new Feature[]{b.b};
             d.p(true, "execute parameter required");
             hVar.c(new k0(aVar, aVar.b, true));
             setBroadcastReceiver(new SmsAuthCodeBroadcastReceiver(function1));
-            context.registerReceiver(getBroadcastReceiver(), new IntentFilter("com.google.android.gms.auth.api.phone.SMS_RETRIEVED"));
+            application.registerReceiver(getBroadcastReceiver(), new IntentFilter("com.google.android.gms.auth.api.phone.SMS_RETRIEVED"));
         }
 
-        public final void stopSmsListener(Context context) {
+        public final void stopSmsListener() {
-            if (getBroadcastReceiver() != null && context != null) {
+            try {
-                context.unregisterReceiver(getBroadcastReceiver());
+                ApplicationProvider.INSTANCE.get().unregisterReceiver(getBroadcastReceiver());
+            } catch (Exception unused) {
             }
         }
     }

app/src/main/java/com/discord/widgets/auth/WidgetAuthPhoneVerify.java

@@ -215,12 +215,14 @@ public final class WidgetAuthPhoneVerify extends AppFragment {
     }
 
     private final void inputCode(String str) {
-        getBinding().f2114c.setOnCodeEntered(WidgetAuthPhoneVerify$inputCode$1.INSTANCE);
+        if (getView() != null) {
-        getBinding().f2114c.setCode(str);
+            getBinding().f2114c.setOnCodeEntered(WidgetAuthPhoneVerify$inputCode$1.INSTANCE);
-        getBinding().f2114c.setOnCodeEntered(new WidgetAuthPhoneVerify$inputCode$2(this));
+            getBinding().f2114c.setCode(str);
-        Observable<Long> d02 = Observable.d0(500, TimeUnit.MILLISECONDS);
+            getBinding().f2114c.setOnCodeEntered(new WidgetAuthPhoneVerify$inputCode$2(this));
-        m.checkNotNullExpressionValue(d02, "Observable\n        .time…L, TimeUnit.MILLISECONDS)");
+            Observable<Long> d02 = Observable.d0(500, TimeUnit.MILLISECONDS);
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this, null, 2, null), WidgetAuthPhoneVerify.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetAuthPhoneVerify$inputCode$3(this), 62, (Object) null);
+            m.checkNotNullExpressionValue(d02, "Observable\n        .time…L, TimeUnit.MILLISECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this, null, 2, null), WidgetAuthPhoneVerify.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetAuthPhoneVerify$inputCode$3(this), 62, (Object) null);
+        }
     }
 
     private final void resendCode() {
@@ -282,7 +284,7 @@ public final class WidgetAuthPhoneVerify extends AppFragment {
     @Override // com.discord.app.AppFragment, androidx.fragment.app.Fragment
     public void onDestroyView() {
         super.onDestroyView();
-        SmsListener.Companion.stopSmsListener(getContext());
+        SmsListener.Companion.stopSmsListener();
     }
 
     @Override // com.discord.app.AppFragment, androidx.fragment.app.Fragment
@@ -337,6 +339,6 @@ public final class WidgetAuthPhoneVerify extends AppFragment {
         }
         getBinding().f2114c.setOnCodeEntered(new WidgetAuthPhoneVerify$onViewBound$3(this));
         registerForContextMenu(getBinding().f2114c);
-        SmsListener.Companion.startSmsListener(requireContext(), new WidgetAuthPhoneVerify$onViewBound$4(this));
+        SmsListener.Companion.startSmsListener(new WidgetAuthPhoneVerify$onViewBound$4(this));
     }
 }

app/src/main/java/com/discord/widgets/channels/WidgetChannelPickerBottomSheet$hideAnnouncementChannels$2.java

@@ -0,0 +1,22 @@
+package com.discord.widgets.channels;
+
+import c0.z.d.o;
+import kotlin.jvm.functions.Function0;
+/* compiled from: WidgetChannelPickerBottomSheet.kt */
+public final class WidgetChannelPickerBottomSheet$hideAnnouncementChannels$2 extends o implements Function0<Boolean> {
+    public final /* synthetic */ WidgetChannelPickerBottomSheet this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetChannelPickerBottomSheet$hideAnnouncementChannels$2(WidgetChannelPickerBottomSheet widgetChannelPickerBottomSheet) {
+        super(0);
+        this.this$0 = widgetChannelPickerBottomSheet;
+    }
+
+    /* Return type fixed from 'boolean' to match base method */
+    /* JADX WARNING: Unknown variable types count: 1 */
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final Boolean mo17invoke() {
+        return WidgetChannelPickerBottomSheet.access$getArgumentsOrDefault$p(this.this$0).getBoolean("ARG_HIDE_ANNOUNCEMENT_CHANNELS", false);
+    }
+}

app/src/main/java/com/discord/widgets/channels/WidgetChannelPickerBottomSheet$viewModel$2.java

@@ -17,6 +17,6 @@ public final class WidgetChannelPickerBottomSheet$viewModel$2 extends o implemen
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final AppViewModel<WidgetChannelPickerBottomSheetViewModel.ViewState> mo17invoke() {
-        return new WidgetChannelPickerBottomSheetViewModel(WidgetChannelPickerBottomSheet.access$getGuildId$p(this.this$0), WidgetChannelPickerBottomSheet.access$getSelectedChannelId$p(this.this$0), null, null, null, 28, null);
+        return new WidgetChannelPickerBottomSheetViewModel(WidgetChannelPickerBottomSheet.access$getGuildId$p(this.this$0), WidgetChannelPickerBottomSheet.access$getSelectedChannelId$p(this.this$0), WidgetChannelPickerBottomSheet.access$getHideAnnouncementChannels$p(this.this$0), null, null, null, 56, null);
     }
 }

app/src/main/java/com/discord/widgets/channels/WidgetChannelPickerBottomSheet.java

@@ -37,6 +37,7 @@ import rx.subscriptions.CompositeSubscription;
 public final class WidgetChannelPickerBottomSheet extends AppBottomSheet {
     public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.Z(WidgetChannelPickerBottomSheet.class, "binding", "getBinding()Lcom/discord/databinding/WidgetChannelPickerSheetBinding;", 0)};
     private static final String ARG_CHANNEL_PICKER_GUILD_ID = "ARG_CHANNEL_PICKER_GUILD_ID";
+    private static final String ARG_HIDE_ANNOUNCEMENT_CHANNELS = "ARG_HIDE_ANNOUNCEMENT_CHANNELS";
     private static final String ARG_REQUEST_KEY = "INTENT_EXTRA_REQUEST_CODE";
     private static final String ARG_SELECTED_CHANNEL_ID = "ARG_SELECTED_CHANNEL_ID";
     private static final int CHANNEL_PICKER_VIEW_FLIPPER_LOADING_STATE = 0;
@@ -49,6 +50,7 @@ public final class WidgetChannelPickerBottomSheet extends AppBottomSheet {
     private WidgetchannelPickerAdapter adapter;
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetChannelPickerBottomSheet$binding$2.INSTANCE, null, 2, null);
     private final Lazy guildId$delegate = g.lazy(new WidgetChannelPickerBottomSheet$guildId$2(this));
+    private final Lazy hideAnnouncementChannels$delegate = g.lazy(new WidgetChannelPickerBottomSheet$hideAnnouncementChannels$2(this));
     private final WidgetChannelPickerBottomSheet$itemClickListener$1 itemClickListener;
     private Function0<Unit> onCancel;
     private final Lazy selectedChannelId$delegate = g.lazy(new WidgetChannelPickerBottomSheet$selectedChannelId$2(this));
@@ -77,17 +79,18 @@ public final class WidgetChannelPickerBottomSheet extends AppBottomSheet {
             this();
         }
 
-        public static /* synthetic */ void launch$default(Companion companion, Fragment fragment, String str, long j, Long l, Function0 function0, int i, Object obj) {
+        public static /* synthetic */ void launch$default(Companion companion, Fragment fragment, String str, long j, Long l, Function0 function0, boolean z2, int i, Object obj) {
-            companion.launch(fragment, str, j, (i & 8) != 0 ? null : l, (i & 16) != 0 ? null : function0);
+            companion.launch(fragment, str, j, (i & 8) != 0 ? null : l, (i & 16) != 0 ? null : function0, (i & 32) != 0 ? false : z2);
         }
 
-        public final void launch(Fragment fragment, String str, long j, Long l, Function0<Unit> function0) {
+        public final void launch(Fragment fragment, String str, long j, Long l, Function0<Unit> function0, boolean z2) {
             m.checkNotNullParameter(fragment, "fragment");
             m.checkNotNullParameter(str, "requestKey");
             WidgetChannelPickerBottomSheet widgetChannelPickerBottomSheet = new WidgetChannelPickerBottomSheet();
             Bundle bundle = new Bundle();
             bundle.putString(WidgetChannelPickerBottomSheet.ARG_REQUEST_KEY, str);
             bundle.putLong(WidgetChannelPickerBottomSheet.ARG_CHANNEL_PICKER_GUILD_ID, j);
+            bundle.putBoolean(WidgetChannelPickerBottomSheet.ARG_HIDE_ANNOUNCEMENT_CHANNELS, z2);
             if (l != null) {
                 bundle.putLong(WidgetChannelPickerBottomSheet.ARG_SELECTED_CHANNEL_ID, l.longValue());
             }
@@ -151,6 +154,10 @@ public final class WidgetChannelPickerBottomSheet extends AppBottomSheet {
         return widgetChannelPickerBottomSheet.getGuildId();
     }
 
+    public static final /* synthetic */ boolean access$getHideAnnouncementChannels$p(WidgetChannelPickerBottomSheet widgetChannelPickerBottomSheet) {
+        return widgetChannelPickerBottomSheet.getHideAnnouncementChannels();
+    }
+
     public static final /* synthetic */ long access$getSelectedChannelId$p(WidgetChannelPickerBottomSheet widgetChannelPickerBottomSheet) {
         return widgetChannelPickerBottomSheet.getSelectedChannelId();
     }
@@ -190,6 +197,10 @@ public final class WidgetChannelPickerBottomSheet extends AppBottomSheet {
         return ((Number) this.guildId$delegate.getValue()).longValue();
     }
 
+    private final boolean getHideAnnouncementChannels() {
+        return ((Boolean) this.hideAnnouncementChannels$delegate.getValue()).booleanValue();
+    }
+
     private final long getSelectedChannelId() {
         return ((Number) this.selectedChannelId$delegate.getValue()).longValue();
     }

app/src/main/java/com/discord/widgets/channels/WidgetChannelPickerBottomSheetViewModel$Companion$observeStoreState$1.java

@@ -12,13 +12,15 @@ import kotlin.jvm.functions.Function0;
 /* compiled from: WidgetChannelPickerBottomSheetViewModel.kt */
 public final class WidgetChannelPickerBottomSheetViewModel$Companion$observeStoreState$1 extends o implements Function0<WidgetChannelPickerBottomSheetViewModel.StoreState> {
     public final /* synthetic */ long $guildId;
+    public final /* synthetic */ boolean $hideAnnouncementChannels;
     public final /* synthetic */ StoreChannels $storeChannels;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public WidgetChannelPickerBottomSheetViewModel$Companion$observeStoreState$1(StoreChannels storeChannels, long j) {
+    public WidgetChannelPickerBottomSheetViewModel$Companion$observeStoreState$1(StoreChannels storeChannels, long j, boolean z2) {
         super(0);
         this.$storeChannels = storeChannels;
         this.$guildId = j;
+        this.$hideAnnouncementChannels = z2;
     }
 
     @Override // kotlin.jvm.functions.Function0
@@ -27,7 +29,12 @@ public final class WidgetChannelPickerBottomSheetViewModel$Companion$observeStor
         Map<Long, Channel> channelsForGuild = this.$storeChannels.getChannelsForGuild(this.$guildId);
         LinkedHashMap linkedHashMap = new LinkedHashMap();
         for (Map.Entry<Long, Channel> entry : channelsForGuild.entrySet()) {
-            if (!ChannelUtils.k(entry.getValue())) {
+            Channel value = entry.getValue();
+            boolean z2 = false;
+            if (!ChannelUtils.k(value) && (!this.$hideAnnouncementChannels || !ChannelUtils.i(value))) {
+                z2 = true;
+            }
+            if (z2) {
                 linkedHashMap.put(entry.getKey(), entry.getValue());
             }
         }

app/src/main/java/com/discord/widgets/channels/WidgetChannelPickerBottomSheetViewModel.java

@@ -28,6 +28,7 @@ public final class WidgetChannelPickerBottomSheetViewModel extends AppViewModel<
     public static final Companion Companion = new Companion(null);
     private StoreState currentStoreState;
     private final long guildId;
+    private final boolean hideAnnouncementChannels;
     private String searchQuery;
     private final long selectedChannelId;
 
@@ -66,12 +67,12 @@ public final class WidgetChannelPickerBottomSheetViewModel extends AppViewModel<
             this();
         }
 
-        public static final /* synthetic */ Observable access$observeStoreState(Companion companion, long j, ObservationDeck observationDeck, StoreChannels storeChannels) {
+        public static final /* synthetic */ Observable access$observeStoreState(Companion companion, long j, ObservationDeck observationDeck, StoreChannels storeChannels, boolean z2) {
-            return companion.observeStoreState(j, observationDeck, storeChannels);
+            return companion.observeStoreState(j, observationDeck, storeChannels, z2);
         }
 
-        private final Observable<StoreState> observeStoreState(long j, ObservationDeck observationDeck, StoreChannels storeChannels) {
+        private final Observable<StoreState> observeStoreState(long j, ObservationDeck observationDeck, StoreChannels storeChannels, boolean z2) {
-            return ObservationDeck.connectRx$default(observationDeck, new ObservationDeck.UpdateSource[]{storeChannels}, false, null, null, new WidgetChannelPickerBottomSheetViewModel$Companion$observeStoreState$1(storeChannels, j), 14, null);
+            return ObservationDeck.connectRx$default(observationDeck, new ObservationDeck.UpdateSource[]{storeChannels}, false, null, null, new WidgetChannelPickerBottomSheetViewModel$Companion$observeStoreState$1(storeChannels, j, z2), 14, null);
         }
     }
 
@@ -224,13 +225,14 @@ public final class WidgetChannelPickerBottomSheetViewModel extends AppViewModel<
     }
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public WidgetChannelPickerBottomSheetViewModel(long j, long j2, ObservationDeck observationDeck, StoreChannels storeChannels, Observable<StoreState> observable) {
+    public WidgetChannelPickerBottomSheetViewModel(long j, long j2, boolean z2, ObservationDeck observationDeck, StoreChannels storeChannels, Observable<StoreState> observable) {
         super(ViewState.Loading.INSTANCE);
         m.checkNotNullParameter(observationDeck, "observationDeck");
         m.checkNotNullParameter(storeChannels, "storeChannels");
         m.checkNotNullParameter(observable, "storeStateObservable");
         this.guildId = j;
         this.selectedChannelId = j2;
+        this.hideAnnouncementChannels = z2;
         this.searchQuery = "";
         Observable<StoreState> q = observable.q();
         m.checkNotNullExpressionValue(q, "storeStateObservable\n   …  .distinctUntilChanged()");
@@ -238,10 +240,10 @@ public final class WidgetChannelPickerBottomSheetViewModel extends AppViewModel<
     }
 
     /* JADX WARNING: Illegal instructions before constructor call */
-    public /* synthetic */ WidgetChannelPickerBottomSheetViewModel(long j, long j2, ObservationDeck observationDeck, StoreChannels storeChannels, Observable observable, int i, DefaultConstructorMarker defaultConstructorMarker) {
+    public /* synthetic */ WidgetChannelPickerBottomSheetViewModel(long j, long j2, boolean z2, ObservationDeck observationDeck, StoreChannels storeChannels, Observable observable, int i, DefaultConstructorMarker defaultConstructorMarker) {
-        this(j, j2, r6, r7, (i & 16) != 0 ? Companion.access$observeStoreState(Companion, j, r6, r7) : observable);
+        this(j, j2, z2, r7, r8, (i & 32) != 0 ? Companion.access$observeStoreState(Companion, j, r7, r8, z2) : observable);
-        ObservationDeck observationDeck2 = (i & 4) != 0 ? ObservationDeckProvider.get() : observationDeck;
+        ObservationDeck observationDeck2 = (i & 8) != 0 ? ObservationDeckProvider.get() : observationDeck;
-        StoreChannels channels = (i & 8) != 0 ? StoreStream.Companion.getChannels() : storeChannels;
+        StoreChannels channels = (i & 16) != 0 ? StoreStream.Companion.getChannels() : storeChannels;
     }
 
     public static final /* synthetic */ void access$handleStoreState(WidgetChannelPickerBottomSheetViewModel widgetChannelPickerBottomSheetViewModel, StoreState storeState) {

app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel$disableAnnouncementChannelType$2.java

@@ -0,0 +1,22 @@
+package com.discord.widgets.channels;
+
+import c0.z.d.o;
+import kotlin.jvm.functions.Function0;
+/* compiled from: WidgetCreateChannel.kt */
+public final class WidgetCreateChannel$disableAnnouncementChannelType$2 extends o implements Function0<Boolean> {
+    public final /* synthetic */ WidgetCreateChannel this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetCreateChannel$disableAnnouncementChannelType$2(WidgetCreateChannel widgetCreateChannel) {
+        super(0);
+        this.this$0 = widgetCreateChannel;
+    }
+
+    /* Return type fixed from 'boolean' to match base method */
+    /* JADX WARNING: Unknown variable types count: 1 */
+    @Override // kotlin.jvm.functions.Function0
+    /* renamed from: invoke */
+    public final Boolean mo17invoke() {
+        return this.this$0.getMostRecentIntent().getBooleanExtra("INTENT_DISABLE_ANNOUNCEMENT_CHANNEL_TYPE", false);
+    }
+}

app/src/main/java/com/discord/widgets/channels/WidgetCreateChannel.java

@@ -67,6 +67,7 @@ public final class WidgetCreateChannel extends AppFragment {
     public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.Z(WidgetCreateChannel.class, "binding", "getBinding()Lcom/discord/databinding/WidgetCreateChannelBinding;", 0)};
     public static final Companion Companion = new Companion(null);
     private static final String INTENT_CATEGORY_ID = "INTENT_CATEGORY_ID";
+    private static final String INTENT_DISABLE_ANNOUNCEMENT_CHANNEL_TYPE = "INTENT_DISABLE_ANNOUNCEMENT_CHANNEL_TYPE";
     private static final String INTENT_DISABLE_PRIVATE_SWITCH = "INTENT_DISABLE_PRIVATE_SWITCH";
     private static final String INTENT_GUILD_ID = "INTENT_GUILD_ID";
     private static final String INTENT_PROVIDE_RESULT_ONLY = "INTENT_PROVIDE_RESULT_ONLY";
@@ -77,6 +78,7 @@ public final class WidgetCreateChannel extends AppFragment {
     private static final String RESULT_EXTRA_CHANNEL_NAME = "RESULT_EXTRA_CHANNEL_NAME";
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetCreateChannel$binding$2.INSTANCE, null, 2, null);
     private final Lazy categoryId$delegate = g.lazy(new WidgetCreateChannel$categoryId$2(this));
+    private final Lazy disableAnnouncementChannelType$delegate = g.lazy(new WidgetCreateChannel$disableAnnouncementChannelType$2(this));
     private final Lazy disablePrivateSwitch$delegate = g.lazy(new WidgetCreateChannel$disablePrivateSwitch$2(this));
     private final Lazy guildId$delegate = g.lazy(new WidgetCreateChannel$guildId$2(this));
     private final LoggingConfig loggingConfig = new LoggingConfig(false, null, WidgetCreateChannel$loggingConfig$1.INSTANCE, 3);
@@ -94,8 +96,8 @@ public final class WidgetCreateChannel extends AppFragment {
             this();
         }
 
-        public static /* synthetic */ void launch$default(Companion companion, Context context, ActivityResultLauncher activityResultLauncher, long j, int i, Long l, boolean z2, boolean z3, boolean z4, int i2, Object obj) {
+        public static /* synthetic */ void launch$default(Companion companion, Context context, ActivityResultLauncher activityResultLauncher, long j, int i, Long l, boolean z2, boolean z3, boolean z4, boolean z5, int i2, Object obj) {
-            companion.launch(context, activityResultLauncher, j, (i2 & 8) != 0 ? 0 : i, (i2 & 16) != 0 ? null : l, (i2 & 32) != 0 ? false : z2, (i2 & 64) != 0 ? false : z3, (i2 & 128) != 0 ? false : z4);
+            companion.launch(context, activityResultLauncher, j, (i2 & 8) != 0 ? 0 : i, (i2 & 16) != 0 ? null : l, (i2 & 32) != 0 ? false : z2, (i2 & 64) != 0 ? false : z3, (i2 & 128) != 0 ? false : z4, (i2 & 256) != 0 ? false : z5);
         }
 
         public static /* synthetic */ void show$default(Companion companion, Context context, long j, int i, Long l, int i2, Object obj) {
@@ -106,7 +108,7 @@ public final class WidgetCreateChannel extends AppFragment {
             companion.show(context, j, i3, l);
         }
 
-        public final void launch(Context context, ActivityResultLauncher<Intent> activityResultLauncher, long j, int i, Long l, boolean z2, boolean z3, boolean z4) {
+        public final void launch(Context context, ActivityResultLauncher<Intent> activityResultLauncher, long j, int i, Long l, boolean z2, boolean z3, boolean z4, boolean z5) {
             m.checkNotNullParameter(context, "context");
             m.checkNotNullParameter(activityResultLauncher, "launcher");
             j jVar = j.g;
@@ -117,6 +119,7 @@ public final class WidgetCreateChannel extends AppFragment {
             intent.putExtra(WidgetCreateChannel.INTENT_PROVIDE_RESULT_ONLY, z3);
             intent.putExtra(WidgetCreateChannel.INTENT_SHOULD_CHANNEL_DEFAULT_PRIVATE, z2);
             intent.putExtra(WidgetCreateChannel.INTENT_DISABLE_PRIVATE_SWITCH, z4);
+            intent.putExtra(WidgetCreateChannel.INTENT_DISABLE_ANNOUNCEMENT_CHANNEL_TYPE, z5);
             jVar.f(context, activityResultLauncher, WidgetCreateChannel.class, intent);
         }
 
@@ -362,15 +365,15 @@ public final class WidgetCreateChannel extends AppFragment {
         AppFragment.setActionBarOptionsMenu$default(this, R.menu.menu_channel_create, new WidgetCreateChannel$configureUI$1(this), null, 4, null);
         ConstraintLayout constraintLayout = getBinding().b;
         m.checkNotNullExpressionValue(constraintLayout, "binding.createChannelAnnouncementsContainer");
-        int i = 8;
+        int i = 0;
-        constraintLayout.setVisibility(model.getCanCreateCommunityChannels() ? 0 : 8);
+        constraintLayout.setVisibility(model.getCanCreateCommunityChannels() && !getDisableAnnouncementChannelType() ? 0 : 8);
         ConstraintLayout constraintLayout2 = getBinding().l;
         m.checkNotNullExpressionValue(constraintLayout2, "binding.createChannelStageContainer");
         if (!model.getCanCreateCommunityChannels() || !model.getCanManageRoles()) {
             z2 = false;
         }
-        if (z2) {
+        if (!z2) {
-            i = 0;
+            i = 8;
         }
         constraintLayout2.setVisibility(i);
         RolesAdapter rolesAdapter = this.rolesAdapter;
@@ -414,6 +417,10 @@ public final class WidgetCreateChannel extends AppFragment {
         return radioButton3.isChecked() ? 13 : 0;
     }
 
+    private final boolean getDisableAnnouncementChannelType() {
+        return ((Boolean) this.disableAnnouncementChannelType$delegate.getValue()).booleanValue();
+    }
+
     private final boolean getDisablePrivateSwitch() {
         return ((Boolean) this.disablePrivateSwitch$delegate.getValue()).booleanValue();
     }

app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanSetup$onViewBound$$inlined$apply$lambda$1.java

@@ -1,6 +1,7 @@
 package com.discord.widgets.guild_role_subscriptions.setup;
 
 import c0.z.d.o;
+import com.discord.widgets.servers.guild_role_subscription.WidgetServerSettingsEmptyGuildRoleSubscriptions;
 import java.util.List;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
@@ -19,6 +20,7 @@ public final class WidgetGuildRoleSubscriptionPlanSetup$onViewBound$$inlined$app
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final void mo17invoke() {
+        WidgetServerSettingsEmptyGuildRoleSubscriptions.Companion.launch(this.this$0.requireContext(), WidgetGuildRoleSubscriptionPlanSetup.access$getGuildId$p(this.this$0));
         this.this$0.requireActivity().finish();
     }
 }

app/src/main/java/com/discord/widgets/guild_role_subscriptions/setup/WidgetGuildRoleSubscriptionPlanSetup.java

@@ -30,6 +30,7 @@ import com.discord.widgets.guild_role_subscriptions.tier.create.WidgetGuildRoleS
 import com.discord.widgets.guild_role_subscriptions.tier.create.WidgetGuildRoleSubscriptionTierDetails;
 import com.discord.widgets.guild_role_subscriptions.tier.create.benefits.GuildRoleSubscriptionTierBenefitListType;
 import com.discord.widgets.guild_role_subscriptions.tier.create.benefits.WidgetGuildRoleSubscriptionTierBenefits;
+import com.discord.widgets.servers.guild_role_subscription.WidgetServerSettingsGuildRoleSubscriptionTierList;
 import java.util.List;
 import kotlin.Lazy;
 import kotlin.jvm.functions.Function0;
@@ -115,12 +116,13 @@ public final class WidgetGuildRoleSubscriptionPlanSetup extends AppFragment {
 
     private final void handleEvents(GuildRoleSubscriptionPlanSetupViewModel.Event event) {
         if (event instanceof GuildRoleSubscriptionPlanSetupViewModel.Event.SubmitSuccess) {
+            WidgetServerSettingsGuildRoleSubscriptionTierList.Companion.launch(requireContext(), getGuildId());
             FragmentActivity activity = getActivity();
             if (activity != null) {
                 activity.finish();
             }
         } else if (event instanceof GuildRoleSubscriptionPlanSetupViewModel.Event.SubmitFailure) {
-            c.a.d.m.i(this, R.string.default_failure_to_perform_action_message, 0, 4);
+            ((GuildRoleSubscriptionPlanSetupViewModel.Event.SubmitFailure) event).getError().showToasts(requireContext());
         }
     }
 

app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/GuildRoleSubscriptionTierListItemGeneratorKt.java

@@ -20,7 +20,7 @@ public final class GuildRoleSubscriptionTierListItemGeneratorKt {
         }
         if (guildRoleSubscriptionTier != null) {
             arrayList.add(new GuildRoleSubscriptionTierAdapterItem.Header(guildRoleSubscriptionTier.getName(), guildRoleSubscriptionTier.getPriceTier(), null, guildRoleSubscriptionTier.getImage(), guildRoleSubscriptionTier.getDescription(), 4, null));
-            arrayList.add(new GuildRoleSubscriptionTierAdapterItem.MemberPreview(guildRoleSubscriptionTier.getMemberColor(), null, 2, null));
+            arrayList.add(new GuildRoleSubscriptionTierAdapterItem.MemberPreview(guildRoleSubscriptionTier.getMemberColor(), guildRoleSubscriptionTier.getMemberIcon()));
             if (!guildRoleSubscriptionTier.getChannelBenefits().isEmpty()) {
                 arrayList.add(new GuildRoleSubscriptionTierAdapterItem.SectionHeader(R.plurals.guild_role_subscription_tier_review_exclusive_channel_header_count, guildRoleSubscriptionTier.getChannelBenefits().size()));
                 int i2 = 0;

app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/CreateGuildRoleSubscriptionTierViewModel$submit$2.java

@@ -25,9 +25,9 @@ public final class CreateGuildRoleSubscriptionTierViewModel$submit$2 extends o i
     }
 
     public final void invoke(Error error) {
-        m.checkNotNullParameter(error, "it");
+        m.checkNotNullParameter(error, "error");
         CreateGuildRoleSubscriptionTierViewModel createGuildRoleSubscriptionTierViewModel = this.this$0;
         createGuildRoleSubscriptionTierViewModel.updateViewState(CreateGuildRoleSubscriptionTierViewModel.ViewState.copy$default(CreateGuildRoleSubscriptionTierViewModel.access$requireViewState(createGuildRoleSubscriptionTierViewModel), 0, false, false, null, 11, null));
-        CreateGuildRoleSubscriptionTierViewModel.access$emitEvent(this.this$0, CreateGuildRoleSubscriptionTierViewModel.Event.SubmitFailure.INSTANCE);
+        CreateGuildRoleSubscriptionTierViewModel.access$emitEvent(this.this$0, new CreateGuildRoleSubscriptionTierViewModel.Event.SubmitFailure(error));
     }
 }

app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/CreateGuildRoleSubscriptionTierViewModel.java

@@ -9,6 +9,7 @@ import com.discord.app.AppViewModel;
 import com.discord.stores.StoreGuildRoleSubscriptions;
 import com.discord.stores.StoreStream;
 import com.discord.utilities.color.ColorCompat;
+import com.discord.utilities.error.Error;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.widgets.guild_role_subscriptions.GuildRoleSubscriptionUtils;
@@ -46,10 +47,55 @@ public final class CreateGuildRoleSubscriptionTierViewModel extends AppViewModel
 
         /* compiled from: CreateGuildRoleSubscriptionTierViewModel.kt */
         public static final class SubmitFailure extends Event {
-            public static final SubmitFailure INSTANCE = new SubmitFailure();
+            private final Error error;
 
-            private SubmitFailure() {
+            /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+            public SubmitFailure(Error error) {
                 super(null);
+                m.checkNotNullParameter(error, "error");
+                this.error = error;
+            }
+
+            public static /* synthetic */ SubmitFailure copy$default(SubmitFailure submitFailure, Error error, int i, Object obj) {
+                if ((i & 1) != 0) {
+                    error = submitFailure.error;
+                }
+                return submitFailure.copy(error);
+            }
+
+            public final Error component1() {
+                return this.error;
+            }
+
+            public final SubmitFailure copy(Error error) {
+                m.checkNotNullParameter(error, "error");
+                return new SubmitFailure(error);
+            }
+
+            public boolean equals(Object obj) {
+                if (this != obj) {
+                    return (obj instanceof SubmitFailure) && m.areEqual(this.error, ((SubmitFailure) obj).error);
+                }
+                return true;
+            }
+
+            public final Error getError() {
+                return this.error;
+            }
+
+            public int hashCode() {
+                Error error = this.error;
+                if (error != null) {
+                    return error.hashCode();
+                }
+                return 0;
+            }
+
+            public String toString() {
+                StringBuilder O = a.O("SubmitFailure(error=");
+                O.append(this.error);
+                O.append(")");
+                return O.toString();
             }
         }
 

app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetCreateGuildRoleSubscriptionTier.java

@@ -130,7 +130,7 @@ public final class WidgetCreateGuildRoleSubscriptionTier extends AppFragment {
                 activity.finish();
             }
         } else if (event instanceof CreateGuildRoleSubscriptionTierViewModel.Event.SubmitFailure) {
-            c.a.d.m.i(this, R.string.default_failure_to_perform_action_message, 0, 4);
+            ((CreateGuildRoleSubscriptionTierViewModel.Event.SubmitFailure) event).getError().showToasts(requireContext());
         }
     }
 

app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/WidgetGuildRoleSubscriptionTierDetails.java

@@ -108,13 +108,22 @@ public final class WidgetGuildRoleSubscriptionTierDetails extends AppFragment {
             m.checkNotNullExpressionValue(context, "binding.root.context");
             textView.setText(PremiumUtilsKt.getFormattedPriceUsd(intValue, context));
         }
-        if (m.areEqual(guildRoleSubscriptionTier.isPublished(), Boolean.TRUE)) {
+        Boolean isPublished = guildRoleSubscriptionTier.isPublished();
+        Boolean bool = Boolean.TRUE;
+        if (m.areEqual(isPublished, bool)) {
             TextView textView2 = getBinding().g;
             m.checkNotNullExpressionValue(textView2, "binding.createSubscriptionTierPrice");
             ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView2, 0, 0, R.drawable.ic_lock_white_a60_16dp, 0, 11, null);
-            return;
+        } else {
+            getBinding().g.setOnClickListener(new WidgetGuildRoleSubscriptionTierDetails$configureUI$1(this));
         }
-        getBinding().g.setOnClickListener(new WidgetGuildRoleSubscriptionTierDetails$configureUI$1(this));
+        TextView textView3 = getBinding().g;
+        m.checkNotNullExpressionValue(textView3, "binding.createSubscriptionTierPrice");
+        boolean z2 = true;
+        if (guildRoleSubscriptionTier.getPriceTier() == null || !(!m.areEqual(guildRoleSubscriptionTier.isPublished(), bool))) {
+            z2 = false;
+        }
+        textView3.setSelected(z2);
     }
 
     private final WidgetGuildRoleSubscriptionDetailsBinding getBinding() {

app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefit$configureUI$1.java

@@ -39,6 +39,6 @@ public final class WidgetGuildRoleSubscriptionTierBenefit$configureUI$1 implemen
     public final void onClick(View view) {
         WidgetChannelPickerBottomSheet.Companion companion = WidgetChannelPickerBottomSheet.Companion;
         WidgetGuildRoleSubscriptionTierBenefit widgetGuildRoleSubscriptionTierBenefit = this.this$0;
-        companion.launch(widgetGuildRoleSubscriptionTierBenefit, "REQUEST_KEY_CHANNEL_PICKER", WidgetGuildRoleSubscriptionTierBenefit.access$getGuildId$p(widgetGuildRoleSubscriptionTierBenefit), this.$viewState.getChannelId(), new AnonymousClass1(this));
+        companion.launch(widgetGuildRoleSubscriptionTierBenefit, "REQUEST_KEY_CHANNEL_PICKER", WidgetGuildRoleSubscriptionTierBenefit.access$getGuildId$p(widgetGuildRoleSubscriptionTierBenefit), this.$viewState.getChannelId(), new AnonymousClass1(this), true);
     }
 }

app/src/main/java/com/discord/widgets/guild_role_subscriptions/tier/create/benefits/WidgetGuildRoleSubscriptionTierBenefit$configureUIForChannelBenefit$2.java

@@ -17,6 +17,6 @@ public final class WidgetGuildRoleSubscriptionTierBenefit$configureUIForChannelB
     @Override // kotlin.jvm.functions.Function0
     /* renamed from: invoke */
     public final void mo17invoke() {
-        WidgetCreateChannel.Companion.launch$default(WidgetCreateChannel.Companion, this.this$0.requireContext(), WidgetGuildRoleSubscriptionTierBenefit.access$getCreateChannelLauncher$p(this.this$0), WidgetGuildRoleSubscriptionTierBenefit.access$getGuildId$p(this.this$0), 0, null, true, true, true, 24, null);
+        WidgetCreateChannel.Companion.launch$default(WidgetCreateChannel.Companion, this.this$0.requireContext(), WidgetGuildRoleSubscriptionTierBenefit.access$getCreateChannelLauncher$p(this.this$0), WidgetGuildRoleSubscriptionTierBenefit.access$getGuildId$p(this.this$0), 0, null, true, true, true, true, 24, null);
     }
 }

app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsBottomSheet$Companion$enqueue$guildScheduledEventDetailsNotice$1.java

@@ -4,16 +4,21 @@ import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import c0.z.d.m;
 import c0.z.d.o;
+import com.discord.stores.StoreNotices;
 import com.discord.widgets.guildscheduledevent.WidgetGuildScheduledEventDetailsBottomSheet;
 import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetGuildScheduledEventDetailsBottomSheet.kt */
 public final class WidgetGuildScheduledEventDetailsBottomSheet$Companion$enqueue$guildScheduledEventDetailsNotice$1 extends o implements Function1<FragmentActivity, Boolean> {
     public final /* synthetic */ long $guildScheduledEventId;
+    public final /* synthetic */ String $noticeName;
+    public final /* synthetic */ StoreNotices $storeNotices;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-    public WidgetGuildScheduledEventDetailsBottomSheet$Companion$enqueue$guildScheduledEventDetailsNotice$1(long j) {
+    public WidgetGuildScheduledEventDetailsBottomSheet$Companion$enqueue$guildScheduledEventDetailsNotice$1(long j, StoreNotices storeNotices, String str) {
         super(1);
         this.$guildScheduledEventId = j;
+        this.$storeNotices = storeNotices;
+        this.$noticeName = str;
     }
 
     /* Return type fixed from 'java.lang.Object' to match base method */
@@ -29,6 +34,7 @@ public final class WidgetGuildScheduledEventDetailsBottomSheet$Companion$enqueue
         FragmentManager supportFragmentManager = fragmentActivity.getSupportFragmentManager();
         m.checkNotNullExpressionValue(supportFragmentManager, "appActivity.supportFragmentManager");
         companion.show(supportFragmentManager, this.$guildScheduledEventId);
+        StoreNotices.markSeen$default(this.$storeNotices, this.$noticeName, 0, 2, null);
         return true;
     }
 }

app/src/main/java/com/discord/widgets/guildscheduledevent/WidgetGuildScheduledEventDetailsBottomSheet.java

@@ -61,7 +61,14 @@ public final class WidgetGuildScheduledEventDetailsBottomSheet extends AppBottom
         }
 
         public final void enqueue(long j) {
-            StoreStream.Companion.getNotices().requestToShow(new StoreNotices.Notice(a.q("EVENTDETAILS-", j), null, 0, 0, false, m.listOf(a0.getOrCreateKotlinClass(WidgetHome.class)), 0, false, 0, new WidgetGuildScheduledEventDetailsBottomSheet$Companion$enqueue$guildScheduledEventDetailsNotice$1(j), FontUtils.MAX_FONT_SCALING, null));
+            StoreNotices notices = StoreStream.Companion.getNotices();
+            String q = a.q("EVENTDETAILS-", j);
+            notices.requestToShow(new StoreNotices.Notice(q, null, 0, 0, false, m.listOf(a0.getOrCreateKotlinClass(WidgetHome.class)), 0, false, 0, new WidgetGuildScheduledEventDetailsBottomSheet$Companion$enqueue$guildScheduledEventDetailsNotice$1(j, notices, q), FontUtils.MAX_FONT_SCALING, null));
+        }
+
+        public final void handleInvalidEvent(Context context) {
+            c0.z.d.m.checkNotNullParameter(context, "context");
+            c.a.d.m.g(context, R.string.inaccessible_channel_link_title, 0, null, 12);
         }
 
         public final void show(FragmentManager fragmentManager, long j) {

app/src/main/java/com/discord/widgets/media/WidgetQRScanner.java

@@ -90,7 +90,7 @@ public final class WidgetQRScanner extends AppFragment implements ZXingScannerVi
         if (result != null && (str = result.a) != null) {
             Uri parse = Uri.parse(str);
             if (URLUtil.isValidUrl(str)) {
-                c.a.d.l0.a aVar = c.a.d.l0.a.E;
+                c.a.d.l0.a aVar = c.a.d.l0.a.F;
                 m.checkNotNullExpressionValue(parse, NotificationCompat.MessagingStyle.Message.KEY_DATA_URI);
             }
             IntentUtils intentUtils = IntentUtils.INSTANCE;
@@ -101,7 +101,7 @@ public final class WidgetQRScanner extends AppFragment implements ZXingScannerVi
             }
             String path = parse.getPath();
             if (path != null) {
-                c.a.d.l0.a aVar2 = c.a.d.l0.a.E;
+                c.a.d.l0.a aVar2 = c.a.d.l0.a.F;
                 Regex regex = c.a.d.l0.a.C;
                 m.checkNotNullExpressionValue(path, "it");
                 matchResult = regex.matchEntire(path);

app/src/main/java/com/discord/widgets/roles/RoleIconView.java

@@ -75,6 +75,20 @@ public final class RoleIconView extends FrameLayout {
         return false;
     }
 
+    private final void setIcon(GuildRole guildRole) {
+        if (hasIcon(guildRole)) {
+            SimpleDraweeView simpleDraweeView = this.binding.b;
+            m.checkNotNullExpressionValue(simpleDraweeView, "binding.roleIconIv");
+            IconUtils.setIcon$default(simpleDraweeView, guildRole, (int) R.dimen.role_icon_size, (MGImages.ChangeDetector) null, 8, (Object) null);
+        } else if (hasUnicodeEmoji(guildRole)) {
+            ModelEmojiUnicode modelEmojiUnicode = StoreStream.Companion.getEmojis().getUnicodeEmojiSurrogateMap().get(guildRole.k());
+            String imageUri = ModelEmojiUnicode.getImageUri(modelEmojiUnicode != null ? modelEmojiUnicode.getCodePoints() : null, getContext());
+            SimpleDraweeView simpleDraweeView2 = this.binding.b;
+            m.checkNotNullExpressionValue(simpleDraweeView2, "binding.roleIconIv");
+            IconUtils.setIcon$default(simpleDraweeView2, imageUri, 0, (Function1) null, (MGImages.ChangeDetector) null, 28, (Object) null);
+        }
+    }
+
     private final void showRoleIconToast(Context context, GuildRole guildRole) {
         ModelEmojiUnicode modelEmojiUnicode;
         EmojiNode emojiNode = hasIcon(guildRole) ? new EmojiNode(guildRole.g(), new RoleIconView$showRoleIconToast$1(guildRole), new EmojiNode.EmojiIdAndType.Unicode(""), DimenUtils.dpToPixels(24), DimenUtils.dpToPixels(24)) : (!hasUnicodeEmoji(guildRole) || (modelEmojiUnicode = StoreStream.Companion.getEmojis().getUnicodeEmojiSurrogateMap().get(guildRole.k())) == null) ? null : EmojiNode.Companion.from(modelEmojiUnicode, DimenUtils.dpToPixels(24));
@@ -93,17 +107,7 @@ public final class RoleIconView extends FrameLayout {
             return;
         }
         setVisibility(0);
-        if (hasIcon(guildRole)) {
+        setIcon(guildRole);
-            SimpleDraweeView simpleDraweeView = this.binding.b;
-            m.checkNotNullExpressionValue(simpleDraweeView, "binding.roleIconIv");
-            IconUtils.setIcon$default(simpleDraweeView, guildRole, (int) R.dimen.role_icon_size, (MGImages.ChangeDetector) null, 8, (Object) null);
-        } else if (hasUnicodeEmoji(guildRole)) {
-            ModelEmojiUnicode modelEmojiUnicode = StoreStream.Companion.getEmojis().getUnicodeEmojiSurrogateMap().get(guildRole.k());
-            String imageUri = ModelEmojiUnicode.getImageUri(modelEmojiUnicode != null ? modelEmojiUnicode.getCodePoints() : null, getContext());
-            SimpleDraweeView simpleDraweeView2 = this.binding.b;
-            m.checkNotNullExpressionValue(simpleDraweeView2, "binding.roleIconIv");
-            IconUtils.setIcon$default(simpleDraweeView2, imageUri, 0, (Function1) null, (MGImages.ChangeDetector) null, 28, (Object) null);
-        }
         Context context = getContext();
         m.checkNotNullExpressionValue(context, "context");
         setContentDescription(b.h(context, R.string.role_icon_alt_text, new Object[]{guildRole.g()}, null, 4));
@@ -120,9 +124,7 @@ public final class RoleIconView extends FrameLayout {
             return;
         }
         setVisibility(0);
-        SimpleDraweeView simpleDraweeView = this.binding.b;
+        setIcon(guildRole);
-        m.checkNotNullExpressionValue(simpleDraweeView, "binding.roleIconIv");
-        IconUtils.setIcon$default(simpleDraweeView, guildRole, (int) R.dimen.role_icon_size, (MGImages.ChangeDetector) null, 8, (Object) null);
     }
 
     public final void setRoleIconPreview(String str) {

app/src/main/java/com/discord/widgets/servers/guild_role_subscription/ServerSettingsGuildRoleSubscriptionViewModel.java

@@ -517,8 +517,14 @@ public final class ServerSettingsGuildRoleSubscriptionViewModel extends AppViewM
         return publishSubject;
     }
 
+    /* JADX WARNING: Removed duplicated region for block: B:24:0x0042  */
+    /* JADX WARNING: Removed duplicated region for block: B:25:0x0046  */
+    /* JADX WARNING: Removed duplicated region for block: B:28:0x004d  */
+    /* JADX WARNING: Removed duplicated region for block: B:34:0x0066  */
+    /* JADX WARNING: Removed duplicated region for block: B:35:0x006e  */
     public final void onGuildRoleSubscriptionGroupUpdated(String str, String str2, boolean z2) {
         boolean z3;
+        Boolean bool;
         boolean z4;
         ViewState requireViewState = requireViewState();
         if (!(requireViewState instanceof ViewState.Loaded)) {
@@ -529,32 +535,42 @@ public final class ServerSettingsGuildRoleSubscriptionViewModel extends AppViewM
             GuildRoleSubscriptionGroupListing guildRoleSubscriptionGroupListing = this.guildRoleSubscriptionGroupListing;
             boolean z5 = false;
             if (!m.areEqual(guildRoleSubscriptionGroupListing != null ? guildRoleSubscriptionGroupListing.c() : null, str)) {
-                this.editedGroupDescription = str;
+                if (!(str == null || t.isBlank(str))) {
-                z3 = true;
+                    this.editedGroupDescription = str;
-            } else {
+                    z3 = true;
-                this.editedGroupDescription = null;
+                    if (str2 == null || t.isBlank(str2)) {
-                z3 = false;
+                        z5 = true;
+                    }
+                    if (z5) {
+                        this.editedGroupCoverImage = str2;
+                        z3 = true;
+                    } else {
+                        this.editedGroupCoverImage = null;
+                    }
+                    bool = this.fullServerGatingOverwrite;
+                    if (bool == null) {
+                        GuildRoleSubscriptionGroupListing guildRoleSubscriptionGroupListing2 = this.guildRoleSubscriptionGroupListing;
+                        bool = guildRoleSubscriptionGroupListing2 != null ? Boolean.valueOf(guildRoleSubscriptionGroupListing2.d()) : null;
+                    }
+                    if (!(!m.areEqual(bool, Boolean.valueOf(z2)))) {
+                        this.editedIsFullServerGating = Boolean.valueOf(z2);
+                        z4 = true;
+                    } else {
+                        this.editedIsFullServerGating = null;
+                        z4 = z3;
+                    }
+                    updateViewState(ViewState.Loaded.copy$default(loaded, z4, false, 0, 6, null));
+                }
             }
-            if (str2 == null || t.isBlank(str2)) {
+            this.editedGroupDescription = null;
-                z5 = true;
+            z3 = false;
+            z5 = true;
+            if (z5) {
             }
-            if (!z5) {
+            bool = this.fullServerGatingOverwrite;
-                this.editedGroupCoverImage = str2;
-                z3 = true;
-            } else {
-                this.editedGroupCoverImage = null;
-            }
-            Boolean bool = this.fullServerGatingOverwrite;
             if (bool == null) {
-                GuildRoleSubscriptionGroupListing guildRoleSubscriptionGroupListing2 = this.guildRoleSubscriptionGroupListing;
-                bool = guildRoleSubscriptionGroupListing2 != null ? Boolean.valueOf(guildRoleSubscriptionGroupListing2.d()) : null;
             }
-            if (!m.areEqual(bool, Boolean.valueOf(z2))) {
+            if (!(!m.areEqual(bool, Boolean.valueOf(z2)))) {
-                this.editedIsFullServerGating = Boolean.valueOf(z2);
-                z4 = true;
-            } else {
-                this.editedIsFullServerGating = null;
-                z4 = z3;
             }
             updateViewState(ViewState.Loaded.copy$default(loaded, z4, false, 0, 6, null));
         }

app/src/main/java/com/discord/widgets/servers/guild_role_subscription/WidgetServerSettingsEmptyGuildRoleSubscriptions$onViewBound$1.java

@@ -13,5 +13,6 @@ public final class WidgetServerSettingsEmptyGuildRoleSubscriptions$onViewBound$1
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
         WidgetGuildRoleSubscriptionPlanSetup.Companion.launch(this.this$0.requireContext(), WidgetServerSettingsEmptyGuildRoleSubscriptions.access$getGuildId$p(this.this$0));
+        this.this$0.requireActivity().finish();
     }
 }

app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel$deleteTier$2.java

@@ -27,8 +27,8 @@ public final class ServerSettingsGuildRoleSubscriptionEditTierViewModel$deleteTi
     }
 
     public final void invoke(Error error) {
-        m.checkNotNullParameter(error, "it");
+        m.checkNotNullParameter(error, "error");
         ServerSettingsGuildRoleSubscriptionEditTierViewModel.access$updateViewState(this.this$0, ServerSettingsGuildRoleSubscriptionEditTierViewModel.ViewState.Loaded.copy$default(this.$viewState, false, false, null, false, 7, null));
-        ServerSettingsGuildRoleSubscriptionEditTierViewModel.access$emitEvent(this.this$0, ServerSettingsGuildRoleSubscriptionEditTierViewModel.Event.DeleteFailure.INSTANCE);
+        ServerSettingsGuildRoleSubscriptionEditTierViewModel.access$emitEvent(this.this$0, new ServerSettingsGuildRoleSubscriptionEditTierViewModel.Event.DeleteFailure(error));
     }
 }

app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel$publishTier$2.java

@@ -27,8 +27,8 @@ public final class ServerSettingsGuildRoleSubscriptionEditTierViewModel$publishT
     }
 
     public final void invoke(Error error) {
-        m.checkNotNullParameter(error, "it");
+        m.checkNotNullParameter(error, "error");
         ServerSettingsGuildRoleSubscriptionEditTierViewModel.access$updateViewState(this.this$0, ServerSettingsGuildRoleSubscriptionEditTierViewModel.ViewState.Loaded.copy$default(this.$viewState, false, false, null, false, 7, null));
-        ServerSettingsGuildRoleSubscriptionEditTierViewModel.access$emitEvent(this.this$0, ServerSettingsGuildRoleSubscriptionEditTierViewModel.Event.SubmitFailure.INSTANCE);
+        ServerSettingsGuildRoleSubscriptionEditTierViewModel.access$emitEvent(this.this$0, new ServerSettingsGuildRoleSubscriptionEditTierViewModel.Event.SubmitFailure(error));
     }
 }

app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel$submitChanges$3.java

@@ -27,8 +27,8 @@ public final class ServerSettingsGuildRoleSubscriptionEditTierViewModel$submitCh
     }
 
     public final void invoke(Error error) {
-        m.checkNotNullParameter(error, "it");
+        m.checkNotNullParameter(error, "error");
         ServerSettingsGuildRoleSubscriptionEditTierViewModel.access$updateViewState(this.this$0, ServerSettingsGuildRoleSubscriptionEditTierViewModel.ViewState.Loaded.copy$default(this.$viewState, false, false, null, false, 7, null));
-        ServerSettingsGuildRoleSubscriptionEditTierViewModel.access$emitEvent(this.this$0, ServerSettingsGuildRoleSubscriptionEditTierViewModel.Event.SubmitFailure.INSTANCE);
+        ServerSettingsGuildRoleSubscriptionEditTierViewModel.access$emitEvent(this.this$0, new ServerSettingsGuildRoleSubscriptionEditTierViewModel.Event.SubmitFailure(error));
     }
 }

app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/ServerSettingsGuildRoleSubscriptionEditTierViewModel.java

@@ -3,6 +3,7 @@ package com.discord.widgets.servers.guild_role_subscription.edit_tier;
 import android.content.Context;
 import androidx.annotation.MainThread;
 import c.d.b.a.a;
+import c0.g0.t;
 import c0.t.u;
 import c0.z.d.m;
 import c0.z.d.o;
@@ -27,6 +28,7 @@ import com.discord.stores.updates.ObservationDeck;
 import com.discord.stores.updates.ObservationDeckProvider;
 import com.discord.utilities.channel.GuildChannelIconUtilsKt;
 import com.discord.utilities.color.ColorCompat;
+import com.discord.utilities.error.Error;
 import com.discord.utilities.guilds.RoleUtils;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -113,10 +115,55 @@ public final class ServerSettingsGuildRoleSubscriptionEditTierViewModel extends
 
         /* compiled from: ServerSettingsGuildRoleSubscriptionEditTierViewModel.kt */
         public static final class DeleteFailure extends Event {
-            public static final DeleteFailure INSTANCE = new DeleteFailure();
+            private final Error error;
 
-            private DeleteFailure() {
+            /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+            public DeleteFailure(Error error) {
                 super(null);
+                m.checkNotNullParameter(error, "error");
+                this.error = error;
+            }
+
+            public static /* synthetic */ DeleteFailure copy$default(DeleteFailure deleteFailure, Error error, int i, Object obj) {
+                if ((i & 1) != 0) {
+                    error = deleteFailure.error;
+                }
+                return deleteFailure.copy(error);
+            }
+
+            public final Error component1() {
+                return this.error;
+            }
+
+            public final DeleteFailure copy(Error error) {
+                m.checkNotNullParameter(error, "error");
+                return new DeleteFailure(error);
+            }
+
+            public boolean equals(Object obj) {
+                if (this != obj) {
+                    return (obj instanceof DeleteFailure) && m.areEqual(this.error, ((DeleteFailure) obj).error);
+                }
+                return true;
+            }
+
+            public final Error getError() {
+                return this.error;
+            }
+
+            public int hashCode() {
+                Error error = this.error;
+                if (error != null) {
+                    return error.hashCode();
+                }
+                return 0;
+            }
+
+            public String toString() {
+                StringBuilder O = a.O("DeleteFailure(error=");
+                O.append(this.error);
+                O.append(")");
+                return O.toString();
             }
         }
 
@@ -185,10 +232,55 @@ public final class ServerSettingsGuildRoleSubscriptionEditTierViewModel extends
 
         /* compiled from: ServerSettingsGuildRoleSubscriptionEditTierViewModel.kt */
         public static final class SubmitFailure extends Event {
-            public static final SubmitFailure INSTANCE = new SubmitFailure();
+            private final Error error;
 
-            private SubmitFailure() {
+            /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+            public SubmitFailure(Error error) {
                 super(null);
+                m.checkNotNullParameter(error, "error");
+                this.error = error;
+            }
+
+            public static /* synthetic */ SubmitFailure copy$default(SubmitFailure submitFailure, Error error, int i, Object obj) {
+                if ((i & 1) != 0) {
+                    error = submitFailure.error;
+                }
+                return submitFailure.copy(error);
+            }
+
+            public final Error component1() {
+                return this.error;
+            }
+
+            public final SubmitFailure copy(Error error) {
+                m.checkNotNullParameter(error, "error");
+                return new SubmitFailure(error);
+            }
+
+            public boolean equals(Object obj) {
+                if (this != obj) {
+                    return (obj instanceof SubmitFailure) && m.areEqual(this.error, ((SubmitFailure) obj).error);
+                }
+                return true;
+            }
+
+            public final Error getError() {
+                return this.error;
+            }
+
+            public int hashCode() {
+                Error error = this.error;
+                if (error != null) {
+                    return error.hashCode();
+                }
+                return 0;
+            }
+
+            public String toString() {
+                StringBuilder O = a.O("SubmitFailure(error=");
+                O.append(this.error);
+                O.append(")");
+                return O.toString();
             }
         }
 
@@ -648,90 +740,188 @@ public final class ServerSettingsGuildRoleSubscriptionEditTierViewModel extends
         return publishSubject;
     }
 
+    /* JADX WARNING: Removed duplicated region for block: B:22:0x0050  */
+    /* JADX WARNING: Removed duplicated region for block: B:23:0x0055  */
+    /* JADX WARNING: Removed duplicated region for block: B:26:0x005d  */
+    /* JADX WARNING: Removed duplicated region for block: B:36:0x007c  */
+    /* JADX WARNING: Removed duplicated region for block: B:37:0x0084  */
+    /* JADX WARNING: Removed duplicated region for block: B:40:0x008e  */
+    /* JADX WARNING: Removed duplicated region for block: B:41:0x0093  */
+    /* JADX WARNING: Removed duplicated region for block: B:44:0x009b  */
+    /* JADX WARNING: Removed duplicated region for block: B:45:0x00a3  */
+    /* JADX WARNING: Removed duplicated region for block: B:48:0x00ad  */
+    /* JADX WARNING: Removed duplicated region for block: B:49:0x00b2  */
+    /* JADX WARNING: Removed duplicated region for block: B:52:0x00ba  */
+    /* JADX WARNING: Removed duplicated region for block: B:53:0x00c2  */
+    /* JADX WARNING: Removed duplicated region for block: B:56:0x00ca  */
+    /* JADX WARNING: Removed duplicated region for block: B:57:0x00d2  */
+    /* JADX WARNING: Removed duplicated region for block: B:60:0x00dc  */
+    /* JADX WARNING: Removed duplicated region for block: B:61:0x00e1  */
+    /* JADX WARNING: Removed duplicated region for block: B:64:0x00e9  */
+    /* JADX WARNING: Removed duplicated region for block: B:65:0x00f1  */
+    /* JADX WARNING: Removed duplicated region for block: B:68:0x00fb  */
+    /* JADX WARNING: Removed duplicated region for block: B:69:0x0100  */
+    /* JADX WARNING: Removed duplicated region for block: B:72:0x0108  */
+    /* JADX WARNING: Removed duplicated region for block: B:73:0x0110  */
+    /* JADX WARNING: Removed duplicated region for block: B:76:0x0118  */
+    /* JADX WARNING: Removed duplicated region for block: B:77:0x011a  */
     public final void onTierUpdated(GuildRoleSubscriptionTier guildRoleSubscriptionTier) {
+        boolean z2;
+        String description;
+        GuildRoleSubscriptionTier guildRoleSubscriptionTier2;
+        Integer priceTier;
+        GuildRoleSubscriptionTier guildRoleSubscriptionTier3;
+        Integer memberColor;
+        GuildRoleSubscriptionTier guildRoleSubscriptionTier4;
+        List<Benefit.ChannelBenefit> channelBenefits;
+        GuildRoleSubscriptionTier guildRoleSubscriptionTier5;
+        List<Benefit.IntangibleBenefit> intangibleBenefits;
+        GuildRoleSubscriptionTier guildRoleSubscriptionTier6;
+        boolean z3;
         String str;
+        String str2;
         m.checkNotNullParameter(guildRoleSubscriptionTier, "guildRoleSubscriptionTier");
         ViewState requireViewState = requireViewState();
-        String str2 = null;
+        String str3 = null;
         if (!(requireViewState instanceof ViewState.Loaded)) {
             requireViewState = null;
         }
         ViewState.Loaded loaded = (ViewState.Loaded) requireViewState;
         if (loaded != null) {
-            boolean z2 = false;
             String name = guildRoleSubscriptionTier.getName();
-            GuildRoleSubscriptionTier guildRoleSubscriptionTier2 = this.storedGuildRoleSubscriptionTier;
+            GuildRoleSubscriptionTier guildRoleSubscriptionTier7 = this.storedGuildRoleSubscriptionTier;
-            boolean areEqual = m.areEqual(name, guildRoleSubscriptionTier2 != null ? guildRoleSubscriptionTier2.getName() : null);
+            boolean z4 = false;
-            boolean z3 = true;
+            if (!m.areEqual(name, guildRoleSubscriptionTier7 != null ? guildRoleSubscriptionTier7.getName() : null)) {
-            if (!areEqual) {
+                String name2 = guildRoleSubscriptionTier.getName();
-                this.editedTierName = guildRoleSubscriptionTier.getName();
+                if (!(name2 == null || t.isBlank(name2))) {
-                z2 = true;
+                    this.editedTierName = guildRoleSubscriptionTier.getName();
-            } else {
+                    z2 = true;
-                this.editedTierName = null;
+                    description = guildRoleSubscriptionTier.getDescription();
+                    guildRoleSubscriptionTier2 = this.storedGuildRoleSubscriptionTier;
+                    if (!m.areEqual(description, guildRoleSubscriptionTier2 == null ? guildRoleSubscriptionTier2.getDescription() : null)) {
+                        String description2 = guildRoleSubscriptionTier.getDescription();
+                        if (description2 == null || t.isBlank(description2)) {
+                            z4 = true;
+                        }
+                        if (!z4) {
+                            this.editedTierDescription = guildRoleSubscriptionTier.getDescription();
+                            z2 = true;
+                            if (guildRoleSubscriptionTier.getImage() != null) {
+                                this.editedTierImage = guildRoleSubscriptionTier.getImage();
+                                z2 = true;
+                            } else {
+                                this.editedTierImage = null;
+                            }
+                            priceTier = guildRoleSubscriptionTier.getPriceTier();
+                            guildRoleSubscriptionTier3 = this.storedGuildRoleSubscriptionTier;
+                            if (!m.areEqual(priceTier, guildRoleSubscriptionTier3 != null ? guildRoleSubscriptionTier3.getPriceTier() : null)) {
+                                this.editedTierPrice = guildRoleSubscriptionTier.getPriceTier();
+                                z2 = true;
+                            } else {
+                                this.editedTierPrice = null;
+                            }
+                            memberColor = guildRoleSubscriptionTier.getMemberColor();
+                            guildRoleSubscriptionTier4 = this.storedGuildRoleSubscriptionTier;
+                            if (!m.areEqual(memberColor, guildRoleSubscriptionTier4 != null ? guildRoleSubscriptionTier4.getMemberColor() : null)) {
+                                this.editedMemberColor = guildRoleSubscriptionTier.getMemberColor();
+                                z2 = true;
+                            } else {
+                                this.editedMemberColor = null;
+                            }
+                            if (guildRoleSubscriptionTier.getMemberIcon() != null) {
+                                this.editedMemberIcon = guildRoleSubscriptionTier.getMemberIcon();
+                                z2 = true;
+                            } else {
+                                this.editedMemberIcon = null;
+                            }
+                            channelBenefits = guildRoleSubscriptionTier.getChannelBenefits();
+                            guildRoleSubscriptionTier5 = this.storedGuildRoleSubscriptionTier;
+                            if (!m.areEqual(channelBenefits, guildRoleSubscriptionTier5 != null ? guildRoleSubscriptionTier5.getChannelBenefits() : null)) {
+                                this.editedChannelBenefits = guildRoleSubscriptionTier.getChannelBenefits();
+                                z2 = true;
+                            } else {
+                                this.editedChannelBenefits = null;
+                            }
+                            intangibleBenefits = guildRoleSubscriptionTier.getIntangibleBenefits();
+                            guildRoleSubscriptionTier6 = this.storedGuildRoleSubscriptionTier;
+                            if (!m.areEqual(intangibleBenefits, guildRoleSubscriptionTier6 != null ? guildRoleSubscriptionTier6.getIntangibleBenefits() : null)) {
+                                this.editedIntangibleBenefits = guildRoleSubscriptionTier.getIntangibleBenefits();
+                                z3 = true;
+                            } else {
+                                this.editedIntangibleBenefits = null;
+                                z3 = z2;
+                            }
+                            str = this.editedTierName;
+                            if (str != null) {
+                                str2 = str;
+                            } else {
+                                GuildRoleSubscriptionTier guildRoleSubscriptionTier8 = this.storedGuildRoleSubscriptionTier;
+                                if (guildRoleSubscriptionTier8 != null) {
+                                    str3 = guildRoleSubscriptionTier8.getName();
+                                }
+                                str2 = str3;
+                            }
+                            updateViewState(ViewState.Loaded.copy$default(loaded, z3, false, str2, false, 10, null));
+                        }
+                    }
+                    this.editedTierDescription = null;
+                    if (guildRoleSubscriptionTier.getImage() != null) {
+                    }
+                    priceTier = guildRoleSubscriptionTier.getPriceTier();
+                    guildRoleSubscriptionTier3 = this.storedGuildRoleSubscriptionTier;
+                    if (!m.areEqual(priceTier, guildRoleSubscriptionTier3 != null ? guildRoleSubscriptionTier3.getPriceTier() : null)) {
+                    }
+                    memberColor = guildRoleSubscriptionTier.getMemberColor();
+                    guildRoleSubscriptionTier4 = this.storedGuildRoleSubscriptionTier;
+                    if (!m.areEqual(memberColor, guildRoleSubscriptionTier4 != null ? guildRoleSubscriptionTier4.getMemberColor() : null)) {
+                    }
+                    if (guildRoleSubscriptionTier.getMemberIcon() != null) {
+                    }
+                    channelBenefits = guildRoleSubscriptionTier.getChannelBenefits();
+                    guildRoleSubscriptionTier5 = this.storedGuildRoleSubscriptionTier;
+                    if (!m.areEqual(channelBenefits, guildRoleSubscriptionTier5 != null ? guildRoleSubscriptionTier5.getChannelBenefits() : null)) {
+                    }
+                    intangibleBenefits = guildRoleSubscriptionTier.getIntangibleBenefits();
+                    guildRoleSubscriptionTier6 = this.storedGuildRoleSubscriptionTier;
+                    if (!m.areEqual(intangibleBenefits, guildRoleSubscriptionTier6 != null ? guildRoleSubscriptionTier6.getIntangibleBenefits() : null)) {
+                    }
+                    str = this.editedTierName;
+                    if (str != null) {
+                    }
+                    updateViewState(ViewState.Loaded.copy$default(loaded, z3, false, str2, false, 10, null));
+                }
             }
-            String description = guildRoleSubscriptionTier.getDescription();
+            this.editedTierName = null;
-            GuildRoleSubscriptionTier guildRoleSubscriptionTier3 = this.storedGuildRoleSubscriptionTier;
+            z2 = false;
-            if (!m.areEqual(description, guildRoleSubscriptionTier3 != null ? guildRoleSubscriptionTier3.getDescription() : null)) {
+            description = guildRoleSubscriptionTier.getDescription();
-                this.editedTierDescription = guildRoleSubscriptionTier.getDescription();
+            guildRoleSubscriptionTier2 = this.storedGuildRoleSubscriptionTier;
-                z2 = true;
+            if (!m.areEqual(description, guildRoleSubscriptionTier2 == null ? guildRoleSubscriptionTier2.getDescription() : null)) {
-            } else {
-                this.editedTierDescription = null;
             }
+            this.editedTierDescription = null;
             if (guildRoleSubscriptionTier.getImage() != null) {
-                this.editedTierImage = guildRoleSubscriptionTier.getImage();
-                z2 = true;
-            } else {
-                this.editedTierImage = null;
             }
-            Integer priceTier = guildRoleSubscriptionTier.getPriceTier();
+            priceTier = guildRoleSubscriptionTier.getPriceTier();
-            GuildRoleSubscriptionTier guildRoleSubscriptionTier4 = this.storedGuildRoleSubscriptionTier;
+            guildRoleSubscriptionTier3 = this.storedGuildRoleSubscriptionTier;
-            if (!m.areEqual(priceTier, guildRoleSubscriptionTier4 != null ? guildRoleSubscriptionTier4.getPriceTier() : null)) {
+            if (!m.areEqual(priceTier, guildRoleSubscriptionTier3 != null ? guildRoleSubscriptionTier3.getPriceTier() : null)) {
-                this.editedTierPrice = guildRoleSubscriptionTier.getPriceTier();
-                z2 = true;
-            } else {
-                this.editedTierPrice = null;
             }
-            Integer memberColor = guildRoleSubscriptionTier.getMemberColor();
+            memberColor = guildRoleSubscriptionTier.getMemberColor();
-            GuildRoleSubscriptionTier guildRoleSubscriptionTier5 = this.storedGuildRoleSubscriptionTier;
+            guildRoleSubscriptionTier4 = this.storedGuildRoleSubscriptionTier;
-            if (!m.areEqual(memberColor, guildRoleSubscriptionTier5 != null ? guildRoleSubscriptionTier5.getMemberColor() : null)) {
+            if (!m.areEqual(memberColor, guildRoleSubscriptionTier4 != null ? guildRoleSubscriptionTier4.getMemberColor() : null)) {
-                this.editedMemberColor = guildRoleSubscriptionTier.getMemberColor();
-                z2 = true;
-            } else {
-                this.editedMemberColor = null;
             }
             if (guildRoleSubscriptionTier.getMemberIcon() != null) {
-                this.editedMemberIcon = guildRoleSubscriptionTier.getMemberIcon();
-                z2 = true;
-            } else {
-                this.editedMemberIcon = null;
             }
-            List<Benefit.ChannelBenefit> channelBenefits = guildRoleSubscriptionTier.getChannelBenefits();
+            channelBenefits = guildRoleSubscriptionTier.getChannelBenefits();
-            GuildRoleSubscriptionTier guildRoleSubscriptionTier6 = this.storedGuildRoleSubscriptionTier;
+            guildRoleSubscriptionTier5 = this.storedGuildRoleSubscriptionTier;
-            if (!m.areEqual(channelBenefits, guildRoleSubscriptionTier6 != null ? guildRoleSubscriptionTier6.getChannelBenefits() : null)) {
+            if (!m.areEqual(channelBenefits, guildRoleSubscriptionTier5 != null ? guildRoleSubscriptionTier5.getChannelBenefits() : null)) {
-                this.editedChannelBenefits = guildRoleSubscriptionTier.getChannelBenefits();
-                z2 = true;
-            } else {
-                this.editedChannelBenefits = null;
             }
-            List<Benefit.IntangibleBenefit> intangibleBenefits = guildRoleSubscriptionTier.getIntangibleBenefits();
+            intangibleBenefits = guildRoleSubscriptionTier.getIntangibleBenefits();
-            GuildRoleSubscriptionTier guildRoleSubscriptionTier7 = this.storedGuildRoleSubscriptionTier;
+            guildRoleSubscriptionTier6 = this.storedGuildRoleSubscriptionTier;
-            if (!m.areEqual(intangibleBenefits, guildRoleSubscriptionTier7 != null ? guildRoleSubscriptionTier7.getIntangibleBenefits() : null)) {
+            if (!m.areEqual(intangibleBenefits, guildRoleSubscriptionTier6 != null ? guildRoleSubscriptionTier6.getIntangibleBenefits() : null)) {
-                this.editedIntangibleBenefits = guildRoleSubscriptionTier.getIntangibleBenefits();
-            } else {
-                this.editedIntangibleBenefits = null;
-                z3 = z2;
             }
-            String str3 = this.editedTierName;
+            str = this.editedTierName;
-            if (str3 != null) {
+            if (str != null) {
-                str = str3;
-            } else {
-                GuildRoleSubscriptionTier guildRoleSubscriptionTier8 = this.storedGuildRoleSubscriptionTier;
-                if (guildRoleSubscriptionTier8 != null) {
-                    str2 = guildRoleSubscriptionTier8.getName();
-                }
-                str = str2;
             }
-            updateViewState(ViewState.Loaded.copy$default(loaded, z3, false, str, false, 10, null));
+            updateViewState(ViewState.Loaded.copy$default(loaded, z3, false, str2, false, 10, null));
         }
     }
 

app/src/main/java/com/discord/widgets/servers/guild_role_subscription/edit_tier/WidgetServerSettingsGuildRoleSubscriptionEditTier.java

@@ -19,6 +19,7 @@ import com.discord.R;
 import com.discord.app.AppFragment;
 import com.discord.app.AppViewFlipper;
 import com.discord.databinding.WidgetServerSettingsGuildRoleSubscriptionEditTierBinding;
+import com.discord.utilities.error.Error;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.view.recycler.ViewPager2ExtensionsKt;
 import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
@@ -168,14 +169,20 @@ public final class WidgetServerSettingsGuildRoleSubscriptionEditTier extends App
         return (ServerSettingsGuildRoleSubscriptionEditTierViewModel) this.viewModel$delegate.getValue();
     }
 
+    private final void handleError(Error error) {
+        AppFragment.hideKeyboard$default(this, null, 1, null);
+        error.showToasts(requireContext());
+    }
+
     private final void handleEvents(ServerSettingsGuildRoleSubscriptionEditTierViewModel.Event event) {
         if (event instanceof ServerSettingsGuildRoleSubscriptionEditTierViewModel.Event.StoredStateUpdate) {
             getTierViewModel().setTier(((ServerSettingsGuildRoleSubscriptionEditTierViewModel.Event.StoredStateUpdate) event).getGuildRoleSubscriptionTier());
         } else if (event instanceof ServerSettingsGuildRoleSubscriptionEditTierViewModel.Event.SubmitSuccess) {
             AppFragment.hideKeyboard$default(this, null, 1, null);
-        } else if (m.areEqual(event, ServerSettingsGuildRoleSubscriptionEditTierViewModel.Event.SubmitFailure.INSTANCE) || m.areEqual(event, ServerSettingsGuildRoleSubscriptionEditTierViewModel.Event.DeleteFailure.INSTANCE)) {
+        } else if (event instanceof ServerSettingsGuildRoleSubscriptionEditTierViewModel.Event.SubmitFailure) {
-            AppFragment.hideKeyboard$default(this, null, 1, null);
+            handleError(((ServerSettingsGuildRoleSubscriptionEditTierViewModel.Event.SubmitFailure) event).getError());
-            c.a.d.m.i(this, R.string.default_failure_to_perform_action_message, 0, 4);
+        } else if (event instanceof ServerSettingsGuildRoleSubscriptionEditTierViewModel.Event.DeleteFailure) {
+            handleError(((ServerSettingsGuildRoleSubscriptionEditTierViewModel.Event.DeleteFailure) event).getError());
         } else if (m.areEqual(event, ServerSettingsGuildRoleSubscriptionEditTierViewModel.Event.DeleteSuccess.INSTANCE)) {
             AppFragment.hideKeyboard$default(this, null, 1, null);
             requireActivity().finish();

app/src/main/java/com/discord/widgets/settings/WidgetSettings.java

@@ -313,7 +313,7 @@ public final class WidgetSettings extends AppFragment implements OnTabSelectedLi
         TextView textView = binding.f;
         m.checkNotNullExpressionValue(textView, "appInfoHeader");
         String string = getString(R.string.app_information);
-        textView.setText(string + " - 100.4 - Alpha (100204)");
+        textView.setText(string + " - 100.6 - Alpha (100206)");
         binding.A.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$3(this));
         binding.u.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE);
         binding.q.setOnClickListener(WidgetSettings$onViewBound$1$6.INSTANCE);

app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnections.java

@@ -33,6 +33,7 @@ import com.discord.models.domain.ModelConnectedAccountIntegration;
 import com.discord.stores.StoreStream;
 import com.discord.stores.StoreUserConnections;
 import com.discord.stores.StoreUserPresence;
+import com.discord.utilities.drawable.DrawableCompat;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapter;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapterSimple;
 import com.discord.utilities.mg_recycler.MGRecyclerDataPayload;
@@ -164,8 +165,10 @@ public final class WidgetSettingsUserConnections extends AppFragment {
                 m.checkNotNullExpressionValue(id2, "connectedAccount.id");
                 this.binding.a.setOnClickListener(new WidgetSettingsUserConnections$Adapter$ViewHolder$onConfigure$$inlined$apply$lambda$1(from, this, userConnectionItem));
                 ImageView imageView = this.binding.f2426c;
-                Integer platformImage = from.getPlatformImage();
+                View view = this.itemView;
-                imageView.setImageResource(platformImage != null ? platformImage.intValue() : 0);
+                m.checkNotNullExpressionValue(view, "itemView");
+                Integer themedPlatformImage = from.getThemedPlatformImage();
+                imageView.setImageResource(DrawableCompat.getThemedDrawableRes$default(view, themedPlatformImage != null ? themedPlatformImage.intValue() : 0, 0, 2, (Object) null));
                 ImageView imageView2 = this.binding.f2426c;
                 m.checkNotNullExpressionValue(imageView2, "binding.connectedAccountImg");
                 imageView2.setContentDescription(from.name());

app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder$onConfigure$1.java

@@ -20,7 +20,7 @@ public final class WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder$onConfigu
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
         this.this$0.getDialogDismissCallback().mo17invoke();
-        if (this.$data.getPlatform().ordinal() != 0) {
+        if (this.$data.getPlatform().ordinal() != 11) {
             StoreUserConnections userConnections = StoreStream.Companion.getUserConnections();
             String platformId = this.$data.getPlatform().getPlatformId();
             m.checkNotNullExpressionValue(view, "v");

app/src/main/java/com/discord/widgets/settings/connections/WidgetSettingsUserConnectionsAdd.java

@@ -18,6 +18,7 @@ import com.discord.R;
 import com.discord.app.AppBottomSheet;
 import com.discord.databinding.WidgetSettingsConnectionsAddBinding;
 import com.discord.databinding.WidgetSettingsItemAddConnectedAccountBinding;
+import com.discord.utilities.drawable.DrawableCompat;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapter;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapterSimple;
 import com.discord.utilities.mg_recycler.MGRecyclerDataPayload;
@@ -51,7 +52,7 @@ public final class WidgetSettingsUserConnectionsAdd extends AppBottomSheet {
 
                 static {
                     Platform.values();
-                    int[] iArr = new int[18];
+                    int[] iArr = new int[14];
                     $EnumSwitchMapping$0 = iArr;
                     iArr[Platform.XBOX.ordinal()] = 1;
                 }
@@ -90,8 +91,10 @@ public final class WidgetSettingsUserConnectionsAdd extends AppBottomSheet {
                 m.checkNotNullExpressionValue(textView, "binding.addConnectedAccountText");
                 textView.setText(platformItem.getPlatform().getProperName());
                 ImageView imageView = this.binding.b;
-                Integer platformImage = platformItem.getPlatform().getPlatformImage();
+                View view = this.itemView;
-                imageView.setImageResource(platformImage != null ? platformImage.intValue() : 0);
+                m.checkNotNullExpressionValue(view, "itemView");
+                Integer themedPlatformImage = platformItem.getPlatform().getThemedPlatformImage();
+                imageView.setImageResource(DrawableCompat.getThemedDrawableRes$default(view, themedPlatformImage != null ? themedPlatformImage.intValue() : 0, 0, 2, (Object) null));
                 this.itemView.setOnClickListener(new WidgetSettingsUserConnectionsAdd$Adapter$ViewHolder$onConfigure$1(this, platformItem));
             }
         }
@@ -227,7 +230,7 @@ public final class WidgetSettingsUserConnectionsAdd extends AppBottomSheet {
         super.onViewCreated(view, bundle);
         Platform[] values = Platform.values();
         ArrayList<Platform> arrayList = new ArrayList();
-        for (int i = 0; i < 18; i++) {
+        for (int i = 0; i < 14; i++) {
             Platform platform = values[i];
             if (platform.getEnabled()) {
                 arrayList.add(platform);

app/src/main/java/com/discord/widgets/status/WidgetGlobalStatusIndicator.java

@@ -2,6 +2,7 @@ package com.discord.widgets.status;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.text.SpannableStringBuilder;
 import android.view.View;
 import android.widget.ImageView;
@@ -166,18 +167,22 @@ public final class WidgetGlobalStatusIndicator extends AppFragment {
         m.checkNotNullExpressionValue(textView, "binding.indicatorText");
         textView.setText(getString(R.string.connecting));
         AnimatedVectorDrawableCompat animatedVectorDrawableCompat = null;
-        if (this.connectingVector == null) {
+        if (this.connectingVector == null && Build.VERSION.SDK_INT != 28) {
             this.connectingVector = AnimatedVectorDrawableCompat.create(requireContext(), DrawableCompat.getThemedDrawableRes$default(requireContext(), (int) R.attr.ic_network_connecting_animated_vector, 0, 2, (Object) null));
         }
         ImageView imageView = getBinding().h;
         imageView.setVisibility(0);
-        AnimatedVectorDrawableCompat animatedVectorDrawableCompat2 = this.connectingVector;
+        if (Build.VERSION.SDK_INT != 28) {
-        if (animatedVectorDrawableCompat2 != null) {
+            AnimatedVectorDrawableCompat animatedVectorDrawableCompat2 = this.connectingVector;
-            animatedVectorDrawableCompat2.registerAnimationCallback(this.connectingVectorReplayCallback);
+            if (animatedVectorDrawableCompat2 != null) {
-            animatedVectorDrawableCompat2.start();
+                animatedVectorDrawableCompat2.registerAnimationCallback(this.connectingVectorReplayCallback);
-            animatedVectorDrawableCompat = animatedVectorDrawableCompat2;
+                animatedVectorDrawableCompat2.start();
+                animatedVectorDrawableCompat = animatedVectorDrawableCompat2;
+            }
+            imageView.setImageDrawable(animatedVectorDrawableCompat);
+            return;
         }
-        imageView.setImageDrawable(animatedVectorDrawableCompat);
+        imageView.setImageResource(DrawableCompat.getThemedDrawableRes$default(requireContext(), (int) R.attr.ic_network_connecting, 0, 2, (Object) null));
     }
 
     private final void setupContainerClicks(WidgetGlobalStatusIndicatorViewModel.ViewState.CallOngoing callOngoing) {

app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify$autofillCode$2.java

@@ -0,0 +1,29 @@
+package com.discord.widgets.user.phone;
+
+import c0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetUserPhoneVerify.kt */
+public final class WidgetUserPhoneVerify$autofillCode$2 extends o implements Function1<Long, Unit> {
+    public final /* synthetic */ String $verificationCode;
+    public final /* synthetic */ WidgetUserPhoneVerify this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetUserPhoneVerify$autofillCode$2(WidgetUserPhoneVerify widgetUserPhoneVerify, String str) {
+        super(1);
+        this.this$0 = widgetUserPhoneVerify;
+        this.$verificationCode = str;
+    }
+
+    /* Return type fixed from 'java.lang.Object' to match base method */
+    /* JADX DEBUG: Method arguments types fixed to match base method, original types: [java.lang.Object] */
+    @Override // kotlin.jvm.functions.Function1
+    public /* bridge */ /* synthetic */ Unit invoke(Long l) {
+        invoke(l);
+        return Unit.a;
+    }
+
+    public final void invoke(Long l) {
+        WidgetUserPhoneVerify.access$handleCodeEntered(this.this$0, this.$verificationCode);
+    }
+}

app/src/main/java/com/discord/widgets/user/phone/WidgetUserPhoneVerify.java

@@ -29,8 +29,10 @@ import com.discord.widgets.user.account.WidgetUserAccountVerifyBase;
 import java.util.concurrent.TimeUnit;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
+import kotlin.jvm.functions.Function1;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 import kotlin.reflect.KProperty;
+import rx.Observable;
 /* compiled from: WidgetUserPhoneVerify.kt */
 public final class WidgetUserPhoneVerify extends WidgetUserAccountVerifyBase {
     public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.Z(WidgetUserPhoneVerify.class, "binding", "getBinding()Lcom/discord/databinding/WidgetUserPhoneVerifyBinding;", 0)};
@@ -99,12 +101,15 @@ public final class WidgetUserPhoneVerify extends WidgetUserAccountVerifyBase {
     }
 
     private final void autofillCode(String str) {
-        WidgetUserPhoneVerifyBinding binding = getBinding();
+        if (getView() != null) {
-        binding.d.setOnCodeEntered(WidgetUserPhoneVerify$autofillCode$1$1.INSTANCE);
+            WidgetUserPhoneVerifyBinding binding = getBinding();
-        binding.d.setCode(str);
+            binding.d.setOnCodeEntered(WidgetUserPhoneVerify$autofillCode$1$1.INSTANCE);
-        binding.d.setOnCodeEntered(new WidgetUserPhoneVerify$autofillCode$1$2(this));
+            binding.d.setCode(str);
-        Thread.sleep(TimeUnit.SECONDS.toMillis(5));
+            binding.d.setOnCodeEntered(new WidgetUserPhoneVerify$autofillCode$1$2(this));
-        handleCodeEntered(str);
+            Observable<Long> d02 = Observable.d0(500, TimeUnit.MILLISECONDS);
+            m.checkNotNullExpressionValue(d02, "Observable\n        .time…L, TimeUnit.MILLISECONDS)");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(d02, this, null, 2, null), WidgetUserPhoneVerify.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetUserPhoneVerify$autofillCode$2(this, str), 62, (Object) null);
+        }
     }
 
     private final WidgetUserPhoneVerifyBinding getBinding() {
@@ -139,7 +144,7 @@ public final class WidgetUserPhoneVerify extends WidgetUserAccountVerifyBase {
         imageView.setVisibility(isForced() ? 8 : 0);
         binding.b.setOnClickListener(new WidgetUserPhoneVerify$onViewBound$$inlined$with$lambda$1(this));
         if (GrowthTeamFeatures.INSTANCE.isAndroidSmsAutofillEnabled()) {
-            SmsListener.Companion.startSmsListener(requireContext(), new WidgetUserPhoneVerify$onViewBound$2(this));
+            SmsListener.Companion.startSmsListener(new WidgetUserPhoneVerify$onViewBound$2(this));
         }
     }
 }

app/src/main/java/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.java

@@ -21,6 +21,7 @@ import com.discord.models.user.User;
 import com.discord.stores.StoreStream;
 import com.discord.stores.StoreUserConnections;
 import com.discord.utilities.color.ColorCompat;
+import com.discord.utilities.drawable.DrawableCompat;
 import com.discord.utilities.icon.IconUtils;
 import com.discord.utilities.images.MGImages;
 import com.discord.utilities.platform.Platform;
@@ -67,8 +68,8 @@ public final class ViewHolderPlatformRichPresence extends ViewHolderUserRichPres
                 richPresenceImageSmall3.setImageDrawable(drawable);
             }
         }
-        if (platform == Platform.XBOX && platform.getPlatformImage() != null) {
+        if (platform == Platform.XBOX && platform.getThemedPlatformImage() != null) {
-            MGImages.setImage$default(MGImages.INSTANCE, getRichPresenceImageLarge(), platform.getPlatformImage().intValue(), (MGImages.ChangeDetector) null, 4, (Object) null);
+            MGImages.setImage$default(MGImages.INSTANCE, getRichPresenceImageLarge(), DrawableCompat.getThemedDrawableRes$default(getRichPresenceImageLarge(), platform.getThemedPlatformImage().intValue(), 0, 2, (Object) null), (MGImages.ChangeDetector) null, 4, (Object) null);
         } else if (getRichPresenceImageLarge().getVisibility() != 0) {
             if (!(modelRichPresence == null || (primaryApplication = modelRichPresence.getPrimaryApplication()) == null)) {
                 long f = primaryApplication.f();

app/src/main/java/com/discord/widgets/user/profile/UserProfileConnectionsView$ViewHolder$onConfigure$1.java

@@ -10,8 +10,8 @@ import kotlin.jvm.functions.Function3;
 /* compiled from: UserProfileConnectionsView.kt */
 public final class UserProfileConnectionsView$ViewHolder$onConfigure$1 implements View.OnClickListener {
     public final /* synthetic */ Platform $platform;
-    public final /* synthetic */ int $platformImageRes;
     public final /* synthetic */ String $profileUrl;
+    public final /* synthetic */ int $themedPlatformImageRes;
     public final /* synthetic */ String $username;
     public final /* synthetic */ UserProfileConnectionsView.ViewHolder this$0;
 
@@ -19,7 +19,7 @@ public final class UserProfileConnectionsView$ViewHolder$onConfigure$1 implement
         this.this$0 = viewHolder;
         this.$platform = platform;
         this.$username = str;
-        this.$platformImageRes = i;
+        this.$themedPlatformImageRes = i;
         this.$profileUrl = str2;
     }
 
@@ -29,6 +29,6 @@ public final class UserProfileConnectionsView$ViewHolder$onConfigure$1 implement
         Function3<String, Integer, String, Unit> onConnectedAccountClick = UserProfileConnectionsView.ViewHolder.access$getAdapter$p(this.this$0).getOnConnectedAccountClick();
         String str = this.$username;
         m.checkNotNullExpressionValue(str, "username");
-        onConnectedAccountClick.invoke(str, Integer.valueOf(this.$platformImageRes), this.$profileUrl);
+        onConnectedAccountClick.invoke(str, Integer.valueOf(this.$themedPlatformImageRes), this.$profileUrl);
     }
 }

app/src/main/java/com/discord/widgets/user/profile/UserProfileConnectionsView.java

@@ -15,6 +15,7 @@ import c0.z.d.m;
 import com.discord.R;
 import com.discord.databinding.UserProfileConnectionsViewBinding;
 import com.discord.models.domain.ModelConnectedAccount;
+import com.discord.utilities.drawable.DrawableCompat;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapter;
 import com.discord.utilities.mg_recycler.MGRecyclerAdapterSimple;
 import com.discord.utilities.mg_recycler.MGRecyclerDataPayload;
@@ -149,15 +150,17 @@ public final class UserProfileConnectionsView extends LinearLayout {
             ModelConnectedAccount connectedAccount = connectedAccountItem.getConnectedAccount();
             String username = connectedAccount.getUsername();
             Platform from = Platform.Companion.from(connectedAccount);
-            Integer platformImage = from.getPlatformImage();
+            Integer themedPlatformImage = from.getThemedPlatformImage();
-            int intValue = platformImage != null ? platformImage.intValue() : 0;
+            int intValue = themedPlatformImage != null ? themedPlatformImage.intValue() : 0;
             String profileUrl = from.getProfileUrl(connectedAccount);
-            ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(this.listItemTextView, intValue, 0, 0, 0, 14, null);
-            this.listItemTextView.setText(connectedAccount.getUsername());
             TextView textView = this.listItemTextView;
+            Integer themedPlatformImage2 = from.getThemedPlatformImage();
+            ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView, DrawableCompat.getThemedDrawableRes$default(textView, themedPlatformImage2 != null ? themedPlatformImage2.intValue() : 0, 0, 2, (Object) null), 0, 0, 0, 14, null);
+            this.listItemTextView.setText(connectedAccount.getUsername());
+            TextView textView2 = this.listItemTextView;
             String format = String.format("%s, %s", Arrays.copyOf(new Object[]{connectedAccount.getType(), connectedAccount.getUsername()}, 2));
             m.checkNotNullExpressionValue(format, "java.lang.String.format(format, *args)");
-            textView.setContentDescription(format);
+            textView2.setContentDescription(format);
             this.itemView.setOnClickListener(new UserProfileConnectionsView$ViewHolder$onConfigure$1(this, from, username, intValue, profileUrl));
         }
     }

app/src/main/java/com/discord/widgets/user/usersheet/WidgetUserSheet$configureConnectionsSection$onConnectedAccountClick$1.java

@@ -37,7 +37,7 @@ public final class WidgetUserSheet$configureConnectionsSection$onConnectedAccoun
         i iVar = new i();
         Bundle bundle = new Bundle();
         bundle.putString("ARG_USERNAME", str);
-        bundle.putInt("ARG_PLATFORM_IMAGE_RES", i);
+        bundle.putInt("ARG_THEMED_PLATFORM_IMAGE_RES", i);
         bundle.putString("ARG_PROFILE_URL", str2);
         iVar.setArguments(bundle);
         iVar.show(parentFragmentManager, i.class.getName());

app/src/main/res/color/guild_role_subscription_price_tier_text_color.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="false" android:color="?attr/colorTextMuted"/>
+    <item android:color="?attr/colorInteractiveActive"/>
+</selector>

app/src/main/res/drawable-anydpi-v24/ic_account_bnet.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="80" android:viewportHeight="80">
-    <path android:fillColor="#009ae5" android:pathData="M67.18,35.9C78.26,35.78 70.09,26.39 64.98,24C65,24 71.73,8.31 71,7.9C70.94,7.81 63,23.3 63,23.3C58.98,21.73 54.77,20.69 50.48,20.21C45.32,10 39.91,4.84 35.77,5.57C31.42,6.33 29,9.36 28.6,17C22.02,9.91 18.43,19.62 19.29,25.54C14.27,25.92 9.47,27.78 5.5,30.88C5.5,30.88 14.87,27.29 19.5,27.5C19.76,31.97 20.92,36.34 22.9,40.36C14.67,52.36 11.59,69.2 31.48,60.51C28.57,68.06 35.21,68.18 43.15,64.21L52.72,75.5L45.05,62.9C48.72,60.23 51.87,56.91 54.34,53.1C77.05,54.67 81.73,46.28 67.18,35.92L67.18,35.9ZM46.34,20C41.98,20.08 37.7,21.16 33.82,23.15C34.21,11.63 40,9.07 46.34,20ZM28.63,25.52L23.28,25.37C22.49,21.43 25.28,17.12 28.36,19.74C27.77,20.85 28.42,24.41 28.62,25.51L28.63,25.52ZM24.9,43.72C30.39,52.64 32.3,53.11 32.3,53.11C22.54,57.28 19.58,53.49 24.9,43.72L24.9,43.72ZM38.36,55.82L41.27,60.72C34.51,64.07 30.19,60.55 38.36,55.82ZM43.18,59.47C42.47,57.92 42.06,57.08 41.45,55.62C43.45,54.69 47.59,53.11 47.59,53.11C47.59,53.11 42.71,53.55 41.54,53.69C46.12,50.42 56.91,37.39 56.91,37.39L53.91,35.84C48.33,42.02 42.8,47.45 35.37,51.84C25.6,41.18 24.45,35.52 23.25,27.64C23.25,27.64 26.89,27.93 28.3,28.11C27.77,30.51 27.4,32.95 27.18,35.4C27.18,35.4 27.91,31.17 29.71,29.4C31.12,36.57 35.88,50.4 35.88,50.4L38.67,48.4C36.44,40.4 34.17,32.77 34,24.46C44.28,20.67 53.6,23.26 60.89,26.56C59.89,27.84 58.04,30.26 58.04,30.26C58.04,30.26 54.93,26.73 52.22,25.51C53.94,27.15 55.46,29 56.75,31C49.61,28.73 35.12,26.1 35.12,26.1L35.21,29.22C43.35,30.76 51.22,33.48 58.57,37.3C55.25,47.65 51.25,54.71 43.17,59.43L43.18,59.47ZM55.87,50.34C58.06,46.63 59.51,42.53 60.16,38.27C68.03,44.13 70.16,49.73 55.87,50.34ZM65.16,34.74L60,32.49C60,32.49 62.06,29.34 63.09,27.82C68.76,32.19 67.47,34.21 65.15,34.76L65.16,34.74Z" android:fillType="nonZero"/>
-</vector>

app/src/main/res/drawable-anydpi-v24/ic_account_facebook.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="80" android:viewportHeight="80">
-    <path android:fillColor="#ffffff" android:pathData="M52.7,72.45L52.7,47.65L61,47.65L62.2,38L52.6,38L52.6,31.8C52.6,29 53.4,27.1 57.4,27.1L62.5,27.1L62.5,18.5C60.01,18.24 57.51,18.11 55,18.1C47.6,18.1 42.6,22.6 42.6,30.9L42.6,38L34.3,38L34.3,47.7L42.7,47.7L42.7,72.5L52.7,72.5" android:fillType="nonZero"/>
-    <path android:fillColor="#2d3283" android:pathData="M68.9,8.55L12,8.55C11.07,8.54 10.18,8.91 9.52,9.57C8.86,10.23 8.49,11.12 8.5,12.05L8.5,69C8.49,69.93 8.86,70.82 9.52,71.48C10.18,72.14 11.07,72.51 12,72.5L42.7,72.5L42.7,47.65L34.3,47.65L34.3,38L42.6,38L42.6,30.9C42.6,22.6 47.6,18.1 55,18.1C57.51,18.11 60.01,18.24 62.5,18.5L62.5,27.1L57.4,27.1C53.4,27.1 52.6,29 52.6,31.8L52.6,38L62.2,38L61,47.65L52.7,47.65L52.7,72.45L69,72.45C70.92,72.46 72.48,70.92 72.5,69L72.5,12.05C72.5,11.1 72.12,10.2 71.44,9.54C70.76,8.88 69.85,8.52 68.9,8.55L68.9,8.55Z" android:fillType="nonZero"/>
-</vector>

app/src/main/res/drawable-anydpi-v24/ic_account_github.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="255" android:viewportHeight="255">
-    <path android:fillColor="#ffffff" android:pathData="M127.5,127.5m-96.5,0a96.5,96.5 0,1 1,193 0a96.5,96.5 0,1 1,-193 0"/>
-    <path android:fillColor="#191717" android:pathData="M127.254,47C82.942,47 47,82.79 47,126.914C47,162.213 70.141,192.119 101.651,202.905C105.59,203.396 107.067,200.944 107.067,198.983C107.067,197.022 107.067,192.119 107.067,185.256C84.911,190.158 79.988,174.47 79.988,174.47C76.541,165.155 71.125,162.703 71.125,162.703C63.74,157.801 71.618,157.801 71.618,157.801C79.495,158.291 83.927,166.135 83.927,166.135C91.312,178.392 102.636,174.96 107.067,172.999C107.56,167.606 110.021,164.174 111.991,162.213C94.266,160.252 75.557,153.388 75.557,122.501C75.557,113.676 78.511,106.813 83.927,100.93C83.434,99.459 80.48,91.124 84.911,80.338C84.911,80.338 91.804,78.377 107.067,88.673C113.468,86.712 120.361,86.221 127.254,86.221C134.147,86.221 141.04,87.202 147.44,88.673C162.703,78.377 169.596,80.338 169.596,80.338C174.028,91.124 171.073,99.459 170.581,101.42C175.505,106.813 178.951,114.167 178.951,122.992C178.951,153.878 160.242,160.252 142.517,162.213C145.471,164.664 147.933,169.567 147.933,176.921C147.933,187.707 147.933,196.042 147.933,198.983C147.933,200.944 149.41,203.396 153.349,202.905C185.352,192.119 208,162.213 208,126.914C207.508,82.79 171.566,47 127.254,47Z" android:fillType="evenOdd"/>
-</vector>

app/src/main/res/drawable-anydpi-v24/ic_account_github_light_24dp.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="#000000" android:pathData="M12.0001,2C9.6237,1.9976 7.3241,2.8415 5.5135,4.3806C3.7028,5.9196 2.4994,8.0532 2.1189,10.3989C1.7384,12.7446 2.2057,15.1491 3.4371,17.1816C4.6684,19.2141 6.5833,20.7416 8.8386,21.4905C9.342,21.5826 9.52,21.2695 9.52,21.0055V19.3051C6.7269,19.9128 6.1376,17.9607 6.1376,17.9607C5.9523,17.3557 5.5586,16.8359 5.0265,16.4936C4.1241,15.8797 5.1001,15.8797 5.1001,15.8797C5.4164,15.9244 5.7185,16.0404 5.9833,16.2191C6.2481,16.3978 6.4688,16.6344 6.6287,16.911C6.7645,17.1573 6.9476,17.3743 7.1675,17.5497C7.3874,17.725 7.6398,17.8552 7.9102,17.9328C8.1805,18.0103 8.4635,18.0337 8.7429,18.0017C9.0223,17.9696 9.2927,17.8827 9.5384,17.7459C9.577,17.2409 9.7947,16.7662 10.1523,16.4076C7.9301,16.1559 5.5974,15.2965 5.5974,11.4966C5.5821,10.504 5.9492,9.5435 6.6225,8.814C6.3226,7.9509 6.3577,7.0067 6.7207,6.1682C6.7207,6.1682 7.5617,5.8981 9.4709,7.1934C11.1103,6.7433 12.8407,6.7433 14.4801,7.1934C16.3892,5.8981 17.2241,6.1682 17.2241,6.1682C17.5922,6.9978 17.6361,7.9353 17.3469,8.7956C18.0203,9.5251 18.3873,10.4856 18.3721,11.4782C18.3721,15.3211 16.0332,16.1621 13.8048,16.3892C14.0438,16.6294 14.2283,16.9181 14.3459,17.2359C14.4634,17.5536 14.5113,17.8929 14.4862,18.2308V20.9748C14.4862,21.3002 14.6643,21.5519 15.1738,21.4537C17.4034,20.685 19.2896,19.1531 20.4992,17.1286C21.7088,15.104 22.164,12.7171 21.7842,10.3895C21.4045,8.0619 20.2143,5.9434 18.424,4.4082C16.6336,2.8731 14.3583,2.0201 12.0001,2Z" android:fillType="evenOdd"/>
+</vector>

app/src/main/res/drawable-anydpi-v24/ic_account_github_white_24dp.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="#ffffff" android:pathData="M12.0001,2C9.6237,1.9976 7.3241,2.8415 5.5135,4.3806C3.7028,5.9196 2.4994,8.0532 2.1189,10.3989C1.7384,12.7446 2.2057,15.1491 3.4371,17.1816C4.6684,19.2141 6.5833,20.7416 8.8386,21.4905C9.342,21.5826 9.52,21.2695 9.52,21.0055V19.3051C6.7269,19.9128 6.1376,17.9607 6.1376,17.9607C5.9523,17.3557 5.5586,16.8359 5.0265,16.4936C4.1241,15.8797 5.1001,15.8797 5.1001,15.8797C5.4164,15.9244 5.7185,16.0404 5.9833,16.2191C6.2481,16.3978 6.4688,16.6344 6.6287,16.911C6.7645,17.1573 6.9476,17.3743 7.1675,17.5497C7.3874,17.725 7.6398,17.8552 7.9102,17.9328C8.1805,18.0103 8.4635,18.0337 8.7429,18.0017C9.0223,17.9696 9.2927,17.8827 9.5384,17.7459C9.577,17.2409 9.7947,16.7662 10.1523,16.4076C7.9301,16.1559 5.5974,15.2965 5.5974,11.4966C5.5821,10.504 5.9492,9.5435 6.6225,8.814C6.3226,7.9509 6.3577,7.0067 6.7207,6.1682C6.7207,6.1682 7.5617,5.8981 9.4709,7.1934C11.1103,6.7433 12.8407,6.7433 14.4801,7.1934C16.3892,5.8981 17.2241,6.1682 17.2241,6.1682C17.5922,6.9978 17.6361,7.9353 17.3469,8.7956C18.0203,9.5251 18.3873,10.4856 18.3721,11.4782C18.3721,15.3211 16.0332,16.1621 13.8048,16.3892C14.0438,16.6294 14.2283,16.9181 14.3459,17.2359C14.4634,17.5536 14.5113,17.8929 14.4862,18.2308V20.9748C14.4862,21.3002 14.6643,21.5519 15.1738,21.4537C17.4034,20.685 19.2896,19.1531 20.4992,17.1286C21.7088,15.104 22.164,12.7171 21.7842,10.3895C21.4045,8.0619 20.2143,5.9434 18.424,4.4082C16.6336,2.8731 14.3583,2.0201 12.0001,2Z" android:fillType="evenOdd"/>
+</vector>

app/src/main/res/drawable-anydpi-v24/ic_account_lol.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="80" android:viewportHeight="80">
-    <path android:fillColor="#cea146" android:pathData="M36.7,8.5L36.7,63.5L68.8,63.5L61.6,72.5L18.2,72.5L23.4,63.4L23.4,14.8L18.6,8.5L36.7,8.5ZM40.6,20.5C53.08,20.66 63.11,30.82 63.1,43.3C63.13,49.45 60.64,55.34 56.2,59.6L63,59.6C69.05,51.1 69.89,39.96 65.19,30.64C60.49,21.33 51.03,15.39 40.6,15.2L40.5,15.2L40.5,20.5L40.6,20.5ZM19.5,52.9C18.09,49.9 17.37,46.62 17.4,43.3C17.42,39.99 18.13,36.72 19.5,33.7L19.5,24.4C9.77,35.08 9.77,51.42 19.5,62.1L19.5,52.9Z" android:fillType="nonZero"/>
-</vector>

app/src/main/res/drawable-anydpi-v24/ic_account_obs.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="80" android:viewportHeight="80">
-    <path android:fillColor="#ffffff" android:pathData="M53,30.17C50,35.46 44.01,38.29 38.01,37.26C32.02,36.23 27.32,31.56 26.26,25.57C25.47,21.15 26.76,16.62 29.76,13.28C30.54,12.47 31.37,11.71 32.24,11C27.67,13.49 24.39,17.82 23.24,22.89C22.4,26.89 22.96,31.06 24.84,34.69C25.94,34.79 27.14,34.89 28.24,35.09C31.82,35.8 34.99,37.88 37.06,40.89C39.68,44.62 40.39,49.37 38.97,53.7C37.55,58.03 34.17,61.44 29.85,62.89C26.79,63.89 23.49,63.89 20.43,62.89C23.85,64.45 27.65,64.94 31.35,64.29C36.23,63.39 40.48,60.43 43,56.16C41.25,52.73 40.86,48.77 41.9,45.07C43.15,40.88 46.24,37.49 50.28,35.84C54.33,34.19 58.9,34.46 62.73,36.57C66.21,38.52 68.74,41.81 69.73,45.67C69.52,42.79 68.52,40.02 66.83,37.67C63.63,33.16 58.52,30.39 53,30.17Z" android:fillType="nonZero"/>
-    <path android:fillColor="#302e31" android:pathData="M35.44,8.88C41.96,7.87 48.64,8.89 54.57,11.78C61.52,15.16 67.01,20.95 70,28.07C73.07,35.45 73.32,43.71 70.7,51.26C67.93,58.81 62.47,65.08 55.37,68.86C45.38,74.1 33.36,73.7 23.75,67.79C14.13,61.89 8.34,51.35 8.5,40.07C8.58,31.83 11.85,23.95 17.62,18.07C22.45,13.22 28.68,10 35.44,8.88L35.44,8.88ZM23.23,22.88C22.39,26.88 22.95,31.05 24.83,34.68C25.93,34.78 27.13,34.88 28.23,35.08C31.81,35.79 34.98,37.87 37.05,40.88C39.67,44.61 40.38,49.36 38.96,53.69C37.54,58.02 34.16,61.43 29.84,62.88C26.78,63.88 23.48,63.88 20.42,62.88C23.84,64.44 27.64,64.93 31.34,64.28C36.22,63.39 40.47,60.43 43,56.16C41.25,52.73 40.86,48.77 41.9,45.07C43.15,40.88 46.24,37.49 50.28,35.84C54.33,34.19 58.9,34.46 62.73,36.57C66.21,38.52 68.74,41.81 69.73,45.67C69.52,42.79 68.52,40.02 66.83,37.67C63.63,33.16 58.52,30.39 53,30.17C50,35.46 44.01,38.3 38.01,37.26C32.02,36.23 27.32,31.56 26.26,25.57C25.47,21.15 26.76,16.62 29.76,13.28C30.54,12.47 31.37,11.71 32.24,11C27.67,13.48 24.39,17.8 23.23,22.87L23.23,22.88Z" android:fillType="nonZero"/>
-</vector>

app/src/main/res/drawable-anydpi-v24/ic_account_patreon.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="80" android:viewportHeight="80">
-    <path android:fillColor="#f96854" android:pathData="M49,11.75C37.1,11.72 27.43,21.35 27.4,33.25C27.37,45.15 37,54.82 48.9,54.85C60.8,54.88 70.47,45.25 70.5,33.35C70.48,21.47 60.88,11.83 49,11.75" android:fillType="nonZero"/>
-    <path android:fillColor="#052d49" android:pathData="M10.5,69.25l10.5,0l0,-57.5l-10.5,0z" android:fillType="nonZero"/>
-</vector>

app/src/main/res/drawable-anydpi-v24/ic_account_reddit.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="80" android:viewportHeight="80">
-    <path android:fillColor="#ffffff" android:pathData="M61.8,40.8C61.71,38.24 59.56,36.23 57,36.3C55.84,36.34 54.74,36.8 53.9,37.6C50.27,35.12 45.99,33.77 41.6,33.7L43.7,23.7L50.5,25.1C50.66,26.67 51.94,27.89 53.51,27.97C55.09,28.06 56.49,26.98 56.82,25.44C57.14,23.89 56.29,22.34 54.82,21.79C53.34,21.23 51.68,21.83 50.9,23.2L43.1,21.6C42.83,21.54 42.56,21.59 42.33,21.74C42.1,21.9 41.95,22.13 41.9,22.4L41.9,22.4L39.5,33.5C35.04,33.57 30.7,34.92 27,37.4C25.79,36.22 24.04,35.78 22.42,36.25C20.79,36.73 19.56,38.05 19.18,39.69C18.8,41.34 19.35,43.07 20.6,44.2C21,44.52 21.43,44.79 21.9,45L21.9,46.4C21.9,53.6 30.3,59.4 40.6,59.4C50.9,59.4 59.3,53.6 59.3,46.4L59.3,45C60.84,44.17 61.8,42.55 61.8,40.8Z" android:fillType="nonZero"/>
-    <path android:fillColor="#ff4500" android:pathData="M40.5,8.5C58.17,8.5 72.5,22.83 72.5,40.5C72.5,58.17 58.17,72.5 40.5,72.5C22.83,72.5 8.5,58.17 8.5,40.5C8.5,22.83 22.83,8.5 40.5,8.5ZM61.8,40.8C61.71,38.24 59.56,36.23 57,36.3C55.84,36.34 54.74,36.8 53.9,37.6C50.27,35.12 45.99,33.77 41.6,33.7L43.7,23.7L50.5,25.1C50.66,26.67 51.94,27.89 53.51,27.97C55.09,28.06 56.49,26.98 56.82,25.44C57.14,23.89 56.29,22.34 54.82,21.79C53.34,21.23 51.68,21.83 50.9,23.2L43.1,21.6C42.83,21.54 42.56,21.59 42.33,21.74C42.1,21.9 41.95,22.13 41.9,22.4L41.9,22.4L39.5,33.5C35.04,33.57 30.7,34.92 27,37.4C25.79,36.22 24.04,35.78 22.42,36.25C20.79,36.73 19.56,38.05 19.18,39.69C18.8,41.34 19.35,43.07 20.6,44.2C21,44.52 21.43,44.79 21.9,45L21.9,46.4C21.9,53.6 30.3,59.4 40.6,59.4C50.9,59.4 59.3,53.6 59.3,46.4L59.3,45C60.84,44.17 61.8,42.55 61.8,40.8ZM29.8,44C29.8,42.23 31.23,40.8 33,40.8C34.77,40.8 36.2,42.23 36.2,44C36.2,45.77 34.77,47.2 33,47.2C32.15,47.21 31.33,46.88 30.73,46.27C30.12,45.67 29.79,44.85 29.8,44L29.8,44ZM48.4,52.9C46.13,54.58 43.32,55.4 40.5,55.2C37.66,55.28 34.88,54.4 32.6,52.7C32.33,52.33 32.37,51.82 32.7,51.5C33,51.2 33.5,51.2 33.8,51.5C35.74,52.9 38.1,53.61 40.5,53.5C42.88,53.58 45.22,52.92 47.2,51.6C47.57,51.28 48.13,51.28 48.5,51.6C48.9,51.9 48.7,52.6 48.4,52.9L48.4,52.9L48.4,52.9ZM44.6,44C44.6,42.23 46.03,40.8 47.8,40.8C49.57,40.8 51,42.23 51,44C51,45.77 49.57,47.2 47.8,47.2C46.95,47.21 46.13,46.88 45.53,46.27C44.92,45.67 44.59,44.85 44.6,44L44.6,44Z" android:fillType="nonZero"/>
-</vector>

app/src/main/res/drawable-anydpi-v24/ic_account_skype.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="80" android:viewportHeight="80">
-    <path android:fillColor="#ffffff" android:pathData="M40.61,59.8C30.01,59.8 25.11,54.4 25.11,50.4C25.11,49.45 25.51,48.54 26.21,47.9C26.92,47.25 27.86,46.93 28.81,47C33.41,47 32.21,53.8 40.71,53.8C45.01,53.8 47.61,51.2 47.61,48.7C47.61,47.2 46.81,45.5 43.91,44.9L34.41,42.5C26.81,40.6 25.51,36.3 25.51,32.4C25.51,24.2 33.01,21.3 40.11,21.3C46.61,21.3 54.41,24.9 54.41,29.8C54.41,31.9 52.61,33 50.61,33C46.71,33 47.41,27.5 39.51,27.5C35.61,27.5 33.61,29.3 33.61,31.9C33.61,34.5 36.61,35.3 39.31,35.9L46.31,37.5C54,39.2 56,43.7 56,48C55.8,54.6 50.7,59.8 40.6,59.8" android:fillType="nonZero"/>
-    <path android:fillColor="#0078d7" android:pathData="M40.61,59.8C30.01,59.8 25.11,54.4 25.11,50.4C25.11,49.45 25.51,48.54 26.21,47.9C26.92,47.25 27.86,46.93 28.81,47C33.41,47 32.21,53.8 40.71,53.8C45.01,53.8 47.61,51.2 47.61,48.7C47.61,47.2 46.81,45.5 43.91,44.9L34.41,42.5C26.81,40.6 25.51,36.3 25.51,32.4C25.51,24.2 33.01,21.3 40.11,21.3C46.61,21.3 54.41,24.9 54.41,29.8C54.41,31.9 52.61,33 50.61,33C46.71,33 47.41,27.5 39.51,27.5C35.61,27.5 33.61,29.3 33.61,31.9C33.61,34.5 36.61,35.3 39.31,35.9L46.31,37.5C54,39.2 56,43.7 56,48C55.8,54.6 50.7,59.8 40.6,59.8M69.9,45.7C70.22,43.95 70.39,42.18 70.4,40.4C70.45,31.53 66.56,23.1 59.78,17.38C53,11.67 44.03,9.25 35.3,10.8C32.63,9.25 29.59,8.45 26.5,8.5C20.12,8.49 14.23,11.94 11.1,17.5C7.93,23 7.89,29.76 11,35.3C9.25,44.95 12.33,54.85 19.24,61.8C26.16,68.76 36.04,71.89 45.7,70.2C48.37,71.75 51.41,72.55 54.5,72.5C60.86,72.45 66.72,69.03 69.89,63.52C73.06,58 73.06,51.22 69.9,45.7" android:fillType="nonZero"/>
-</vector>

app/src/main/res/drawable-anydpi-v24/ic_account_spotify.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="80" android:viewportHeight="80">
-    <path android:fillColor="#1ed760" android:pathData="M40.5,8.5C22.83,8.5 8.5,22.83 8.5,40.5C8.5,58.17 22.83,72.5 40.5,72.5C58.17,72.5 72.5,58.17 72.5,40.5C72.5,32.01 69.13,23.87 63.13,17.87C57.13,11.87 48.99,8.5 40.5,8.5ZM55.1,54.7C54.51,55.59 53.35,55.89 52.4,55.4C44.9,50.8 35.4,49.8 24.3,52.3C23.6,52.46 22.87,52.24 22.39,51.71C21.9,51.19 21.73,50.45 21.94,49.76C22.15,49.08 22.7,48.56 23.4,48.4C35.6,45.6 46,46.8 54.5,52C54.95,52.27 55.27,52.71 55.38,53.22C55.49,53.73 55.39,54.27 55.1,54.7L55.1,54.7ZM59.1,45.9C58.76,46.46 58.21,46.86 57.57,47.01C56.93,47.16 56.26,47.05 55.7,46.7C47.1,41.4 34,39.9 23.8,43C22.94,43.25 22.02,43.02 21.37,42.41C20.73,41.79 20.46,40.87 20.67,40.01C20.88,39.14 21.54,38.45 22.4,38.2C34,34.7 48.5,36.4 58.3,42.5C59.42,43.24 59.77,44.73 59.1,45.9L59.1,45.9ZM59.4,36.9C49.1,30.8 32.1,30.2 22.2,33.2C20.71,33.44 19.28,32.54 18.85,31.09C18.42,29.65 19.13,28.12 20.5,27.5C31.8,24.1 50.6,24.7 62.5,31.8C63.19,32.2 63.68,32.87 63.87,33.64C64.06,34.41 63.92,35.23 63.5,35.9C62.6,37.24 60.82,37.68 59.4,36.9L59.4,36.9Z" android:fillType="nonZero"/>
-</vector>

app/src/main/res/drawable-anydpi-v24/ic_account_steam.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="80" android:viewportHeight="80">
-    <path android:fillColor="#ffffff" android:pathData="M30.73,61.6C35.75,61.59 39.83,57.52 39.85,52.5L39.85,52.1L50.77,44.3L51.07,44.3C55.97,44.31 60.39,41.37 62.27,36.85C64.15,32.33 63.12,27.12 59.67,23.65C56.21,20.19 51,19.15 46.48,21.02C41.95,22.89 39,27.3 39,32.2L39,32.4L31.34,43.5L30.83,43.5C29.01,43.49 27.22,44.05 25.73,45.1L8.51,38C8.43,38.91 8.38,39.82 8.38,40.75C8.38,43.61 8.77,46.46 9.55,49.22L21.82,54.3C22.69,58.54 26.41,61.58 30.73,61.6L30.73,61.6ZM50.87,24.3C53.02,24.25 55.09,25.07 56.62,26.58C58.15,28.09 59,30.15 58.98,32.3C59.03,35.6 57.08,38.59 54.05,39.89C51.02,41.18 47.5,40.52 45.16,38.2C42.81,35.89 42.1,32.38 43.35,29.33C44.6,26.29 47.57,24.3 50.87,24.3ZM28.53,57.1C31.13,58.08 34.03,56.84 35.14,54.3C35.66,53.08 35.67,51.7 35.16,50.48C34.65,49.26 33.67,48.29 32.44,47.8L28.33,46.1C31.77,44.85 35.59,46.52 37,49.9C37.71,51.56 37.71,53.44 37,55.1C36.31,56.77 34.98,58.1 33.31,58.8C31.64,59.49 29.76,59.49 28.09,58.8C26.53,58.21 25.27,57.02 24.59,55.5L28.53,57.1ZM51.07,38.2C47.7,38.2 44.96,35.51 44.96,32.2C44.96,28.89 47.7,26.2 51.07,26.2C54.44,26.2 57.18,28.89 57.18,32.2C57.18,35.51 54.44,38.2 51.07,38.2Z" android:fillType="nonZero"/>
-    <path android:fillColor="#000000" android:pathData="M40.35,8.5C56.88,8.53 70.67,21.14 72.16,37.6C73.66,54.07 62.37,68.96 46.12,71.97C29.86,74.97 13.99,65.11 9.5,49.2L21.82,54.3C22.82,58.8 27.03,61.84 31.62,61.38C36.21,60.92 39.73,57.11 39.82,52.5L39.82,52.1L50.74,44.3L51.04,44.3C55.94,44.32 60.37,41.39 62.26,36.87C64.15,32.35 63.13,27.14 59.68,23.67C56.22,20.19 51.01,19.15 46.48,21.02C41.95,22.88 39,27.3 39,32.2L39,32.4L31.34,43.5L30.83,43.5C29.01,43.49 27.22,44.05 25.73,45.1L8.5,38C9.76,21.34 23.65,8.48 40.35,8.5M28.53,57.1L24.63,55.5C25.31,57.02 26.57,58.21 28.13,58.8C31.6,60.21 35.56,58.56 37,55.1C37.71,53.44 37.71,51.56 37,49.9C35.59,46.5 31.74,44.83 28.29,46.1L32.4,47.8C33.63,48.29 34.61,49.26 35.12,50.48C35.63,51.7 35.62,53.08 35.1,54.3C33.99,56.84 31.09,58.08 28.49,57.1M45,32.2C45,33.81 45.65,35.35 46.8,36.48C47.95,37.61 49.5,38.23 51.11,38.2C54.44,38.2 57.16,35.53 57.22,32.2C57.22,28.83 54.48,26.09 51.11,26.09C47.74,26.09 45,28.83 45,32.2M59,32.3C59.05,35.6 57.1,38.59 54.07,39.89C51.04,41.18 47.52,40.52 45.18,38.2C42.83,35.89 42.12,32.38 43.37,29.33C44.62,26.29 47.59,24.3 50.89,24.3C53.04,24.25 55.11,25.07 56.64,26.58C58.17,28.09 59.02,30.15 59,32.3" android:fillType="nonZero"/>
-</vector>

app/src/main/res/drawable-anydpi-v24/ic_account_twitch.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="80" android:viewportHeight="80">
-    <path android:fillColor="#ffffff" android:pathData="M64.35,44.8l-9.6,9.6l-15.3,0l-8.1,8.1l0,-8.1l-12.9,0l0,-40.2l45.9,0z" android:fillType="nonZero"/>
-    <path android:fillColor="#9146ff" android:pathData="M13.25,8.5L9,19.5L9,64.4L24.3,64.4L24.3,72.5L32.9,72.5L41,64.4L53.4,64.4L70.1,47.7L70.1,8.5L13.25,8.5ZM64.35,44.8L54.75,54.4L39.45,54.4L31.35,62.5L31.35,54.4L18.45,54.4L18.45,14.2L64.35,14.2L64.35,44.8ZM54.85,25.2L54.85,41.9L49.15,41.9L49.15,25.2L54.85,25.2ZM39.55,25.2L39.55,41.9L33.85,41.9L33.85,25.2L39.55,25.2Z" android:fillType="nonZero"/>
-</vector>

app/src/main/res/drawable-anydpi-v24/ic_account_twitter.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="80" android:viewportHeight="80">
-    <path android:fillColor="#1da1f2" android:pathData="M28.45,66.52C52.65,66.52 65.85,46.52 65.85,29.12L65.85,27.42C68.42,25.54 70.65,23.24 72.45,20.62C70.08,21.71 67.55,22.42 64.95,22.72C67.71,21.07 69.77,18.48 70.75,15.42C68.17,16.92 65.37,18 62.45,18.62C57.46,13.36 49.17,13.09 43.85,18.02C40.43,21.2 38.98,25.97 40.05,30.52C29.5,30 19.66,25.02 13,16.82C9.5,22.82 11.3,30.5 17.1,34.32C15.01,34.24 12.96,33.69 11.1,32.72L11.1,32.92C11.1,39.17 15.48,44.55 21.6,45.82C19.67,46.34 17.66,46.4 15.7,46.02C17.43,51.38 22.37,55.04 28,55.12C23.36,58.79 17.61,60.76 11.7,60.72C10.7,60.72 9.6,60.62 8.6,60.52C14.49,64.46 21.42,66.55 28.5,66.52" android:fillType="nonZero"/>
-</vector>

app/src/main/res/drawable-anydpi-v24/ic_account_xbox.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="80" android:viewportHeight="80">
-    <group android:pivotX="18" android:pivotY="18" android:scaleX="0.5" android:scaleY="0.5">
-        <path android:fillColor="#5dc21e" android:pathData="M0,64a64,63 0,1 0,128 0a64,63 0,1 0,-128 0z" android:fillType="evenOdd"/>
-        <path android:fillColor="#ffffff" android:pathData="M19.101,18.403L19.05,18.455C6.838,30.484 -0.026,46.882 0,64C-0.026,78.008 4.576,91.631 13.085,102.76C13.163,102.863 13.317,102.94 13.42,102.863C13.522,102.786 13.548,102.657 13.497,102.529C8.612,87.441 33.549,50.866 46.454,35.547C46.506,35.496 46.557,35.444 46.557,35.367C46.557,35.29 46.506,35.213 46.429,35.161C24.757,13.597 18.947,18.532 19.05,18.455M108.925,18.403L108.976,18.455C121.187,30.458 128.026,46.882 128,64C128.026,78.008 123.424,91.631 114.915,102.76C114.837,102.863 114.683,102.94 114.58,102.863C114.478,102.786 114.478,102.657 114.503,102.529C119.388,87.441 94.451,50.84 81.571,35.521C81.52,35.47 81.469,35.418 81.469,35.341C81.469,35.239 81.52,35.187 81.597,35.136C103.295,13.571 109.027,18.532 108.95,18.455M97.356,9.356C97.485,9.407 97.51,9.561 97.459,9.664C97.407,9.767 97.279,9.793 97.15,9.767C84.759,7.094 65.915,17.786 64.141,18.866C64.09,18.892 64.064,18.917 64.013,18.917C63.961,18.917 63.91,18.892 63.884,18.866C59.154,16.141 41.75,7.017 30.772,9.844C30.644,9.87 30.515,9.844 30.464,9.741C30.413,9.613 30.464,9.484 30.567,9.433C40.362,3.547 51.133,0 64.013,0C76.918,0 87.561,3.547 97.356,9.356ZM64.013,51.329C64.09,51.329 64.167,51.38 64.219,51.431C83.371,66.005 116.149,101.989 106.148,112.167L106.174,112.141L106.174,112.167L106.148,112.167C94.477,122.397 79.515,128.026 64.013,128C48.511,128.026 33.523,122.397 21.878,112.167L21.852,112.141L21.878,112.167C11.877,101.989 44.655,65.979 63.807,51.431C63.833,51.38 63.936,51.329 64.013,51.329" android:fillType="nonZero"/>
-    </group>
-</vector>

app/src/main/res/drawable-anydpi-v24/ic_account_xsplit.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="80" android:viewportHeight="80">
-    <path android:fillColor="#ffffff" android:pathData="M8.5,11.93L8.5,52.93L55.38,58.71L54.15,69.07L64.92,59.74L72.5,60.61L72.5,19.18L8.5,11.93ZM65.5,53.43L14.84,47.43L14.84,19.06L65.5,25L65.5,53.43Z" android:fillType="nonZero"/>
-</vector>

app/src/main/res/drawable-anydpi-v24/ic_account_youtube_light_and_dark_24dp.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
+    <path android:fillColor="#d9252a" android:pathData="M21.582,7.2003C21.352,6.3342 20.6744,5.6522 19.8139,5.4207C18.2542,5 12,5 12,5C12,5 5.7458,5 4.1861,5.4207C3.3257,5.6522 2.6479,6.3342 2.4179,7.2003C2,8.7701 2,12.0455 2,12.0455C2,12.0455 2,15.3207 2.4179,16.8907C2.6479,17.7567 3.3257,18.4387 4.1861,18.6703C5.7458,19.0909 12,19.0909 12,19.0909C12,19.0909 18.2542,19.0909 19.8139,18.6703C20.6744,18.4387 21.352,17.7567 21.582,16.8907C22,15.3207 22,12.0455 22,12.0455C22,12.0455 22,8.7701 21.582,7.2003Z" android:fillType="evenOdd"/>
+    <path android:fillColor="#fffffe" android:pathData="M9.9545,15.0192L15.1817,12.0455L9.9545,9.0717V15.0192Z" android:fillType="evenOdd"/>
+</vector>

app/src/main/res/drawable-anydpi-v24/ic_facebook_white_24dp.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="88" android:viewportHeight="88">
-    <path android:fillColor="#ffffff" android:pathData="M4.86,0C2.17,0 0,2.17 0,4.86L0,83.14C0,85.83 2.17,88 4.86,88L47,88L47,53.92L35.54,53.92L35.54,40.64L47,40.64L47,30.85C47,19.48 53.95,13.29 64.09,13.29C68.94,13.29 73.12,13.65 74.33,13.81L74.33,25.69L67.3,25.7C61.79,25.7 60.72,28.32 60.72,32.16L60.72,40.64L73.87,40.64L72.16,53.92L60.72,53.92L60.72,88L83.14,88C85.83,88 88,85.83 88,83.14L88,4.86C88,2.17 85.83,0 83.14,0L4.86,0Z" android:strokeColor="#00000000" android:strokeWidth="1" android:fillType="evenOdd"/>
-</vector>

app/src/main/res/drawable-anydpi-v24/ic_github_white.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="255" android:viewportHeight="255">
-    <path android:fillColor="#ffffff" android:pathData="M127.205,31C74.086,31 31,73.903 31,126.797C31,169.113 58.74,204.963 96.514,217.893C101.235,218.48 103.006,215.542 103.006,213.191C103.006,210.84 103.006,204.963 103.006,196.735C76.447,202.612 70.544,183.805 70.544,183.805C66.413,172.639 59.921,169.7 59.921,169.7C51.067,163.823 60.511,163.823 60.511,163.823C69.954,164.411 75.266,173.814 75.266,173.814C84.119,188.507 97.694,184.393 103.006,182.042C103.596,175.577 106.547,171.463 108.908,169.113C87.661,166.762 65.232,158.534 65.232,121.508C65.232,110.929 68.774,102.701 75.266,95.648C74.676,93.885 71.135,83.894 76.447,70.965C76.447,70.965 84.71,68.614 103.006,80.956C110.679,78.605 118.942,78.017 127.205,78.017C135.468,78.017 143.731,79.192 151.404,80.956C169.7,68.614 177.963,70.965 177.963,70.965C183.275,83.894 179.734,93.885 179.144,96.236C185.046,102.701 189.177,111.517 189.177,122.096C189.177,159.121 166.749,166.762 145.502,169.113C149.043,172.051 151.994,177.928 151.994,186.744C151.994,199.674 151.994,209.665 151.994,213.191C151.994,215.542 153.765,218.48 158.486,217.893C196.85,204.963 224,169.113 224,126.797C223.41,73.903 180.324,31 127.205,31Z" android:fillType="evenOdd"/>
-</vector>

app/src/main/res/drawable-anydpi-v24/ic_network_connecting.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="12dp" android:width="12dp" android:viewportWidth="11" android:viewportHeight="12">
+    <path android:fillColor="#36393f" android:pathData="M9,0L10,0A1,1 0,0 1,11 1L11,11A1,1 0,0 1,10 12L9,12A1,1 0,0 1,8 11L8,1A1,1 0,0 1,9 0z" android:strokeColor="#00000000" android:strokeWidth="1" android:strokeAlpha="0.2" android:fillType="evenOdd"/>
+    <path android:fillColor="#36393f" android:pathData="M5,4L6,4A1,1 0,0 1,7 5L7,11A1,1 0,0 1,6 12L5,12A1,1 0,0 1,4 11L4,5A1,1 0,0 1,5 4z" android:strokeColor="#00000000" android:strokeWidth="1" android:strokeAlpha="0.2" android:fillType="evenOdd"/>
+    <path android:fillColor="#36393f" android:pathData="M1,8L2,8A1,1 0,0 1,3 9L3,11A1,1 0,0 1,2 12L1,12A1,1 0,0 1,0 11L0,9A1,1 0,0 1,1 8z" android:strokeColor="#00000000" android:strokeWidth="1" android:strokeAlpha="0.2" android:fillType="evenOdd"/>
+    <path android:name="three" android:fillColor="#faa61a" android:pathData="M9,0L10,0A1,1 0,0 1,11 1L11,11A1,1 0,0 1,10 12L9,12A1,1 0,0 1,8 11L8,1A1,1 0,0 1,9 0z" android:strokeColor="#00000000" android:strokeWidth="1" android:strokeAlpha="0.2" android:fillAlpha="0" android:fillType="evenOdd"/>
+    <path android:name="two" android:fillColor="#faa61a" android:pathData="M5,4L6,4A1,1 0,0 1,7 5L7,11A1,1 0,0 1,6 12L5,12A1,1 0,0 1,4 11L4,5A1,1 0,0 1,5 4z" android:strokeColor="#00000000" android:strokeWidth="1" android:fillType="evenOdd"/>
+    <path android:name="one" android:fillColor="#faa61a" android:pathData="M1,8L2,8A1,1 0,0 1,3 9L3,11A1,1 0,0 1,2 12L1,12A1,1 0,0 1,0 11L0,9A1,1 0,0 1,1 8z" android:strokeColor="#00000000" android:strokeWidth="1" android:fillType="evenOdd"/>
+</vector>

app/src/main/res/drawable-anydpi-v24/ic_network_connecting_light.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="12dp" android:width="12dp" android:viewportWidth="11" android:viewportHeight="12">
+    <path android:fillColor="#c7ccd1" android:pathData="M9,0L10,0A1,1 0,0 1,11 1L11,11A1,1 0,0 1,10 12L9,12A1,1 0,0 1,8 11L8,1A1,1 0,0 1,9 0z" android:strokeColor="#00000000" android:strokeWidth="1" android:strokeAlpha="0.2" android:fillType="evenOdd"/>
+    <path android:fillColor="#c7ccd1" android:pathData="M5,4L6,4A1,1 0,0 1,7 5L7,11A1,1 0,0 1,6 12L5,12A1,1 0,0 1,4 11L4,5A1,1 0,0 1,5 4z" android:strokeColor="#00000000" android:strokeWidth="1" android:strokeAlpha="0.2" android:fillType="evenOdd"/>
+    <path android:fillColor="#c7ccd1" android:pathData="M1,8L2,8A1,1 0,0 1,3 9L3,11A1,1 0,0 1,2 12L1,12A1,1 0,0 1,0 11L0,9A1,1 0,0 1,1 8z" android:strokeColor="#00000000" android:strokeWidth="1" android:strokeAlpha="0.2" android:fillType="evenOdd"/>
+    <path android:name="three" android:fillColor="#faa61a" android:pathData="M9,0L10,0A1,1 0,0 1,11 1L11,11A1,1 0,0 1,10 12L9,12A1,1 0,0 1,8 11L8,1A1,1 0,0 1,9 0z" android:strokeColor="#00000000" android:strokeWidth="1" android:strokeAlpha="0.2" android:fillAlpha="0" android:fillType="evenOdd"/>
+    <path android:name="two" android:fillColor="#faa61a" android:pathData="M5,4L6,4A1,1 0,0 1,7 5L7,11A1,1 0,0 1,6 12L5,12A1,1 0,0 1,4 11L4,5A1,1 0,0 1,5 4z" android:strokeColor="#00000000" android:strokeWidth="1" android:fillType="evenOdd"/>
+    <path android:name="one" android:fillColor="#faa61a" android:pathData="M1,8L2,8A1,1 0,0 1,3 9L3,11A1,1 0,0 1,2 12L1,12A1,1 0,0 1,0 11L0,9A1,1 0,0 1,1 8z" android:strokeColor="#00000000" android:strokeWidth="1" android:fillType="evenOdd"/>
+</vector>

app/src/main/res/drawable-anydpi-v24/ic_reddit_white_24dp.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="#fff" android:pathData="M11.634,7.824l1.924,-5.466 4.602,1.1C18.496,2.604 19.326,2 20.308,2c1.275,0 2.308,1.024 2.308,2.308 0,1.275 -1.024,2.308 -2.308,2.308 -1.274,0 -2.306,-1.023 -2.308,-2.305l-3.885,-0.929 -1.566,4.452c2.653,0.1 5.052,0.85 6.849,2.015 0.489,-0.432 1.131,-0.694 1.833,-0.694C22.76,9.154 24,10.397 24,11.923c0,1.019 -0.551,1.909 -1.371,2.39 0.035,0.237 0.053,0.477 0.053,0.72 0,3.976 -4.82,7.212 -10.745,7.212 -5.925,0 -10.745,-3.235 -10.745,-7.212 0,-0.267 0.022,-0.531 0.064,-0.791C0.5,13.747 0,12.892 0,11.923 0,10.394 1.243,9.154 2.769,9.154c0.677,0 1.298,0.244 1.779,0.648 1.859,-1.183 4.346,-1.926 7.086,-1.978zM11.918,19.627c-2.759,0 -3.863,-1.253 -3.909,-1.306 -0.156,-0.182 -0.134,-0.455 0.047,-0.61 0.181,-0.154 0.452,-0.134 0.608,0.045 0.025,0.027 0.946,1.006 3.254,1.006 2.348,0 3.377,-1.014 3.387,-1.024 0.166,-0.17 0.44,-0.174 0.611,-0.007 0.17,0.166 0.176,0.436 0.012,0.608 -0.05,0.053 -1.265,1.289 -4.01,1.289zM13.898,13.76c0,-0.934 0.758,-1.693 1.693,-1.693 0.935,0 1.692,0.758 1.692,1.693 0,0.935 -0.758,1.693 -1.692,1.693 -0.936,0 -1.693,-0.758 -1.693,-1.693zM6.831,13.76c0,-0.934 0.758,-1.693 1.693,-1.693 0.935,0 1.692,0.758 1.692,1.693 0,0.935 -0.758,1.693 -1.692,1.693 -0.936,0 -1.693,-0.758 -1.693,-1.693z" android:fillType="evenOdd"/>
-</vector>

app/src/main/res/drawable-anydpi-v24/ic_twitch_white_24dp.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="288" android:viewportHeight="300">
-    <path android:fillColor="#ffffff" android:pathData="M20.12,0L0.55,52.18L0.55,260.85L72.26,260.85L72.26,300L111.4,300L150.51,260.85L209.19,260.85L287.45,182.62L287.45,0L20.12,0ZM46.18,26.07L261.37,26.07L261.37,169.55L215.72,215.21L144,215.21L104.9,254.31L104.9,215.21L46.18,215.21L46.18,26.07Z" android:strokeColor="#00000000" android:strokeWidth="1" android:fillType="evenOdd"/>
-    <path android:fillColor="#ffffff" android:pathData="M117.92,156.53L144,156.53L144,78.27L117.92,78.27L117.92,156.53ZM189.64,156.53L215.72,156.53L215.72,78.27L189.64,78.27L189.64,156.53Z" android:strokeColor="#00000000" android:strokeWidth="1" android:fillType="evenOdd"/>
-</vector>

app/src/main/res/drawable-anydpi-v24/ic_twitter_white_24dp.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="88" android:viewportHeight="88">
-    <path android:fillColor="#ffffff" android:pathData="M88,8.47C84.76,9.9 81.28,10.87 77.63,11.31C81.36,9.07 84.22,5.54 85.57,1.32C82.08,3.39 78.22,4.89 74.1,5.7C70.81,2.19 66.12,0 60.93,0C50.95,0 42.87,8.08 42.87,18.05C42.87,19.47 43.03,20.85 43.34,22.17C28.33,21.42 15.03,14.23 6.13,3.3C4.57,5.97 3.68,9.07 3.68,12.38C3.68,18.64 6.87,24.17 11.71,27.41C8.75,27.31 5.97,26.5 3.54,25.15C3.53,25.23 3.53,25.3 3.53,25.38C3.53,34.12 9.76,41.42 18.02,43.08C16.5,43.49 14.91,43.71 13.26,43.71C12.1,43.71 10.97,43.6 9.86,43.39C12.16,50.56 18.83,55.78 26.73,55.93C20.55,60.77 12.77,63.66 4.31,63.66C2.85,63.66 1.41,63.57 0,63.4C7.99,68.53 17.48,71.52 27.68,71.52C60.88,71.52 79.04,44.01 79.04,20.15C79.04,19.36 79.03,18.59 78.99,17.81C82.52,15.27 85.58,12.09 88,8.47" android:strokeColor="#00000000" android:strokeWidth="1" android:fillType="evenOdd"/>
-</vector>