116.0 - Alpha (116200)

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId 'com.discord'
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 115203
+        versionCode 116200
-        versionName "115.3 - Alpha"
+        versionName "116.0 - Alpha"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/AndroidManifest.xml

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

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

@@ -17,6 +17,7 @@ public final class TrackChannelUpdated implements AnalyticsSchema, TrackBaseRece
     private final Boolean newArchived = null;
     private final Long newAutoArchiveDurationMinutes = null;
     private final CharSequence newBannerHash = null;
+    private final Long newFlags = null;
     private final Boolean newInvitable = null;
     private final Boolean newLocked = null;
     private final CharSequence newName = null;
@@ -26,6 +27,7 @@ public final class TrackChannelUpdated implements AnalyticsSchema, TrackBaseRece
     private final CharSequence oldBannerHash = null;
     private final Long oldBitrate = null;
     private final Long oldDefaultAutoArchiveDurationMinutes = null;
+    private final Long oldFlags = null;
     private final Boolean oldInvitable = null;
     private final Boolean oldLocked = null;
     private final CharSequence oldName = null;
@@ -50,7 +52,7 @@ public final class TrackChannelUpdated implements AnalyticsSchema, TrackBaseRece
             return false;
         }
         TrackChannelUpdated trackChannelUpdated = (TrackChannelUpdated) obj;
-        return m.areEqual(this.guildId, trackChannelUpdated.guildId) && m.areEqual(this.guildName, trackChannelUpdated.guildName) && m.areEqual(this.oldName, trackChannelUpdated.oldName) && m.areEqual(this.newName, trackChannelUpdated.newName) && m.areEqual(this.oldNsfw, trackChannelUpdated.oldNsfw) && m.areEqual(this.newNsfw, trackChannelUpdated.newNsfw) && m.areEqual(this.bitrate, trackChannelUpdated.bitrate) && m.areEqual(this.oldBitrate, trackChannelUpdated.oldBitrate) && m.areEqual(this.rtcRegion, trackChannelUpdated.rtcRegion) && m.areEqual(this.oldRtcRegion, trackChannelUpdated.oldRtcRegion) && m.areEqual(this.videoQualityMode, trackChannelUpdated.videoQualityMode) && m.areEqual(this.oldVideoQualityMode, trackChannelUpdated.oldVideoQualityMode) && m.areEqual(this.defaultAutoArchiveDurationMinutes, trackChannelUpdated.defaultAutoArchiveDurationMinutes) && m.areEqual(this.oldDefaultAutoArchiveDurationMinutes, trackChannelUpdated.oldDefaultAutoArchiveDurationMinutes) && m.areEqual(this.oldArchived, trackChannelUpdated.oldArchived) && m.areEqual(this.newArchived, trackChannelUpdated.newArchived) && m.areEqual(this.oldLocked, trackChannelUpdated.oldLocked) && m.areEqual(this.newLocked, trackChannelUpdated.newLocked) && m.areEqual(this.oldInvitable, trackChannelUpdated.oldInvitable) && m.areEqual(this.newInvitable, trackChannelUpdated.newInvitable) && m.areEqual(this.oldAutoArchiveDurationMinutes, trackChannelUpdated.oldAutoArchiveDurationMinutes) && m.areEqual(this.newAutoArchiveDurationMinutes, trackChannelUpdated.newAutoArchiveDurationMinutes) && m.areEqual(this.oldBannerHash, trackChannelUpdated.oldBannerHash) && m.areEqual(this.newBannerHash, trackChannelUpdated.newBannerHash);
+        return m.areEqual(this.guildId, trackChannelUpdated.guildId) && m.areEqual(this.guildName, trackChannelUpdated.guildName) && m.areEqual(this.oldName, trackChannelUpdated.oldName) && m.areEqual(this.newName, trackChannelUpdated.newName) && m.areEqual(this.oldNsfw, trackChannelUpdated.oldNsfw) && m.areEqual(this.newNsfw, trackChannelUpdated.newNsfw) && m.areEqual(this.bitrate, trackChannelUpdated.bitrate) && m.areEqual(this.oldBitrate, trackChannelUpdated.oldBitrate) && m.areEqual(this.rtcRegion, trackChannelUpdated.rtcRegion) && m.areEqual(this.oldRtcRegion, trackChannelUpdated.oldRtcRegion) && m.areEqual(this.videoQualityMode, trackChannelUpdated.videoQualityMode) && m.areEqual(this.oldVideoQualityMode, trackChannelUpdated.oldVideoQualityMode) && m.areEqual(this.defaultAutoArchiveDurationMinutes, trackChannelUpdated.defaultAutoArchiveDurationMinutes) && m.areEqual(this.oldDefaultAutoArchiveDurationMinutes, trackChannelUpdated.oldDefaultAutoArchiveDurationMinutes) && m.areEqual(this.oldArchived, trackChannelUpdated.oldArchived) && m.areEqual(this.newArchived, trackChannelUpdated.newArchived) && m.areEqual(this.oldLocked, trackChannelUpdated.oldLocked) && m.areEqual(this.newLocked, trackChannelUpdated.newLocked) && m.areEqual(this.oldInvitable, trackChannelUpdated.oldInvitable) && m.areEqual(this.newInvitable, trackChannelUpdated.newInvitable) && m.areEqual(this.oldAutoArchiveDurationMinutes, trackChannelUpdated.oldAutoArchiveDurationMinutes) && m.areEqual(this.newAutoArchiveDurationMinutes, trackChannelUpdated.newAutoArchiveDurationMinutes) && m.areEqual(this.oldBannerHash, trackChannelUpdated.oldBannerHash) && m.areEqual(this.newBannerHash, trackChannelUpdated.newBannerHash) && m.areEqual(this.oldFlags, trackChannelUpdated.oldFlags) && m.areEqual(this.newFlags, trackChannelUpdated.newFlags);
     }
 
     public int hashCode() {
@@ -102,10 +104,14 @@ public final class TrackChannelUpdated implements AnalyticsSchema, TrackBaseRece
         CharSequence charSequence6 = this.oldBannerHash;
         int hashCode23 = (hashCode22 + (charSequence6 != null ? charSequence6.hashCode() : 0)) * 31;
         CharSequence charSequence7 = this.newBannerHash;
-        if (charSequence7 != null) {
+        int hashCode24 = (hashCode23 + (charSequence7 != null ? charSequence7.hashCode() : 0)) * 31;
-            i = charSequence7.hashCode();
+        Long l10 = this.oldFlags;
+        int hashCode25 = (hashCode24 + (l10 != null ? l10.hashCode() : 0)) * 31;
+        Long l11 = this.newFlags;
+        if (l11 != null) {
+            i = l11.hashCode();
         }
-        return hashCode23 + i;
+        return hashCode25 + i;
     }
 
     public String toString() {
@@ -156,6 +162,10 @@ public final class TrackChannelUpdated implements AnalyticsSchema, TrackBaseRece
         R.append(", oldBannerHash=");
         R.append(this.oldBannerHash);
         R.append(", newBannerHash=");
-        return a.D(R, this.newBannerHash, ")");
+        R.append(this.newBannerHash);
+        R.append(", oldFlags=");
+        R.append(this.oldFlags);
+        R.append(", newFlags=");
+        return a.F(R, this.newFlags, ")");
     }
 }

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

@@ -0,0 +1,48 @@
+package com.discord.analytics.generated.events;
+
+import b.d.b.a.a;
+import com.discord.analytics.generated.traits.TrackBase;
+import com.discord.analytics.generated.traits.TrackBaseReceiver;
+import com.discord.api.science.AnalyticsSchema;
+import d0.z.d.m;
+/* compiled from: TrackDevPortalCsatSurveyResponse.kt */
+public final class TrackDevPortalCsatSurveyResponse implements AnalyticsSchema, TrackBaseReceiver {
+    private final transient String analyticsSchemaTypeName = "dev_portal_csat_survey_response";
+    private final Long csatResponse = null;
+    private final CharSequence ctaName = null;
+    private TrackBase trackBase;
+
+    @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 TrackDevPortalCsatSurveyResponse)) {
+            return false;
+        }
+        TrackDevPortalCsatSurveyResponse trackDevPortalCsatSurveyResponse = (TrackDevPortalCsatSurveyResponse) obj;
+        return m.areEqual(this.ctaName, trackDevPortalCsatSurveyResponse.ctaName) && m.areEqual(this.csatResponse, trackDevPortalCsatSurveyResponse.csatResponse);
+    }
+
+    public int hashCode() {
+        CharSequence charSequence = this.ctaName;
+        int i = 0;
+        int hashCode = (charSequence != null ? charSequence.hashCode() : 0) * 31;
+        Long l = this.csatResponse;
+        if (l != null) {
+            i = l.hashCode();
+        }
+        return hashCode + i;
+    }
+
+    public String toString() {
+        StringBuilder R = a.R("TrackDevPortalCsatSurveyResponse(ctaName=");
+        R.append(this.ctaName);
+        R.append(", csatResponse=");
+        return a.F(R, this.csatResponse, ")");
+    }
+}

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

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

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

@@ -0,0 +1,21 @@
+package com.discord.analytics.generated.events;
+
+import com.discord.analytics.generated.traits.TrackBase;
+import com.discord.analytics.generated.traits.TrackBaseReceiver;
+import com.discord.analytics.generated.traits.TrackChannel;
+import com.discord.analytics.generated.traits.TrackChannelReceiver;
+import com.discord.analytics.generated.traits.TrackGuild;
+import com.discord.analytics.generated.traits.TrackGuildReceiver;
+import com.discord.api.science.AnalyticsSchema;
+/* compiled from: TrackGuildFeedChannelRemoved.kt */
+public final class TrackGuildFeedChannelRemoved implements AnalyticsSchema, TrackBaseReceiver, TrackChannelReceiver, TrackGuildReceiver {
+    private final transient String analyticsSchemaTypeName = "guild_feed_channel_removed";
+    private TrackBase trackBase;
+    private TrackChannel trackChannel;
+    private TrackGuild trackGuild;
+
+    @Override // com.discord.api.science.AnalyticsSchema
+    public String b() {
+        return this.analyticsSchemaTypeName;
+    }
+}

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

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

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

@@ -0,0 +1,21 @@
+package com.discord.analytics.generated.events;
+
+import com.discord.analytics.generated.traits.TrackBase;
+import com.discord.analytics.generated.traits.TrackBaseReceiver;
+import com.discord.analytics.generated.traits.TrackChannel;
+import com.discord.analytics.generated.traits.TrackChannelReceiver;
+import com.discord.analytics.generated.traits.TrackGuild;
+import com.discord.analytics.generated.traits.TrackGuildReceiver;
+import com.discord.api.science.AnalyticsSchema;
+/* compiled from: TrackGuildFeedChannelUnremoved.kt */
+public final class TrackGuildFeedChannelUnremoved implements AnalyticsSchema, TrackBaseReceiver, TrackChannelReceiver, TrackGuildReceiver {
+    private final transient String analyticsSchemaTypeName = "guild_feed_channel_unremoved";
+    private TrackBase trackBase;
+    private TrackChannel trackChannel;
+    private TrackGuild trackGuild;
+
+    @Override // com.discord.api.science.AnalyticsSchema
+    public String b() {
+        return this.analyticsSchemaTypeName;
+    }
+}

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

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

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

@@ -0,0 +1,43 @@
+package com.discord.analytics.generated.events;
+
+import b.d.b.a.a;
+import com.discord.analytics.generated.traits.TrackBase;
+import com.discord.analytics.generated.traits.TrackBaseReceiver;
+import com.discord.analytics.generated.traits.TrackChannel;
+import com.discord.analytics.generated.traits.TrackChannelReceiver;
+import com.discord.analytics.generated.traits.TrackGuild;
+import com.discord.analytics.generated.traits.TrackGuildReceiver;
+import com.discord.api.science.AnalyticsSchema;
+import d0.z.d.m;
+/* compiled from: TrackGuildFeedMessageRemoved.kt */
+public final class TrackGuildFeedMessageRemoved implements AnalyticsSchema, TrackBaseReceiver, TrackChannelReceiver, TrackGuildReceiver {
+    private final transient String analyticsSchemaTypeName = "guild_feed_message_removed";
+    private final Long messageId = null;
+    private TrackBase trackBase;
+    private TrackChannel trackChannel;
+    private TrackGuild trackGuild;
+
+    @Override // com.discord.api.science.AnalyticsSchema
+    public String b() {
+        return this.analyticsSchemaTypeName;
+    }
+
+    public boolean equals(Object obj) {
+        if (this != obj) {
+            return (obj instanceof TrackGuildFeedMessageRemoved) && m.areEqual(this.messageId, ((TrackGuildFeedMessageRemoved) obj).messageId);
+        }
+        return true;
+    }
+
+    public int hashCode() {
+        Long l = this.messageId;
+        if (l != null) {
+            return l.hashCode();
+        }
+        return 0;
+    }
+
+    public String toString() {
+        return a.F(a.R("TrackGuildFeedMessageRemoved(messageId="), this.messageId, ")");
+    }
+}

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

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

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

@@ -0,0 +1,43 @@
+package com.discord.analytics.generated.events;
+
+import b.d.b.a.a;
+import com.discord.analytics.generated.traits.TrackBase;
+import com.discord.analytics.generated.traits.TrackBaseReceiver;
+import com.discord.analytics.generated.traits.TrackChannel;
+import com.discord.analytics.generated.traits.TrackChannelReceiver;
+import com.discord.analytics.generated.traits.TrackGuild;
+import com.discord.analytics.generated.traits.TrackGuildReceiver;
+import com.discord.api.science.AnalyticsSchema;
+import d0.z.d.m;
+/* compiled from: TrackGuildFeedMessageUnremoved.kt */
+public final class TrackGuildFeedMessageUnremoved implements AnalyticsSchema, TrackBaseReceiver, TrackChannelReceiver, TrackGuildReceiver {
+    private final transient String analyticsSchemaTypeName = "guild_feed_message_unremoved";
+    private final Long messageId = null;
+    private TrackBase trackBase;
+    private TrackChannel trackChannel;
+    private TrackGuild trackGuild;
+
+    @Override // com.discord.api.science.AnalyticsSchema
+    public String b() {
+        return this.analyticsSchemaTypeName;
+    }
+
+    public boolean equals(Object obj) {
+        if (this != obj) {
+            return (obj instanceof TrackGuildFeedMessageUnremoved) && m.areEqual(this.messageId, ((TrackGuildFeedMessageUnremoved) obj).messageId);
+        }
+        return true;
+    }
+
+    public int hashCode() {
+        Long l = this.messageId;
+        if (l != null) {
+            return l.hashCode();
+        }
+        return 0;
+    }
+
+    public String toString() {
+        return a.F(a.R("TrackGuildFeedMessageUnremoved(messageId="), this.messageId, ")");
+    }
+}

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

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

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

@@ -8,29 +8,33 @@ import androidx.viewbinding.ViewBinding;
 import com.discord.views.GuildView;
 import com.discord.views.guilds.ServerMemberCount;
 import com.facebook.drawee.view.SimpleDraweeView;
+import com.google.android.material.button.MaterialButton;
 public final class WidgetGuildInviteInfoViewBinding implements ViewBinding {
     @NonNull
     public final View a;
     @NonNull
 
     /* renamed from: b  reason: collision with root package name */
-    public final GuildView f2395b;
+    public final MaterialButton f2395b;
     @NonNull
-    public final SimpleDraweeView c;
+    public final GuildView c;
     @NonNull
-    public final ServerMemberCount d;
+    public final SimpleDraweeView d;
     @NonNull
-    public final TextView e;
+    public final ServerMemberCount e;
     @NonNull
     public final TextView f;
+    @NonNull
+    public final TextView g;
 
-    public WidgetGuildInviteInfoViewBinding(@NonNull View view, @NonNull GuildView guildView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull ServerMemberCount serverMemberCount, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout) {
+    public WidgetGuildInviteInfoViewBinding(@NonNull View view, @NonNull MaterialButton materialButton, @NonNull GuildView guildView, @NonNull SimpleDraweeView simpleDraweeView, @NonNull ServerMemberCount serverMemberCount, @NonNull TextView textView, @NonNull TextView textView2, @NonNull LinearLayout linearLayout) {
         this.a = view;
-        this.f2395b = guildView;
+        this.f2395b = materialButton;
-        this.c = simpleDraweeView;
+        this.c = guildView;
-        this.d = serverMemberCount;
+        this.d = simpleDraweeView;
-        this.e = textView;
+        this.e = serverMemberCount;
-        this.f = textView2;
+        this.f = textView;
+        this.g = textView2;
     }
 
     @Override // androidx.viewbinding.ViewBinding

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

@@ -18,18 +18,15 @@ public final class WidgetGuildInvitePageBinding implements ViewBinding {
     /* renamed from: b  reason: collision with root package name */
     public final MaterialButton f2396b;
     @NonNull
-    public final MaterialButton c;
+    public final GuildScheduledEventItemView c;
     @NonNull
-    public final GuildScheduledEventItemView d;
+    public final WidgetInviteInfo d;
-    @NonNull
-    public final WidgetInviteInfo e;
 
-    public WidgetGuildInvitePageBinding(@NonNull ConstraintLayout constraintLayout, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton2, @NonNull GuildScheduledEventItemView guildScheduledEventItemView, @NonNull WidgetInviteInfo widgetInviteInfo, @NonNull NestedScrollView nestedScrollView, @NonNull AppBarLayout appBarLayout) {
+    public WidgetGuildInvitePageBinding(@NonNull ConstraintLayout constraintLayout, @NonNull LinearLayout linearLayout, @NonNull MaterialButton materialButton, @NonNull GuildScheduledEventItemView guildScheduledEventItemView, @NonNull WidgetInviteInfo widgetInviteInfo, @NonNull NestedScrollView nestedScrollView, @NonNull AppBarLayout appBarLayout) {
         this.a = constraintLayout;
         this.f2396b = materialButton;
-        this.c = materialButton2;
+        this.c = guildScheduledEventItemView;
-        this.d = guildScheduledEventItemView;
+        this.d = widgetInviteInfo;
-        this.e = widgetInviteInfo;
     }
 
     @Override // androidx.viewbinding.ViewBinding

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

@@ -1,39 +0,0 @@
-package com.discord.databinding;
-
-import android.view.View;
-import android.widget.CheckBox;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import androidx.annotation.NonNull;
-import androidx.viewbinding.ViewBinding;
-import com.discord.utilities.view.text.LinkifiedTextView;
-import com.google.android.material.button.MaterialButton;
-public final class WidgetTosAcceptBinding implements ViewBinding {
-    @NonNull
-    public final RelativeLayout a;
-    @NonNull
-
-    /* renamed from: b  reason: collision with root package name */
-    public final CheckBox f2648b;
-    @NonNull
-    public final MaterialButton c;
-    @NonNull
-    public final LinkifiedTextView d;
-    @NonNull
-    public final LinkifiedTextView e;
-
-    public WidgetTosAcceptBinding(@NonNull RelativeLayout relativeLayout, @NonNull CheckBox checkBox, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout, @NonNull LinkifiedTextView linkifiedTextView, @NonNull LinkifiedTextView linkifiedTextView2, @NonNull TextView textView, @NonNull TextView textView2) {
-        this.a = relativeLayout;
-        this.f2648b = checkBox;
-        this.c = materialButton;
-        this.d = linkifiedTextView;
-        this.e = linkifiedTextView2;
-    }
-
-    @Override // androidx.viewbinding.ViewBinding
-    @NonNull
-    public View getRoot() {
-        return this.a;
-    }
-}

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

@@ -0,0 +1,48 @@
+package com.discord.databinding;
+
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.viewbinding.ViewBinding;
+import com.discord.utilities.view.text.LinkifiedTextView;
+import com.google.android.material.button.MaterialButton;
+public final class WidgetTosBinding implements ViewBinding {
+    @NonNull
+    public final RelativeLayout a;
+    @NonNull
+
+    /* renamed from: b  reason: collision with root package name */
+    public final MaterialButton f2648b;
+    @NonNull
+    public final LinkifiedTextView c;
+    @NonNull
+    public final LinkifiedTextView d;
+    @NonNull
+    public final LinkifiedTextView e;
+    @NonNull
+    public final LinkifiedTextView f;
+    @NonNull
+    public final TextView g;
+    @NonNull
+    public final TextView h;
+
+    public WidgetTosBinding(@NonNull RelativeLayout relativeLayout, @NonNull MaterialButton materialButton, @NonNull LinearLayout linearLayout, @NonNull LinkifiedTextView linkifiedTextView, @NonNull LinkifiedTextView linkifiedTextView2, @NonNull LinkifiedTextView linkifiedTextView3, @NonNull LinkifiedTextView linkifiedTextView4, @NonNull TextView textView, @NonNull TextView textView2, @NonNull ImageView imageView) {
+        this.a = relativeLayout;
+        this.f2648b = materialButton;
+        this.c = linkifiedTextView;
+        this.d = linkifiedTextView2;
+        this.e = linkifiedTextView3;
+        this.f = linkifiedTextView4;
+        this.g = textView;
+        this.h = textView2;
+    }
+
+    @Override // androidx.viewbinding.ViewBinding
+    @NonNull
+    public View getRoot() {
+        return this.a;
+    }
+}

app/src/main/java/com/discord/models/requiredaction/RequiredAction.java

@@ -6,6 +6,7 @@ import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: RequiredAction.kt */
 public enum RequiredAction {
     AGREEMENTS,
+    TOS_UPDATE_ACKNOWLEDGMENT,
     REQUIRE_VERIFIED_EMAIL,
     REQUIRE_VERIFIED_PHONE,
     REQUIRE_CAPTCHA,

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

@@ -273,6 +273,7 @@ public final class RestAPIParams {
     /* compiled from: RestAPIParams.kt */
     public static final class AuthLogin {
         private final String captchaKey;
+        private final String captchaRqtoken;
         private final String login;
         private final String loginSource;
         private final String password;
@@ -287,18 +288,20 @@ public final class RestAPIParams {
             }
         }
 
-        public AuthLogin(String str, String str2, String str3, Boolean bool, String str4) {
+        public AuthLogin(String str, String str2, String str3, String str4, Boolean bool, String str5) {
             this.login = str;
             this.password = str2;
             this.captchaKey = str3;
+            this.captchaRqtoken = str4;
             this.undelete = bool;
-            this.loginSource = str4;
+            this.loginSource = str5;
         }
     }
 
     /* compiled from: RestAPIParams.kt */
     public static final class AuthRegister {
         private final String captchaKey;
+        private final String captchaRqtoken;
         private final boolean consent;
         private final String dateOfBirth;
         private final String email;
@@ -309,34 +312,37 @@ public final class RestAPIParams {
         private final String phoneToken;
         private final String username;
 
-        public AuthRegister(String str, String str2, String str3, String str4, String str5, String str6, String str7, String str8, boolean z2, String str9) {
+        public AuthRegister(String str, String str2, String str3, String str4, String str5, String str6, String str7, String str8, String str9, boolean z2, String str10) {
             this.fingerprint = str;
             this.username = str2;
             this.email = str3;
             this.phoneToken = str4;
             this.password = str5;
             this.captchaKey = str6;
-            this.invite = str7;
+            this.captchaRqtoken = str7;
-            this.guildTemplateCode = str8;
+            this.invite = str8;
+            this.guildTemplateCode = str9;
             this.consent = z2;
-            this.dateOfBirth = str9;
+            this.dateOfBirth = str10;
         }
 
         /* JADX INFO: this call moved to the top of the method (can break code semantics) */
-        public /* synthetic */ AuthRegister(String str, String str2, String str3, String str4, String str5, String str6, String str7, String str8, boolean z2, String str9, int i, DefaultConstructorMarker defaultConstructorMarker) {
+        public /* synthetic */ AuthRegister(String str, String str2, String str3, String str4, String str5, String str6, String str7, String str8, String str9, boolean z2, String str10, int i, DefaultConstructorMarker defaultConstructorMarker) {
-            this(str, str2, str3, str4, str5, str6, str7, str8, z2, (i & 512) != 0 ? null : str9);
+            this(str, str2, str3, str4, str5, str6, str7, str8, str9, z2, (i & 1024) != 0 ? null : str10);
         }
     }
 
     /* compiled from: RestAPIParams.kt */
     public static final class AuthRegisterPhone {
         private final String captchaKey;
+        private final String captchaRqtoken;
         private final String phone;
 
-        public AuthRegisterPhone(String str, String str2) {
+        public AuthRegisterPhone(String str, String str2, String str3) {
             m.checkNotNullParameter(str, "phone");
             this.phone = str;
             this.captchaKey = str2;
+            this.captchaRqtoken = str3;
         }
     }
 
@@ -370,9 +376,11 @@ public final class RestAPIParams {
     /* compiled from: RestAPIParams.kt */
     public static final class CaptchaCode {
         private final String captchaKey;
+        private final String captchaRqtoken;
 
-        public CaptchaCode(String str) {
+        public CaptchaCode(String str, String str2) {
             this.captchaKey = str;
+            this.captchaRqtoken = str2;
         }
     }
 
@@ -1859,11 +1867,13 @@ public final class RestAPIParams {
     /* compiled from: RestAPIParams.kt */
     public static final class ForgotPassword {
         private final String captchaKey;
+        private final String captchaRqtoken;
         private final String login;
 
-        public ForgotPassword(String str, String str2) {
+        public ForgotPassword(String str, String str2, String str3) {
             this.login = str;
             this.captchaKey = str2;
+            this.captchaRqtoken = str3;
         }
     }
 
@@ -4440,18 +4450,43 @@ public final class RestAPIParams {
 
     /* compiled from: RestAPIParams.kt */
     public static final class UserAgreements {
+        public static final Companion Companion = new Companion(null);
+        private final Boolean acknowledgment;
         private final Boolean privacy;
         private final Boolean terms;
 
-        /* JADX WARNING: Illegal instructions before constructor call */
+        /* compiled from: RestAPIParams.kt */
-        public UserAgreements() {
+        public static final class Companion {
-            this(r0, r0);
+            private Companion() {
-            Boolean bool = Boolean.TRUE;
+            }
+
+            public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
+                this();
+            }
+
+            public final UserAgreements acknowledge() {
+                return new UserAgreements(null, null, Boolean.TRUE, 3, null);
+            }
+
+            public final UserAgreements agree() {
+                Boolean bool = Boolean.TRUE;
+                return new UserAgreements(bool, bool, null, 4, null);
+            }
         }
 
-        public UserAgreements(Boolean bool, Boolean bool2) {
+        public UserAgreements() {
+            this(null, null, null, 7, null);
+        }
+
+        public UserAgreements(Boolean bool, Boolean bool2, Boolean bool3) {
             this.terms = bool;
             this.privacy = bool2;
+            this.acknowledgment = bool3;
+        }
+
+        /* JADX INFO: this call moved to the top of the method (can break code semantics) */
+        public /* synthetic */ UserAgreements(Boolean bool, Boolean bool2, Boolean bool3, int i, DefaultConstructorMarker defaultConstructorMarker) {
+            this((i & 1) != 0 ? null : bool, (i & 2) != 0 ? null : bool2, (i & 4) != 0 ? null : bool3);
         }
     }
 

app/src/main/java/com/discord/stores/StoreAuthentication$login$1.java

@@ -6,6 +6,7 @@ import com.discord.models.domain.ModelInvite;
 import com.discord.models.domain.auth.ModelLoginResult;
 import com.discord.restapi.RestAPIParams;
 import com.discord.stores.utilities.RestCallStateKt;
+import com.discord.utilities.captcha.CaptchaHelper;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import d0.z.d.o;
@@ -15,7 +16,7 @@ import kotlin.jvm.functions.Function1;
 import rx.Observable;
 /* compiled from: StoreAuthentication.kt */
 public final class StoreAuthentication$login$1<T, R> implements b<String, Observable<? extends ModelLoginResult>> {
-    public final /* synthetic */ String $captchaKey;
+    public final /* synthetic */ CaptchaHelper.CaptchaPayload $captchaPayload;
     public final /* synthetic */ String $login;
     public final /* synthetic */ String $loginSource;
     public final /* synthetic */ String $password;
@@ -37,15 +38,21 @@ public final class StoreAuthentication$login$1<T, R> implements b<String, Observ
         }
     }
 
-    public StoreAuthentication$login$1(String str, String str2, String str3, boolean z2, String str4) {
+    public StoreAuthentication$login$1(String str, String str2, CaptchaHelper.CaptchaPayload captchaPayload, boolean z2, String str3) {
         this.$login = str;
         this.$password = str2;
-        this.$captchaKey = str3;
+        this.$captchaPayload = captchaPayload;
         this.$undelete = z2;
-        this.$loginSource = str4;
+        this.$loginSource = str3;
     }
 
     public final Observable<? extends ModelLoginResult> call(String str) {
-        return RestCallStateKt.logNetworkAction(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().postAuthLogin(new RestAPIParams.AuthLogin(this.$login, this.$password, this.$captchaKey, Boolean.valueOf(this.$undelete), this.$loginSource)), false, 1, null), AnonymousClass1.INSTANCE);
+        RestAPI api = RestAPI.Companion.getApi();
+        String str2 = this.$login;
+        String str3 = this.$password;
+        CaptchaHelper.CaptchaPayload captchaPayload = this.$captchaPayload;
+        String captchaKey = captchaPayload != null ? captchaPayload.getCaptchaKey() : null;
+        CaptchaHelper.CaptchaPayload captchaPayload2 = this.$captchaPayload;
+        return RestCallStateKt.logNetworkAction(ObservableExtensionsKt.restSubscribeOn$default(api.postAuthLogin(new RestAPIParams.AuthLogin(str2, str3, captchaKey, captchaPayload2 != null ? captchaPayload2.getCaptchaRqtoken() : null, Boolean.valueOf(this.$undelete), this.$loginSource)), false, 1, null), AnonymousClass1.INSTANCE);
     }
 }

app/src/main/java/com/discord/stores/StoreAuthentication$register$1.java

@@ -9,6 +9,7 @@ import com.discord.stores.StoreInviteSettings;
 import com.discord.stores.StoreStream;
 import com.discord.stores.utilities.RestCallStateKt;
 import com.discord.utilities.analytics.AnalyticsTracker;
+import com.discord.utilities.captcha.CaptchaHelper;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import d0.z.d.k;
@@ -22,7 +23,7 @@ import rx.functions.Action1;
 import rx.functions.Func2;
 /* compiled from: StoreAuthentication.kt */
 public final class StoreAuthentication$register$1<T, R> implements b<String, Observable<? extends RegisterResponse>> {
-    public final /* synthetic */ String $captchaKey;
+    public final /* synthetic */ CaptchaHelper.CaptchaPayload $captchaPayload;
     public final /* synthetic */ boolean $consent;
     public final /* synthetic */ String $dateOfBirth;
     public final /* synthetic */ String $email;
@@ -76,6 +77,7 @@ public final class StoreAuthentication$register$1<T, R> implements b<String, Obs
 
         public final Observable<? extends RegisterResponse> call(StoreAuthentication.AuthRequestParams authRequestParams) {
             StoreInviteSettings.InviteCode inviteCode = authRequestParams.getInviteCode();
+            String str = null;
             String inviteCode2 = inviteCode != null ? inviteCode.getInviteCode() : null;
             if (inviteCode2 == null || inviteCode2.length() == 0) {
                 StoreStream.Companion.getNux().setPostRegister(true);
@@ -83,16 +85,21 @@ public final class StoreAuthentication$register$1<T, R> implements b<String, Obs
                 StoreStream.Companion.getNux().setPostRegisterWithInvite(true);
             }
             RestAPI api = RestAPI.Companion.getApi();
-            String str = this.$fingerprint;
+            String str2 = this.$fingerprint;
             StoreAuthentication$register$1 storeAuthentication$register$1 = this.this$0;
-            String str2 = storeAuthentication$register$1.$username;
+            String str3 = storeAuthentication$register$1.$username;
-            String str3 = storeAuthentication$register$1.$email;
+            String str4 = storeAuthentication$register$1.$email;
-            String str4 = storeAuthentication$register$1.$phoneToken;
+            String str5 = storeAuthentication$register$1.$phoneToken;
-            String str5 = storeAuthentication$register$1.$password;
+            String str6 = storeAuthentication$register$1.$password;
-            String str6 = storeAuthentication$register$1.$captchaKey;
+            CaptchaHelper.CaptchaPayload captchaPayload = storeAuthentication$register$1.$captchaPayload;
+            String captchaKey = captchaPayload != null ? captchaPayload.getCaptchaKey() : null;
+            CaptchaHelper.CaptchaPayload captchaPayload2 = this.this$0.$captchaPayload;
+            if (captchaPayload2 != null) {
+                str = captchaPayload2.getCaptchaRqtoken();
+            }
             String guildTemplateCode = authRequestParams.getGuildTemplateCode();
             StoreAuthentication$register$1 storeAuthentication$register$12 = this.this$0;
-            return RestCallStateKt.logNetworkAction(api.postAuthRegister(new RestAPIParams.AuthRegister(str, str2, str3, str4, str5, str6, inviteCode2, guildTemplateCode, storeAuthentication$register$12.$consent, storeAuthentication$register$12.$dateOfBirth)), new AnonymousClass1(this, inviteCode2));
+            return RestCallStateKt.logNetworkAction(api.postAuthRegister(new RestAPIParams.AuthRegister(str2, str3, str4, str5, str6, captchaKey, str, inviteCode2, guildTemplateCode, storeAuthentication$register$12.$consent, storeAuthentication$register$12.$dateOfBirth)), new AnonymousClass1(this, inviteCode2));
         }
     }
 
@@ -116,15 +123,15 @@ public final class StoreAuthentication$register$1<T, R> implements b<String, Obs
         }
     }
 
-    public StoreAuthentication$register$1(StoreAuthentication storeAuthentication, String str, String str2, String str3, String str4, String str5, boolean z2, String str6) {
+    public StoreAuthentication$register$1(StoreAuthentication storeAuthentication, String str, String str2, String str3, String str4, CaptchaHelper.CaptchaPayload captchaPayload, boolean z2, String str5) {
         this.this$0 = storeAuthentication;
         this.$username = str;
         this.$email = str2;
         this.$phoneToken = str3;
         this.$password = str4;
-        this.$captchaKey = str5;
+        this.$captchaPayload = captchaPayload;
         this.$consent = z2;
-        this.$dateOfBirth = str6;
+        this.$dateOfBirth = str5;
     }
 
     /* JADX WARN: Multi-variable type inference failed */

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

@@ -19,6 +19,7 @@ import com.discord.stores.StoreInviteSettings;
 import com.discord.stores.StoreNavigation;
 import com.discord.stores.utilities.RestCallStateKt;
 import com.discord.utilities.analytics.AnalyticsTracker;
+import com.discord.utilities.captcha.CaptchaHelper;
 import com.discord.utilities.persister.Persister;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
@@ -213,15 +214,15 @@ public final class StoreAuthentication extends Store {
         return t;
     }
 
-    public static /* synthetic */ Observable login$default(StoreAuthentication storeAuthentication, String str, String str2, String str3, boolean z2, String str4, int i, Object obj) {
+    public static /* synthetic */ Observable login$default(StoreAuthentication storeAuthentication, String str, String str2, CaptchaHelper.CaptchaPayload captchaPayload, boolean z2, String str3, int i, Object obj) {
         if ((i & 16) != 0) {
-            str4 = null;
+            str3 = null;
         }
-        return storeAuthentication.login(str, str2, str3, z2, str4);
+        return storeAuthentication.login(str, str2, captchaPayload, z2, str3);
     }
 
-    public static /* synthetic */ Observable register$default(StoreAuthentication storeAuthentication, String str, String str2, String str3, String str4, String str5, boolean z2, String str6, int i, Object obj) {
+    public static /* synthetic */ Observable register$default(StoreAuthentication storeAuthentication, String str, String str2, String str3, String str4, CaptchaHelper.CaptchaPayload captchaPayload, boolean z2, String str5, int i, Object obj) {
-        return storeAuthentication.register(str, str2, str3, str4, str5, z2, (i & 64) != 0 ? null : str6);
+        return storeAuthentication.register(str, str2, str3, str4, captchaPayload, z2, (i & 64) != 0 ? null : str5);
     }
 
     private final synchronized void resetIsConsentRequired() {
@@ -256,9 +257,9 @@ public final class StoreAuthentication extends Store {
         return RestCallStateKt.logNetworkAction(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().authorizeIP(new RestAPIParams.AuthorizeIP(str)), false, 1, null), StoreAuthentication$authorizeIP$1.INSTANCE);
     }
 
-    public final Observable<Void> forgotPassword(String str, String str2) {
+    public final Observable<Void> forgotPassword(String str, CaptchaHelper.CaptchaPayload captchaPayload) {
         m.checkNotNullParameter(str, "login");
-        return ObservableExtensionsKt.restSubscribeOn$default(RestCallStateKt.logNetworkAction(RestAPI.Companion.getApi().forgotPassword(new RestAPIParams.ForgotPassword(str, str2)), StoreAuthentication$forgotPassword$1.INSTANCE), false, 1, null);
+        return ObservableExtensionsKt.restSubscribeOn$default(RestCallStateKt.logNetworkAction(RestAPI.Companion.getApi().forgotPassword(new RestAPIParams.ForgotPassword(str, captchaPayload != null ? captchaPayload.getCaptchaKey() : null, captchaPayload != null ? captchaPayload.getCaptchaRqtoken() : null)), StoreAuthentication$forgotPassword$1.INSTANCE), false, 1, null);
     }
 
     public final Observable<String> getAgeGateError() {
@@ -375,11 +376,11 @@ public final class StoreAuthentication extends Store {
         return bool != null ? bool.booleanValue() : true;
     }
 
-    public final Observable<ModelLoginResult> login(String str, String str2, String str3, boolean z2, String str4) {
+    public final Observable<ModelLoginResult> login(String str, String str2, CaptchaHelper.CaptchaPayload captchaPayload, boolean z2, String str3) {
         m.checkNotNullParameter(str, "login");
         m.checkNotNullParameter(str2, "password");
         setSavedLogin(str);
-        Observable<ModelLoginResult> t = getFingerprintSnapshotOrGenerate().z(new StoreAuthentication$login$1(str, str2, str3, z2, str4)).t(new StoreAuthentication$login$2(this));
+        Observable<ModelLoginResult> t = getFingerprintSnapshotOrGenerate().z(new StoreAuthentication$login$1(str, str2, captchaPayload, z2, str3)).t(new StoreAuthentication$login$2(this));
         m.checkNotNullExpressionValue(t, "getFingerprintSnapshotOr…lt)\n          }\n        }");
         return t;
     }
@@ -398,11 +399,11 @@ public final class StoreAuthentication extends Store {
         return F;
     }
 
-    public final Observable<RegisterResponse> register(String str, String str2, String str3, String str4, String str5, boolean z2, String str6) {
+    public final Observable<RegisterResponse> register(String str, String str2, String str3, String str4, CaptchaHelper.CaptchaPayload captchaPayload, boolean z2, String str5) {
         m.checkNotNullParameter(str, "username");
         m.checkNotNullParameter(str4, "password");
         setSavedLogin(str2);
-        Observable<R> z3 = getFingerprintSnapshotOrGenerate().z(new StoreAuthentication$register$1(this, str, str2, str3, str4, str5, z2, str6));
+        Observable<R> z3 = getFingerprintSnapshotOrGenerate().z(new StoreAuthentication$register$1(this, str, str2, str3, str4, captchaPayload, z2, str5));
         m.checkNotNullExpressionValue(z3, "getFingerprintSnapshotOr…              }\n        }");
         return z3;
     }

app/src/main/java/com/discord/stores/StoreNavigation$ActivityNavigationLifecycleCallbacks$tosNavHandler$1.java

@@ -5,7 +5,7 @@ import b.a.d.j;
 import com.discord.app.AppActivity;
 import com.discord.models.requiredaction.RequiredAction;
 import com.discord.stores.StoreNavigation;
-import com.discord.widgets.tos.WidgetTosAccept;
+import com.discord.widgets.tos.WidgetTos;
 import d0.z.d.a0;
 import d0.z.d.m;
 import d0.z.d.o;
@@ -28,16 +28,18 @@ public final class StoreNavigation$ActivityNavigationLifecycleCallbacks$tosNavHa
     public final boolean invoke(AppActivity appActivity, StoreNavigation.ActivityNavigationLifecycleCallbacks.ModelGlobalNavigation modelGlobalNavigation) {
         m.checkNotNullParameter(appActivity, ActivityChooserModel.ATTRIBUTE_ACTIVITY);
         m.checkNotNullParameter(modelGlobalNavigation, "model");
-        boolean h = appActivity.h(a0.getOrCreateKotlinClass(WidgetTosAccept.class));
+        boolean h = appActivity.h(a0.getOrCreateKotlinClass(WidgetTos.class));
-        boolean z2 = modelGlobalNavigation.getUserRequiredAction() == RequiredAction.AGREEMENTS;
+        boolean z2 = modelGlobalNavigation.getUserRequiredAction() == RequiredAction.TOS_UPDATE_ACKNOWLEDGMENT;
-        if (z2 && !h) {
+        boolean z3 = modelGlobalNavigation.getUserRequiredAction() == RequiredAction.AGREEMENTS;
-            WidgetTosAccept.Companion.show(appActivity);
+        boolean z4 = (z2 || z3) && !h;
-            return true;
+        boolean z5 = !z2 && !z3 && h;
-        } else if (z2 || !h) {
+        if (z4) {
-            return z2;
+            WidgetTos.Companion.show(appActivity, z2);
-        } else {
+        } else if (z5) {
             j.c(appActivity, false, null, 6);
-            return true;
+        } else if (!z2 && !z3) {
+            return false;
         }
+        return true;
     }
 }

app/src/main/java/com/discord/utilities/guilds/GuildCaptchaUtilsKt$handleHttpException$2.java

@@ -31,7 +31,7 @@ public final class GuildCaptchaUtilsKt$handleHttpException$2 extends o implement
 
     public final void invoke(AppFragment appFragment, CaptchaHelper.CaptchaPayload captchaPayload) {
         m.checkNotNullParameter(appFragment, "<anonymous parameter 0>");
-        m.checkNotNullParameter(captchaPayload, "captchaToken");
+        m.checkNotNullParameter(captchaPayload, "captchaPayload");
         GuildJoinHelperKt.joinGuild$default(this.$context, this.$args.getGuildId(), this.$args.isLurker(), this.$args.getSessionId(), this.$args.getDirectoryChannelId(), null, this.$args.getErrorClass(), this.$args.getSubscriptionHandler(), this.$args.getErrorHandler(), captchaPayload, this.$args.getOnNext(), 32, null);
     }
 }

app/src/main/java/com/discord/utilities/rest/SendUtils$compressImageAttachments$1.java

@@ -26,7 +26,7 @@ import kotlin.jvm.functions.Function2;
 import kotlinx.coroutines.CoroutineScope;
 import s.a.k0;
 /* compiled from: SendUtils.kt */
-@e(c = "com.discord.utilities.rest.SendUtils$compressImageAttachments$1", f = "SendUtils.kt", l = {317}, m = "invokeSuspend")
+@e(c = "com.discord.utilities.rest.SendUtils$compressImageAttachments$1", f = "SendUtils.kt", l = {321}, m = "invokeSuspend")
 public final class SendUtils$compressImageAttachments$1 extends k implements Function2<CoroutineScope, Continuation<? super Unit>, Object> {
     public final /* synthetic */ List $attachments;
     public final /* synthetic */ Context $context;

app/src/main/java/com/discord/utilities/rest/SendUtils$handleCaptchaRequired$1.java

@@ -28,7 +28,7 @@ public final class SendUtils$handleCaptchaRequired$1 extends o implements Functi
 
     public final void invoke(AppFragment appFragment, CaptchaHelper.CaptchaPayload captchaPayload) {
         m.checkNotNullParameter(appFragment, "<anonymous parameter 0>");
-        m.checkNotNullParameter(captchaPayload, "captchaToken");
+        m.checkNotNullParameter(captchaPayload, "captchaPayload");
         StoreStream.Companion.getMessages().resendMessageWithCaptcha(this.$messageResult.getChannelId(), this.$messageResult.getNonce(), captchaPayload);
     }
 }

app/src/main/java/com/discord/widgets/auth/WidgetAuthCaptcha$Companion$registerForResult$1.java

@@ -3,6 +3,7 @@ package com.discord.widgets.auth;
 import android.content.Intent;
 import androidx.activity.result.ActivityResult;
 import androidx.activity.result.ActivityResultCallback;
+import com.discord.utilities.captcha.CaptchaHelper;
 import d0.z.d.m;
 import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetAuthCaptcha.kt */
@@ -17,9 +18,14 @@ public final class WidgetAuthCaptcha$Companion$registerForResult$1<O> implements
         m.checkNotNullExpressionValue(activityResult, "activityResult");
         if (activityResult.getResultCode() == -1) {
             Intent data = activityResult.getData();
-            String stringExtra = data != null ? data.getStringExtra("RESULT_EXTRA_CAPTCHA") : null;
+            String str = null;
+            String stringExtra = data != null ? data.getStringExtra("RESULT_EXTRA_TOKEN") : null;
+            Intent data2 = activityResult.getData();
+            if (data2 != null) {
+                str = data2.getStringExtra("RESULT_EXTRA_RQTOKEN");
+            }
             if (stringExtra != null) {
-                this.$callback.invoke(stringExtra);
+                this.$callback.invoke(new CaptchaHelper.CaptchaPayload(stringExtra, str));
             }
         }
     }

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

@@ -20,7 +20,8 @@ import kotlin.jvm.internal.DefaultConstructorMarker;
 public final class WidgetAuthCaptcha extends WidgetCaptcha {
     public static final Companion Companion = new Companion(null);
     private static final String EXTRA_CAPTCHA_ERROR_BODY = "EXTRA_CAPTCHA_ERROR_BODY";
-    private static final String RESULT_EXTRA_TOKEN = "RESULT_EXTRA_CAPTCHA";
+    private static final String RESULT_EXTRA_RQTOKEN = "RESULT_EXTRA_RQTOKEN";
+    private static final String RESULT_EXTRA_TOKEN = "RESULT_EXTRA_TOKEN";
 
     /* compiled from: WidgetAuthCaptcha.kt */
     public static final class Companion {
@@ -50,7 +51,7 @@ public final class WidgetAuthCaptcha extends WidgetCaptcha {
             }
         }
 
-        public final ActivityResultLauncher<Intent> registerForResult(AppFragment appFragment, Function1<? super String, Unit> function1) {
+        public final ActivityResultLauncher<Intent> registerForResult(AppFragment appFragment, Function1<? super CaptchaHelper.CaptchaPayload, Unit> function1) {
             m.checkNotNullParameter(appFragment, "fragment");
             m.checkNotNullParameter(function1, "callback");
             ActivityResultLauncher<Intent> registerForActivityResult = appFragment.registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new WidgetAuthCaptcha$Companion$registerForResult$1(function1));

app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$captchaForgotPasswordLauncher$1.java

@@ -1,11 +1,12 @@
 package com.discord.widgets.auth;
 
+import com.discord.utilities.captcha.CaptchaHelper;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetAuthLogin.kt */
-public final class WidgetAuthLogin$captchaForgotPasswordLauncher$1 extends o implements Function1<String, Unit> {
+public final class WidgetAuthLogin$captchaForgotPasswordLauncher$1 extends o implements Function1<CaptchaHelper.CaptchaPayload, Unit> {
     public final /* synthetic */ WidgetAuthLogin this$0;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
@@ -17,13 +18,13 @@ public final class WidgetAuthLogin$captchaForgotPasswordLauncher$1 extends o imp
     /* 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(String str) {
+    public /* bridge */ /* synthetic */ Unit invoke(CaptchaHelper.CaptchaPayload captchaPayload) {
-        invoke(str);
+        invoke(captchaPayload);
         return Unit.a;
     }
 
-    public final void invoke(String str) {
+    public final void invoke(CaptchaHelper.CaptchaPayload captchaPayload) {
-        m.checkNotNullParameter(str, "token");
+        m.checkNotNullParameter(captchaPayload, "captchaPayload");
-        WidgetAuthLogin.access$forgotPassword(this.this$0, str);
+        WidgetAuthLogin.access$forgotPassword(this.this$0, captchaPayload);
     }
 }

app/src/main/java/com/discord/widgets/auth/WidgetAuthLogin$captchaLoginLauncher$1.java

@@ -1,11 +1,12 @@
 package com.discord.widgets.auth;
 
+import com.discord.utilities.captcha.CaptchaHelper;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetAuthLogin.kt */
-public final class WidgetAuthLogin$captchaLoginLauncher$1 extends o implements Function1<String, Unit> {
+public final class WidgetAuthLogin$captchaLoginLauncher$1 extends o implements Function1<CaptchaHelper.CaptchaPayload, Unit> {
     public final /* synthetic */ WidgetAuthLogin this$0;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
@@ -17,13 +18,13 @@ public final class WidgetAuthLogin$captchaLoginLauncher$1 extends o implements F
     /* 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(String str) {
+    public /* bridge */ /* synthetic */ Unit invoke(CaptchaHelper.CaptchaPayload captchaPayload) {
-        invoke(str);
+        invoke(captchaPayload);
         return Unit.a;
     }
 
-    public final void invoke(String str) {
+    public final void invoke(CaptchaHelper.CaptchaPayload captchaPayload) {
-        m.checkNotNullParameter(str, "token");
+        m.checkNotNullParameter(captchaPayload, "captchaPayload");
-        WidgetAuthLogin.login$default(this.this$0, str, false, 2, null);
+        WidgetAuthLogin.login$default(this.this$0, captchaPayload, false, 2, null);
     }
 }

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

@@ -22,6 +22,7 @@ import com.discord.stores.updates.ObservationDeckProvider;
 import com.discord.utilities.auth.GoogleSmartLockManager;
 import com.discord.utilities.auth.GoogleSmartLockManagerKt;
 import com.discord.utilities.auth.RegistrationFlowRepo;
+import com.discord.utilities.captcha.CaptchaHelper;
 import com.discord.utilities.error.Error;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.view.extensions.ViewExtensions;
@@ -81,8 +82,8 @@ public final class WidgetAuthLogin extends AppFragment {
         this.validationManager$delegate = g.lazy(new WidgetAuthLogin$validationManager$2(this));
     }
 
-    public static final /* synthetic */ void access$forgotPassword(WidgetAuthLogin widgetAuthLogin, String str) {
+    public static final /* synthetic */ void access$forgotPassword(WidgetAuthLogin widgetAuthLogin, CaptchaHelper.CaptchaPayload captchaPayload) {
-        widgetAuthLogin.forgotPassword(str);
+        widgetAuthLogin.forgotPassword(captchaPayload);
     }
 
     public static final /* synthetic */ WidgetAuthLoginBinding access$getBinding$p(WidgetAuthLogin widgetAuthLogin) {
@@ -113,20 +114,20 @@ public final class WidgetAuthLogin extends AppFragment {
         widgetAuthLogin.showEmailSentToast(str);
     }
 
-    private final void forgotPassword(String str) {
+    private final void forgotPassword(CaptchaHelper.CaptchaPayload captchaPayload) {
         String textOrEmpty = getBinding().e.getTextOrEmpty();
         if (textOrEmpty.length() == 0) {
             m.g(getContext(), R.string.login_required, 0, null, 12);
         } else {
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui(StoreStream.Companion.getAuthentication().forgotPassword(textOrEmpty, str)), getBinding().h, 0, 2, null), getContext(), "REST: forgotPassword", (Function1) null, new WidgetAuthLogin$forgotPassword$1(this, textOrEmpty), new WidgetAuthLogin$forgotPassword$2(this, textOrEmpty), (Function0) null, (Function0) null, 100, (Object) null);
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui(StoreStream.Companion.getAuthentication().forgotPassword(textOrEmpty, captchaPayload)), getBinding().h, 0, 2, null), getContext(), "REST: forgotPassword", (Function1) null, new WidgetAuthLogin$forgotPassword$1(this, textOrEmpty), new WidgetAuthLogin$forgotPassword$2(this, textOrEmpty), (Function0) null, (Function0) null, 100, (Object) null);
         }
     }
 
-    public static /* synthetic */ void forgotPassword$default(WidgetAuthLogin widgetAuthLogin, String str, int i, Object obj) {
+    public static /* synthetic */ void forgotPassword$default(WidgetAuthLogin widgetAuthLogin, CaptchaHelper.CaptchaPayload captchaPayload, int i, Object obj) {
         if ((i & 1) != 0) {
-            str = null;
+            captchaPayload = null;
         }
-        widgetAuthLogin.forgotPassword(str);
+        widgetAuthLogin.forgotPassword(captchaPayload);
     }
 
     private final WidgetAuthLoginBinding getBinding() {
@@ -203,41 +204,41 @@ public final class WidgetAuthLogin extends AppFragment {
         getBinding().g.requestFocus();
     }
 
-    private final void login(String str, String str2, String str3, boolean z2) {
+    private final void login(CaptchaHelper.CaptchaPayload captchaPayload, boolean z2) {
-        Context context = getContext();
-        if (context != null) {
-            d0.z.d.m.checkNotNullExpressionValue(context, "context ?: return");
-            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui$default(StoreStream.Companion.getAuthentication().login(str, str2, str3, z2, GoogleSmartLockManagerKt.hasSmartLockCredentials(getMostRecentIntent()) ? RestAPIParams.AuthLogin.LoginSource.LOGIN_SOURCE_KEYCHAIN_AUTO : null), this, null, 2, null), getBinding().h, 0, 2, null), context, "REST: login", (Function1) null, new WidgetAuthLogin$login$1(this, str, str2, context), new WidgetAuthLogin$login$2(this, str), (Function0) null, (Function0) null, 100, (Object) null);
-        }
-    }
-
-    private final void login(String str, boolean z2) {
         if (ValidationManager.validate$default(getValidationManager(), false, 1, null)) {
             String textOrEmpty = getBinding().e.getTextOrEmpty();
             TextInputLayout textInputLayout = getBinding().g;
             d0.z.d.m.checkNotNullExpressionValue(textInputLayout, "binding.authLoginPasswordWrap");
-            login(textOrEmpty, ViewExtensions.getTextOrEmpty(textInputLayout), str, z2);
+            login(textOrEmpty, ViewExtensions.getTextOrEmpty(textInputLayout), captchaPayload, z2);
         }
     }
 
-    public static /* synthetic */ void login$default(WidgetAuthLogin widgetAuthLogin, String str, String str2, String str3, boolean z2, int i, Object obj) {
+    private final void login(String str, String str2, CaptchaHelper.CaptchaPayload captchaPayload, boolean z2) {
-        if ((i & 4) != 0) {
+        Context context = getContext();
-            str3 = null;
+        if (context != null) {
+            d0.z.d.m.checkNotNullExpressionValue(context, "context ?: return");
+            ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui$default(StoreStream.Companion.getAuthentication().login(str, str2, captchaPayload, z2, GoogleSmartLockManagerKt.hasSmartLockCredentials(getMostRecentIntent()) ? RestAPIParams.AuthLogin.LoginSource.LOGIN_SOURCE_KEYCHAIN_AUTO : null), this, null, 2, null), getBinding().h, 0, 2, null), context, "REST: login", (Function1) null, new WidgetAuthLogin$login$1(this, str, str2, context), new WidgetAuthLogin$login$2(this, str), (Function0) null, (Function0) null, 100, (Object) null);
         }
-        if ((i & 8) != 0) {
-            z2 = false;
-        }
-        widgetAuthLogin.login(str, str2, str3, z2);
     }
 
-    public static /* synthetic */ void login$default(WidgetAuthLogin widgetAuthLogin, String str, boolean z2, int i, Object obj) {
+    public static /* synthetic */ void login$default(WidgetAuthLogin widgetAuthLogin, CaptchaHelper.CaptchaPayload captchaPayload, boolean z2, int i, Object obj) {
         if ((i & 1) != 0) {
-            str = null;
+            captchaPayload = null;
         }
         if ((i & 2) != 0) {
             z2 = false;
         }
-        widgetAuthLogin.login(str, z2);
+        widgetAuthLogin.login(captchaPayload, z2);
+    }
+
+    public static /* synthetic */ void login$default(WidgetAuthLogin widgetAuthLogin, String str, String str2, CaptchaHelper.CaptchaPayload captchaPayload, boolean z2, int i, Object obj) {
+        if ((i & 4) != 0) {
+            captchaPayload = null;
+        }
+        if ((i & 8) != 0) {
+            z2 = false;
+        }
+        widgetAuthLogin.login(str, str2, captchaPayload, z2);
     }
 
     private final void onLoginSuccess(String str, String str2) {

app/src/main/java/com/discord/widgets/auth/WidgetAuthMfa$onViewBound$1.java

@@ -16,10 +16,10 @@ public final class WidgetAuthMfa$onViewBound$1<T1, T2> implements Action2<MenuIt
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case R.id.menu_auth_mfa_backup_codes /* 2131364295 */:
+            case R.id.menu_auth_mfa_backup_codes /* 2131364296 */:
                 WidgetAuthMfa.access$showBackupCodesDialog(this.this$0);
                 return;
-            case R.id.menu_auth_mfa_info /* 2131364296 */:
+            case R.id.menu_auth_mfa_info /* 2131364297 */:
                 WidgetAuthMfa.access$showInfoDialog(this.this$0);
                 return;
             default:

app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterAccountInformation$captchaLauncher$1.java

@@ -1,12 +1,13 @@
 package com.discord.widgets.auth;
 
 import com.discord.utilities.auth.RegistrationFlowRepo;
+import com.discord.utilities.captcha.CaptchaHelper;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetAuthRegisterAccountInformation.kt */
-public final class WidgetAuthRegisterAccountInformation$captchaLauncher$1 extends o implements Function1<String, Unit> {
+public final class WidgetAuthRegisterAccountInformation$captchaLauncher$1 extends o implements Function1<CaptchaHelper.CaptchaPayload, Unit> {
     public final /* synthetic */ WidgetAuthRegisterAccountInformation this$0;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
@@ -18,14 +19,14 @@ public final class WidgetAuthRegisterAccountInformation$captchaLauncher$1 extend
     /* 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(String str) {
+    public /* bridge */ /* synthetic */ Unit invoke(CaptchaHelper.CaptchaPayload captchaPayload) {
-        invoke(str);
+        invoke(captchaPayload);
         return Unit.a;
     }
 
-    public final void invoke(String str) {
+    public final void invoke(CaptchaHelper.CaptchaPayload captchaPayload) {
-        m.checkNotNullParameter(str, "token");
+        m.checkNotNullParameter(captchaPayload, "captchaPayload");
         RegistrationFlowRepo.trackTransition$default(RegistrationFlowRepo.Companion.getINSTANCE(), "Captcha", "success", null, 4, null);
-        WidgetAuthRegisterAccountInformation.access$register(this.this$0, str);
+        WidgetAuthRegisterAccountInformation.access$register(this.this$0, captchaPayload);
     }
 }

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

@@ -19,6 +19,7 @@ import com.discord.stores.StoreStream;
 import com.discord.utilities.analytics.AnalyticsTracker;
 import com.discord.utilities.auth.RegistrationFlowRepo;
 import com.discord.utilities.birthday.BirthdayHelper;
+import com.discord.utilities.captcha.CaptchaHelper;
 import com.discord.utilities.error.Error;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.time.TimeUtils;
@@ -72,8 +73,8 @@ public final class WidgetAuthRegisterAccountInformation extends AppFragment {
         return widgetAuthRegisterAccountInformation.isConsentRequired;
     }
 
-    public static final /* synthetic */ void access$register(WidgetAuthRegisterAccountInformation widgetAuthRegisterAccountInformation, String str) {
+    public static final /* synthetic */ void access$register(WidgetAuthRegisterAccountInformation widgetAuthRegisterAccountInformation, CaptchaHelper.CaptchaPayload captchaPayload) {
-        widgetAuthRegisterAccountInformation.register(str);
+        widgetAuthRegisterAccountInformation.register(captchaPayload);
     }
 
     public static final /* synthetic */ void access$setConsentRequired$p(WidgetAuthRegisterAccountInformation widgetAuthRegisterAccountInformation, boolean z2) {
@@ -175,7 +176,7 @@ public final class WidgetAuthRegisterAccountInformation extends AppFragment {
         return true;
     }
 
-    private final void register(String str) {
+    private final void register(CaptchaHelper.CaptchaPayload captchaPayload) {
         if (!this.shouldValidateInputs || ValidationManager.validate$default(getValidationManager(), false, 1, null)) {
             RegistrationFlowRepo.Companion companion = RegistrationFlowRepo.Companion;
             if (companion.getINSTANCE().getBirthday() != null || !this.shouldShowAgeGate) {
@@ -189,7 +190,7 @@ public final class WidgetAuthRegisterAccountInformation extends AppFragment {
                 String phoneToken = companion.getINSTANCE().getPhoneToken();
                 TextInputLayout textInputLayout2 = getBinding().d;
                 m.checkNotNullExpressionValue(textInputLayout2, "binding.authRegisterAccountInformationPasswordWrap");
-                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(authentication.register(textOrEmpty, email, phoneToken, ViewExtensions.getTextOrEmpty(textInputLayout2), str, isConsented(), uTCDateTime), this, null, 2, null), WidgetAuthRegisterAccountInformation.class, getContext(), (Function1) null, new WidgetAuthRegisterAccountInformation$register$2(this), (Function0) null, (Function0) null, WidgetAuthRegisterAccountInformation$register$1.INSTANCE, 52, (Object) null);
+                ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(authentication.register(textOrEmpty, email, phoneToken, ViewExtensions.getTextOrEmpty(textInputLayout2), captchaPayload, isConsented(), uTCDateTime), this, null, 2, null), WidgetAuthRegisterAccountInformation.class, getContext(), (Function1) null, new WidgetAuthRegisterAccountInformation$register$2(this), (Function0) null, (Function0) null, WidgetAuthRegisterAccountInformation$register$1.INSTANCE, 52, (Object) null);
                 return;
             }
             RegistrationFlowRepo.trackTransition$default(companion.getINSTANCE(), "Account Information", "success", null, 4, null);
@@ -200,11 +201,11 @@ public final class WidgetAuthRegisterAccountInformation extends AppFragment {
         RegistrationFlowRepo.trackTransition$default(RegistrationFlowRepo.Companion.getINSTANCE(), "Account Information", "input_error", null, 4, null);
     }
 
-    public static /* synthetic */ void register$default(WidgetAuthRegisterAccountInformation widgetAuthRegisterAccountInformation, String str, int i, Object obj) {
+    public static /* synthetic */ void register$default(WidgetAuthRegisterAccountInformation widgetAuthRegisterAccountInformation, CaptchaHelper.CaptchaPayload captchaPayload, int i, Object obj) {
         if ((i & 1) != 0) {
-            str = null;
+            captchaPayload = null;
         }
-        widgetAuthRegisterAccountInformation.register(str);
+        widgetAuthRegisterAccountInformation.register(captchaPayload);
     }
 
     @Override // com.discord.app.AppFragment, com.discord.app.AppLogger.a

app/src/main/java/com/discord/widgets/auth/WidgetAuthRegisterIdentity$captchaLauncher$1.java

@@ -1,11 +1,12 @@
 package com.discord.widgets.auth;
 
+import com.discord.utilities.captcha.CaptchaHelper;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetAuthRegisterIdentity.kt */
-public final class WidgetAuthRegisterIdentity$captchaLauncher$1 extends o implements Function1<String, Unit> {
+public final class WidgetAuthRegisterIdentity$captchaLauncher$1 extends o implements Function1<CaptchaHelper.CaptchaPayload, Unit> {
     public final /* synthetic */ WidgetAuthRegisterIdentity this$0;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
@@ -17,13 +18,13 @@ public final class WidgetAuthRegisterIdentity$captchaLauncher$1 extends o implem
     /* 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(String str) {
+    public /* bridge */ /* synthetic */ Unit invoke(CaptchaHelper.CaptchaPayload captchaPayload) {
-        invoke(str);
+        invoke(captchaPayload);
         return Unit.a;
     }
 
-    public final void invoke(String str) {
+    public final void invoke(CaptchaHelper.CaptchaPayload captchaPayload) {
-        m.checkNotNullParameter(str, "token");
+        m.checkNotNullParameter(captchaPayload, "captchaPayload");
-        WidgetAuthRegisterIdentity.access$registerViaPhone(this.this$0, str);
+        WidgetAuthRegisterIdentity.access$registerViaPhone(this.this$0, captchaPayload);
     }
 }

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

@@ -22,6 +22,7 @@ import com.discord.stores.updates.ObservationDeck;
 import com.discord.stores.updates.ObservationDeckProvider;
 import com.discord.stores.utilities.RestCallStateKt;
 import com.discord.utilities.auth.RegistrationFlowRepo;
+import com.discord.utilities.captcha.CaptchaHelper;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.utilities.view.extensions.ViewExtensions;
@@ -89,8 +90,8 @@ public final class WidgetAuthRegisterIdentity extends AppFragment {
         widgetAuthRegisterIdentity.handleNext();
     }
 
-    public static final /* synthetic */ void access$registerViaPhone(WidgetAuthRegisterIdentity widgetAuthRegisterIdentity, String str) {
+    public static final /* synthetic */ void access$registerViaPhone(WidgetAuthRegisterIdentity widgetAuthRegisterIdentity, CaptchaHelper.CaptchaPayload captchaPayload) {
-        widgetAuthRegisterIdentity.registerViaPhone(str);
+        widgetAuthRegisterIdentity.registerViaPhone(captchaPayload);
     }
 
     public static final /* synthetic */ void access$setInputMode(WidgetAuthRegisterIdentity widgetAuthRegisterIdentity, PhoneOrEmailInputView.Mode mode) {
@@ -183,17 +184,17 @@ public final class WidgetAuthRegisterIdentity extends AppFragment {
         j.e(requireContext(), WidgetAuthRegisterAccountInformation.class, null, 4);
     }
 
-    private final void registerViaPhone(String str) {
+    private final void registerViaPhone(CaptchaHelper.CaptchaPayload captchaPayload) {
         String textOrEmpty = getBinding().d.getTextOrEmpty();
         RegistrationFlowRepo.Companion.getINSTANCE().setPhone(textOrEmpty);
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui$default(RestCallStateKt.logNetworkAction(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().postAuthRegisterPhone(new RestAPIParams.AuthRegisterPhone(textOrEmpty, str)), false, 1, null), WidgetAuthRegisterIdentity$registerViaPhone$1.INSTANCE), this, null, 2, null), getBinding().h, 0, 2, null), WidgetAuthRegisterIdentity.class, getContext(), (Function1) null, new WidgetAuthRegisterIdentity$registerViaPhone$3(this), (Function0) null, (Function0) null, new WidgetAuthRegisterIdentity$registerViaPhone$2(this, textOrEmpty), 52, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.withDimmer$default(ObservableExtensionsKt.ui$default(RestCallStateKt.logNetworkAction(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().postAuthRegisterPhone(new RestAPIParams.AuthRegisterPhone(textOrEmpty, captchaPayload != null ? captchaPayload.getCaptchaKey() : null, captchaPayload != null ? captchaPayload.getCaptchaRqtoken() : null)), false, 1, null), WidgetAuthRegisterIdentity$registerViaPhone$1.INSTANCE), this, null, 2, null), getBinding().h, 0, 2, null), WidgetAuthRegisterIdentity.class, getContext(), (Function1) null, new WidgetAuthRegisterIdentity$registerViaPhone$3(this), (Function0) null, (Function0) null, new WidgetAuthRegisterIdentity$registerViaPhone$2(this, textOrEmpty), 52, (Object) null);
     }
 
-    public static /* synthetic */ void registerViaPhone$default(WidgetAuthRegisterIdentity widgetAuthRegisterIdentity, String str, int i, Object obj) {
+    public static /* synthetic */ void registerViaPhone$default(WidgetAuthRegisterIdentity widgetAuthRegisterIdentity, CaptchaHelper.CaptchaPayload captchaPayload, int i, Object obj) {
         if ((i & 1) != 0) {
-            str = null;
+            captchaPayload = null;
         }
-        widgetAuthRegisterIdentity.registerViaPhone(str);
+        widgetAuthRegisterIdentity.registerViaPhone(captchaPayload);
     }
 
     private final void setInputMode(PhoneOrEmailInputView.Mode mode) {

app/src/main/java/com/discord/widgets/auth/WidgetOauth2Authorize$captchaLauncher$1.java

@@ -1,11 +1,12 @@
 package com.discord.widgets.auth;
 
+import com.discord.utilities.captcha.CaptchaHelper;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetOauth2Authorize.kt */
-public final class WidgetOauth2Authorize$captchaLauncher$1 extends o implements Function1<String, Unit> {
+public final class WidgetOauth2Authorize$captchaLauncher$1 extends o implements Function1<CaptchaHelper.CaptchaPayload, Unit> {
     public final /* synthetic */ WidgetOauth2Authorize this$0;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
@@ -17,13 +18,13 @@ public final class WidgetOauth2Authorize$captchaLauncher$1 extends o implements
     /* 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(String str) {
+    public /* bridge */ /* synthetic */ Unit invoke(CaptchaHelper.CaptchaPayload captchaPayload) {
-        invoke(str);
+        invoke(captchaPayload);
         return Unit.a;
     }
 
-    public final void invoke(String str) {
+    public final void invoke(CaptchaHelper.CaptchaPayload captchaPayload) {
-        m.checkNotNullParameter(str, "token");
+        m.checkNotNullParameter(captchaPayload, "captchaPayload");
-        WidgetOauth2Authorize.access$authorizeApplication(this.this$0, str);
+        WidgetOauth2Authorize.access$authorizeApplication(this.this$0, captchaPayload);
     }
 }

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

@@ -226,11 +226,14 @@ public class WidgetOauth2Authorize extends AppFragment {
             return false;
         }
 
-        public static /* synthetic */ Observable post$default(OAuth2Authorize oAuth2Authorize, String str, int i, Object obj) {
+        public static /* synthetic */ Observable post$default(OAuth2Authorize oAuth2Authorize, String str, String str2, int i, Object obj) {
             if ((i & 1) != 0) {
                 str = null;
             }
-            return oAuth2Authorize.post(str);
+            if ((i & 2) != 0) {
+                str2 = null;
+            }
+            return oAuth2Authorize.post(str, str2);
         }
 
         public final long component1() {
@@ -364,8 +367,8 @@ public class WidgetOauth2Authorize extends AppFragment {
             return getHasBotPermission();
         }
 
-        public final Observable<RestAPIParams.OAuth2Authorize.ResponsePost> post(String str) {
+        public final Observable<RestAPIParams.OAuth2Authorize.ResponsePost> post(String str, String str2) {
-            return RestAPI.Companion.getApi().postOauth2Authorize(String.valueOf(this.clientId), this.state, this.responseType, this.redirectUrl, this.prompt, this.scope, this.permissions, this.codeChallenge, this.codeChallengeMethod, h0.plus(g0.mapOf(o.to("authorize", "true")), str != null ? g0.mapOf(o.to(CaptchaHelper.CAPTCHA_KEY, str)) : h0.emptyMap()));
+            return RestAPI.Companion.getApi().postOauth2Authorize(String.valueOf(this.clientId), this.state, this.responseType, this.redirectUrl, this.prompt, this.scope, this.permissions, this.codeChallenge, this.codeChallengeMethod, h0.plus(h0.plus(g0.mapOf(o.to("authorize", "true")), str != null ? g0.mapOf(o.to(CaptchaHelper.CAPTCHA_KEY, str)) : h0.emptyMap()), str2 != null ? g0.mapOf(o.to("captcha_rqtoken", str2)) : h0.emptyMap()));
         }
 
         public String toString() {
@@ -478,16 +481,16 @@ public class WidgetOauth2Authorize extends AppFragment {
         this.adapter = new SimpleRecyclerAdapter<>(null, WidgetOauth2Authorize$adapter$1.INSTANCE, 1, null);
     }
 
-    public static final /* synthetic */ void access$authorizeApplication(WidgetOauth2Authorize widgetOauth2Authorize, String str) {
+    public static final /* synthetic */ void access$authorizeApplication(WidgetOauth2Authorize widgetOauth2Authorize, CaptchaHelper.CaptchaPayload captchaPayload) {
-        widgetOauth2Authorize.authorizeApplication(str);
+        widgetOauth2Authorize.authorizeApplication(captchaPayload);
     }
 
     public static final /* synthetic */ ValidationManager access$getValidationManager$p(WidgetOauth2Authorize widgetOauth2Authorize) {
         return widgetOauth2Authorize.getValidationManager();
     }
 
-    private final void authorizeApplication(String str) {
+    private final void authorizeApplication(CaptchaHelper.CaptchaPayload captchaPayload) {
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(getOauth2ViewModel().getOauthAuthorize().post(str), false, 1, null), this, null, 2, null), getClass(), (Context) null, (Function1) null, new WidgetOauth2Authorize$authorizeApplication$1(this), (Function0) null, (Function0) null, new WidgetOauth2Authorize$authorizeApplication$2(this), 54, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(getOauth2ViewModel().getOauthAuthorize().post(captchaPayload != null ? captchaPayload.getCaptchaKey() : null, captchaPayload != null ? captchaPayload.getCaptchaRqtoken() : null), false, 1, null), this, null, 2, null), getClass(), (Context) null, (Function1) null, new WidgetOauth2Authorize$authorizeApplication$1(this), (Function0) null, (Function0) null, new WidgetOauth2Authorize$authorizeApplication$2(this), 54, (Object) null);
     }
 
     private final void configureAgeNoticeUI(long j) {

app/src/main/java/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$captchaLauncher$1.java

@@ -1,12 +1,13 @@
 package com.discord.widgets.auth;
 
+import com.discord.utilities.captcha.CaptchaHelper;
 import com.discord.widgets.auth.WidgetOauth2AuthorizeSamsung;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 /* compiled from: WidgetOauth2AuthorizeSamsung.kt */
-public final class WidgetOauth2AuthorizeSamsung$captchaLauncher$1 extends o implements Function1<String, Unit> {
+public final class WidgetOauth2AuthorizeSamsung$captchaLauncher$1 extends o implements Function1<CaptchaHelper.CaptchaPayload, Unit> {
     public final /* synthetic */ WidgetOauth2AuthorizeSamsung this$0;
 
     /* JADX INFO: super call moved to the top of the method (can break code semantics) */
@@ -18,16 +19,16 @@ public final class WidgetOauth2AuthorizeSamsung$captchaLauncher$1 extends o impl
     /* 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(String str) {
+    public /* bridge */ /* synthetic */ Unit invoke(CaptchaHelper.CaptchaPayload captchaPayload) {
-        invoke(str);
+        invoke(captchaPayload);
         return Unit.a;
     }
 
-    public final void invoke(String str) {
+    public final void invoke(CaptchaHelper.CaptchaPayload captchaPayload) {
-        m.checkNotNullParameter(str, "token");
+        m.checkNotNullParameter(captchaPayload, "captchaPayload");
         String access$getSamsungAuthCode$p = WidgetOauth2AuthorizeSamsung.access$getSamsungAuthCode$p(this.this$0);
         if (access$getSamsungAuthCode$p != null) {
-            WidgetOauth2AuthorizeSamsung.access$authorizeForSamsung(this.this$0, access$getSamsungAuthCode$p, str);
+            WidgetOauth2AuthorizeSamsung.access$authorizeForSamsung(this.this$0, access$getSamsungAuthCode$p, captchaPayload);
         } else {
             WidgetOauth2AuthorizeSamsung.Companion.logW$default(WidgetOauth2AuthorizeSamsung.Companion, "auth code not set", null, 2, null);
         }

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

@@ -14,6 +14,7 @@ import com.discord.app.AppLog;
 import com.discord.restapi.RestAPIParams;
 import com.discord.samsung.SamsungConnect$SamsungCallbackException;
 import com.discord.samsung.SamsungConnectActivity;
+import com.discord.utilities.captcha.CaptchaHelper;
 import com.discord.utilities.rest.RestAPI;
 import com.discord.utilities.rx.ObservableExtensionsKt;
 import com.discord.widgets.auth.WidgetOauth2Authorize;
@@ -100,8 +101,8 @@ public final class WidgetOauth2AuthorizeSamsung extends WidgetOauth2Authorize {
         this.samsungDisclaimerLauncher = registerForActivityResult2;
     }
 
-    public static final /* synthetic */ void access$authorizeForSamsung(WidgetOauth2AuthorizeSamsung widgetOauth2AuthorizeSamsung, String str, String str2) {
+    public static final /* synthetic */ void access$authorizeForSamsung(WidgetOauth2AuthorizeSamsung widgetOauth2AuthorizeSamsung, String str, CaptchaHelper.CaptchaPayload captchaPayload) {
-        widgetOauth2AuthorizeSamsung.authorizeForSamsung(str, str2);
+        widgetOauth2AuthorizeSamsung.authorizeForSamsung(str, captchaPayload);
     }
 
     public static final /* synthetic */ String access$getSamsungAuthCode$p(WidgetOauth2AuthorizeSamsung widgetOauth2AuthorizeSamsung) {
@@ -128,8 +129,8 @@ public final class WidgetOauth2AuthorizeSamsung extends WidgetOauth2Authorize {
         widgetOauth2AuthorizeSamsung.samsungAuthCode = str;
     }
 
-    private final void authorizeForSamsung(String str, String str2) {
+    private final void authorizeForSamsung(String str, CaptchaHelper.CaptchaPayload captchaPayload) {
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(getOauth2ViewModel().getOauthAuthorize().post(str2), false, 1, null), this, null, 2, null), WidgetOauth2AuthorizeSamsung.class, (Context) null, (Function1) null, new WidgetOauth2AuthorizeSamsung$authorizeForSamsung$1(this), (Function0) null, (Function0) null, new WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2(this, str), 54, (Object) null);
+        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(getOauth2ViewModel().getOauthAuthorize().post(captchaPayload != null ? captchaPayload.getCaptchaKey() : null, captchaPayload != null ? captchaPayload.getCaptchaRqtoken() : null), false, 1, null), this, null, 2, null), WidgetOauth2AuthorizeSamsung.class, (Context) null, (Function1) null, new WidgetOauth2AuthorizeSamsung$authorizeForSamsung$1(this), (Function0) null, (Function0) null, new WidgetOauth2AuthorizeSamsung$authorizeForSamsung$2(this, str), 54, (Object) null);
     }
 
     private final void handleConnectActivityFailure(SamsungConnectActivity.Result.Failure failure) {

app/src/main/java/com/discord/widgets/channels/permissions/WidgetChannelSettingsEditPermissions.java

@@ -99,68 +99,68 @@ public final class WidgetChannelSettingsEditPermissions extends AppFragment {
         @SuppressLint({"NonConstantResourceId"})
         private final long getPermission(@IdRes int i) {
             switch (i) {
-                case R.id.channel_permission_events_manage_events /* 2131362372 */:
+                case R.id.channel_permission_events_manage_events /* 2131362373 */:
                     return Permission.MANAGE_EVENTS;
-                case R.id.channel_permission_general_create_instant_invite /* 2131362373 */:
+                case R.id.channel_permission_general_create_instant_invite /* 2131362374 */:
                     return 1;
-                case R.id.channel_permission_general_manage_channel /* 2131362374 */:
+                case R.id.channel_permission_general_manage_channel /* 2131362375 */:
                     return 16;
-                case R.id.channel_permission_general_manage_permissions /* 2131362375 */:
+                case R.id.channel_permission_general_manage_permissions /* 2131362376 */:
                     return Permission.MANAGE_ROLES;
-                case R.id.channel_permission_general_manage_threads /* 2131362376 */:
+                case R.id.channel_permission_general_manage_threads /* 2131362377 */:
                     return Permission.MANAGE_THREADS;
-                case R.id.channel_permission_general_manage_webhooks /* 2131362377 */:
+                case R.id.channel_permission_general_manage_webhooks /* 2131362378 */:
                     return Permission.MANAGE_WEBHOOKS;
-                case R.id.channel_permission_owner_view /* 2131362378 */:
+                case R.id.channel_permission_owner_view /* 2131362379 */:
                 default:
                     throw new IllegalArgumentException(a.p("Invalid ID: ", i));
-                case R.id.channel_permission_stage_request_to_speak /* 2131362379 */:
+                case R.id.channel_permission_stage_request_to_speak /* 2131362380 */:
                     return Permission.REQUEST_TO_SPEAK;
-                case R.id.channel_permission_text_add_reactions /* 2131362380 */:
+                case R.id.channel_permission_text_add_reactions /* 2131362381 */:
                     return 64;
-                case R.id.channel_permission_text_attach_files /* 2131362381 */:
+                case R.id.channel_permission_text_attach_files /* 2131362382 */:
                     return Permission.ATTACH_FILES;
-                case R.id.channel_permission_text_create_private_threads /* 2131362382 */:
+                case R.id.channel_permission_text_create_private_threads /* 2131362383 */:
                     return Permission.CREATE_PRIVATE_THREADS;
-                case R.id.channel_permission_text_create_public_threads /* 2131362383 */:
+                case R.id.channel_permission_text_create_public_threads /* 2131362384 */:
                     return Permission.CREATE_PUBLIC_THREADS;
-                case R.id.channel_permission_text_embed_links /* 2131362384 */:
+                case R.id.channel_permission_text_embed_links /* 2131362385 */:
                     return Permission.EMBED_LINKS;
-                case R.id.channel_permission_text_manage_messages /* 2131362385 */:
+                case R.id.channel_permission_text_manage_messages /* 2131362386 */:
                     return Permission.MANAGE_MESSAGES;
-                case R.id.channel_permission_text_mention_everyone /* 2131362386 */:
+                case R.id.channel_permission_text_mention_everyone /* 2131362387 */:
                     return Permission.MENTION_EVERYONE;
-                case R.id.channel_permission_text_read_message_history /* 2131362387 */:
+                case R.id.channel_permission_text_read_message_history /* 2131362388 */:
                     return Permission.READ_MESSAGE_HISTORY;
-                case R.id.channel_permission_text_read_messages /* 2131362388 */:
+                case R.id.channel_permission_text_read_messages /* 2131362389 */:
                     return Permission.VIEW_CHANNEL;
-                case R.id.channel_permission_text_send_messages /* 2131362389 */:
+                case R.id.channel_permission_text_send_messages /* 2131362390 */:
                     return Permission.SEND_MESSAGES;
-                case R.id.channel_permission_text_send_messages_in_threads /* 2131362390 */:
+                case R.id.channel_permission_text_send_messages_in_threads /* 2131362391 */:
                     return Permission.SEND_MESSAGES_IN_THREADS;
-                case R.id.channel_permission_text_send_tts_messages /* 2131362391 */:
+                case R.id.channel_permission_text_send_tts_messages /* 2131362392 */:
                     return Permission.SEND_TTS_MESSAGES;
-                case R.id.channel_permission_text_use_external_emojis /* 2131362392 */:
+                case R.id.channel_permission_text_use_external_emojis /* 2131362393 */:
                     return Permission.USE_EXTERNAL_EMOJIS;
-                case R.id.channel_permission_text_use_external_stickers /* 2131362393 */:
+                case R.id.channel_permission_text_use_external_stickers /* 2131362394 */:
                     return Permission.USE_EXTERNAL_STICKERS;
-                case R.id.channel_permission_use_application_commands /* 2131362394 */:
+                case R.id.channel_permission_use_application_commands /* 2131362395 */:
                     return Permission.USE_APPLICATION_COMMANDS;
-                case R.id.channel_permission_voice_connect /* 2131362395 */:
+                case R.id.channel_permission_voice_connect /* 2131362396 */:
                     return Permission.CONNECT;
-                case R.id.channel_permission_voice_deafen_members /* 2131362396 */:
+                case R.id.channel_permission_voice_deafen_members /* 2131362397 */:
                     return Permission.DEAFEN_MEMBERS;
-                case R.id.channel_permission_voice_move_members /* 2131362397 */:
+                case R.id.channel_permission_voice_move_members /* 2131362398 */:
                     return Permission.MOVE_MEMBERS;
-                case R.id.channel_permission_voice_mute_members /* 2131362398 */:
+                case R.id.channel_permission_voice_mute_members /* 2131362399 */:
                     return Permission.MUTE_MEMBERS;
-                case R.id.channel_permission_voice_priority_speaker /* 2131362399 */:
+                case R.id.channel_permission_voice_priority_speaker /* 2131362400 */:
                     return 256;
-                case R.id.channel_permission_voice_speak /* 2131362400 */:
+                case R.id.channel_permission_voice_speak /* 2131362401 */:
                     return Permission.SPEAK;
-                case R.id.channel_permission_voice_use_vad /* 2131362401 */:
+                case R.id.channel_permission_voice_use_vad /* 2131362402 */:
                     return Permission.USE_VAD;
-                case R.id.channel_permission_voice_video /* 2131362402 */:
+                case R.id.channel_permission_voice_video /* 2131362403 */:
                     return 512;
             }
         }

app/src/main/java/com/discord/widgets/channels/settings/WidgetTextChannelSettings$configureUI$1.java

@@ -21,7 +21,7 @@ public final class WidgetTextChannelSettings$configureUI$1<T1, T2> implements Ac
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case R.id.menu_channel_settings_delete /* 2131364301 */:
+            case R.id.menu_channel_settings_delete /* 2131364302 */:
                 if (this.$this_configureUI.isPublicGuildRulesChannel() || this.$this_configureUI.isPublicGuildUpdatesChannel()) {
                     WidgetTextChannelSettings.access$cannotDeleteWarn(this.this$0, this.$this_configureUI.isPublicGuildRulesChannel());
                     return;
@@ -29,7 +29,7 @@ public final class WidgetTextChannelSettings$configureUI$1<T1, T2> implements Ac
                     WidgetTextChannelSettings.access$confirmDelete(this.this$0, this.$this_configureUI.getChannel());
                     return;
                 }
-            case R.id.menu_channel_settings_reset /* 2131364302 */:
+            case R.id.menu_channel_settings_reset /* 2131364303 */:
                 StoreUserGuildSettings userGuildSettings = StoreStream.Companion.getUserGuildSettings();
                 m.checkNotNullExpressionValue(context, "context");
                 userGuildSettings.setChannelNotificationsDefault(context, this.$this_configureUI.getChannel());

app/src/main/java/com/discord/widgets/channels/threads/browser/WidgetThreadBrowser$updateMenu$1.java

@@ -19,11 +19,11 @@ public final class WidgetThreadBrowser$updateMenu$1<T1, T2> implements Action2<M
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case R.id.menu_thread_browser_create_thread /* 2131364347 */:
+            case R.id.menu_thread_browser_create_thread /* 2131364348 */:
                 ChannelSelector.openCreateThread$default(ChannelSelector.Companion.getInstance(), WidgetThreadBrowser.access$getGuildId$p(this.this$0), WidgetThreadBrowser.access$getChannelId$p(this.this$0), null, "Thread Browser Toolbar", 4, null);
                 this.this$0.requireAppActivity().finish();
                 return;
-            case R.id.menu_thread_browser_filters /* 2131364348 */:
+            case R.id.menu_thread_browser_filters /* 2131364349 */:
                 WidgetThreadBrowserFilterSheet.Companion companion = WidgetThreadBrowserFilterSheet.Companion;
                 FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
                 m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");

app/src/main/java/com/discord/widgets/chat/list/adapter/WidgetChatListAdapterItemSystemMessage$onConfigure$1.java

@@ -30,10 +30,10 @@ public final class WidgetChatListAdapterItemSystemMessage$onConfigure$1 implemen
         if (type != null && type.intValue() == 7) {
             WidgetChatListAdapterItemSystemMessage.access$getAdapter$p(this.this$0).getEventHandler().onMessageAuthorNameClicked(this.$message, WidgetChatListAdapterItemSystemMessage.access$getAdapter$p(this.this$0).getData().getGuildId());
         } else if ((type != null && type.intValue() == 8) || ((type != null && type.intValue() == 9) || ((type != null && type.intValue() == 10) || (type != null && type.intValue() == 11)))) {
-            boolean z2 = false;
+            boolean z2 = true;
-            Experiment guildExperiment = this.$storeExperiments.getGuildExperiment("2022-01_boost_announcement_upsell", WidgetChatListAdapterItemSystemMessage.access$getAdapter$p(this.this$0).getData().getGuildId(), false);
+            Experiment guildExperiment = this.$storeExperiments.getGuildExperiment("2022-01_boost_announcement_upsell", WidgetChatListAdapterItemSystemMessage.access$getAdapter$p(this.this$0).getData().getGuildId(), true);
-            if (guildExperiment != null && guildExperiment.getBucket() == 1) {
+            if (guildExperiment == null || guildExperiment.getBucket() != 1) {
-                z2 = true;
+                z2 = false;
             }
             if (z2) {
                 AnalyticsTracker.guildBoostPromotionOpened$default(AnalyticsTracker.INSTANCE, WidgetChatListAdapterItemSystemMessage.access$getAdapter$p(this.this$0).getData().getGuildId(), new Traits.Location(null, Traits.Location.Section.CHANNEL_TEXT_AREA, Traits.Location.Obj.BOOST_GEM_ICON, null, null, 25, null), null, 4, null);

app/src/main/java/com/discord/widgets/friends/WidgetFriendsList$configureToolbar$1.java

@@ -27,19 +27,19 @@ public final class WidgetFriendsList$configureToolbar$1<T1, T2> implements Actio
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case R.id.menu_friends_add_friend /* 2131364321 */:
+            case R.id.menu_friends_add_friend /* 2131364322 */:
                 WidgetFriendsAdd.Companion companion = WidgetFriendsAdd.Companion;
                 m.checkNotNullExpressionValue(context, "context");
                 WidgetFriendsAdd.Companion.show$default(companion, context, null, "Friends", 2, null);
                 return;
-            case R.id.menu_friends_contact_sync /* 2131364322 */:
+            case R.id.menu_friends_contact_sync /* 2131364323 */:
                 ContactSyncFlowAnalytics.Companion.trackStart$default(ContactSyncFlowAnalytics.Companion, false, g0.mapOf(o.to("location_page", "Friends List Icon")), 1, null);
                 AnalyticsTracker.INSTANCE.openModal("Contact Sync", new Traits.Location("Friends List Icon", null, null, null, null, 30, null));
                 WidgetContactSync.Companion companion2 = WidgetContactSync.Companion;
                 m.checkNotNullExpressionValue(context, "context");
                 WidgetContactSync.Companion.launch$default(companion2, context, null, false, false, false, 30, null);
                 return;
-            case R.id.menu_friends_start_group /* 2131364323 */:
+            case R.id.menu_friends_start_group /* 2131364324 */:
                 if (GroupInviteFriendsSheetFeatureFlag.Companion.getINSTANCE().isEnabled()) {
                     GroupInviteFriendsSheet.Companion companion3 = GroupInviteFriendsSheet.Companion;
                     FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();

app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$binding$2.java

@@ -22,29 +22,25 @@ public final /* synthetic */ class WidgetGuildInvite$binding$2 extends k impleme
 
     public final WidgetGuildInvitePageBinding invoke(View view) {
         m.checkNotNullParameter(view, "p1");
-        int i = R.id.guild_invite_accept;
+        int i = R.id.guild_invite_actions;
-        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.guild_invite_accept);
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.guild_invite_actions);
-        if (materialButton != null) {
+        if (linearLayout != null) {
-            i = R.id.guild_invite_actions;
+            i = R.id.guild_invite_cancel;
-            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.guild_invite_actions);
+            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.guild_invite_cancel);
-            if (linearLayout != null) {
+            if (materialButton != null) {
-                i = R.id.guild_invite_cancel;
+                i = R.id.guild_invite_event_info;
-                MaterialButton materialButton2 = (MaterialButton) view.findViewById(R.id.guild_invite_cancel);
+                GuildScheduledEventItemView guildScheduledEventItemView = (GuildScheduledEventItemView) view.findViewById(R.id.guild_invite_event_info);
-                if (materialButton2 != null) {
+                if (guildScheduledEventItemView != null) {
-                    i = R.id.guild_invite_event_info;
+                    i = R.id.guild_invite_info;
-                    GuildScheduledEventItemView guildScheduledEventItemView = (GuildScheduledEventItemView) view.findViewById(R.id.guild_invite_event_info);
+                    WidgetInviteInfo widgetInviteInfo = (WidgetInviteInfo) view.findViewById(R.id.guild_invite_info);
-                    if (guildScheduledEventItemView != null) {
+                    if (widgetInviteInfo != null) {
-                        i = R.id.guild_invite_info;
+                        i = R.id.scroll_view;
-                        WidgetInviteInfo widgetInviteInfo = (WidgetInviteInfo) view.findViewById(R.id.guild_invite_info);
+                        NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(R.id.scroll_view);
-                        if (widgetInviteInfo != null) {
+                        if (nestedScrollView != null) {
-                            i = R.id.scroll_view;
+                            i = R.id.toolbar;
-                            NestedScrollView nestedScrollView = (NestedScrollView) view.findViewById(R.id.scroll_view);
+                            AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(R.id.toolbar);
-                            if (nestedScrollView != null) {
+                            if (appBarLayout != null) {
-                                i = R.id.toolbar;
+                                return new WidgetGuildInvitePageBinding((ConstraintLayout) view, linearLayout, materialButton, guildScheduledEventItemView, widgetInviteInfo, nestedScrollView, appBarLayout);
-                                AppBarLayout appBarLayout = (AppBarLayout) view.findViewById(R.id.toolbar);
-                                if (appBarLayout != null) {
-                                    return new WidgetGuildInvitePageBinding((ConstraintLayout) view, materialButton, linearLayout, materialButton2, guildScheduledEventItemView, widgetInviteInfo, nestedScrollView, appBarLayout);
-                                }
                             }
                         }
                     }

app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite$configureLoadedUI$onAcceptClick$1.java

@@ -2,7 +2,6 @@ package com.discord.widgets.guilds.invite;
 
 import android.content.Context;
 import android.content.Intent;
-import android.view.View;
 import b.a.d.j;
 import com.discord.api.guild.Guild;
 import com.discord.api.guildscheduledevent.GuildScheduledEvent;
@@ -16,26 +15,28 @@ import d0.w.i.a.b;
 import d0.w.i.a.e;
 import d0.w.i.a.k;
 import d0.z.d.m;
+import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.coroutines.Continuation;
+import kotlin.jvm.functions.Function0;
 import kotlin.jvm.functions.Function2;
 /* compiled from: WidgetGuildInvite.kt */
-public final class WidgetGuildInvite$configureLoadedUI$2 implements View.OnClickListener {
+public final class WidgetGuildInvite$configureLoadedUI$onAcceptClick$1 extends o implements Function0<Unit> {
     public final /* synthetic */ ModelInvite $invite;
     public final /* synthetic */ WidgetGuildInvite this$0;
 
     /* compiled from: WidgetGuildInvite.kt */
-    @e(c = "com.discord.widgets.guilds.invite.WidgetGuildInvite$configureLoadedUI$2$1", f = "WidgetGuildInvite.kt", l = {}, m = "invokeSuspend")
+    @e(c = "com.discord.widgets.guilds.invite.WidgetGuildInvite$configureLoadedUI$onAcceptClick$1$1", f = "WidgetGuildInvite.kt", l = {}, m = "invokeSuspend")
-    /* renamed from: com.discord.widgets.guilds.invite.WidgetGuildInvite$configureLoadedUI$2$1  reason: invalid class name */
+    /* renamed from: com.discord.widgets.guilds.invite.WidgetGuildInvite$configureLoadedUI$onAcceptClick$1$1  reason: invalid class name */
     public static final class AnonymousClass1 extends k implements Function2<Error, Continuation<? super Unit>, Object> {
         private /* synthetic */ Object L$0;
         public int label;
-        public final /* synthetic */ WidgetGuildInvite$configureLoadedUI$2 this$0;
+        public final /* synthetic */ WidgetGuildInvite$configureLoadedUI$onAcceptClick$1 this$0;
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public AnonymousClass1(WidgetGuildInvite$configureLoadedUI$2 widgetGuildInvite$configureLoadedUI$2, Continuation continuation) {
+        public AnonymousClass1(WidgetGuildInvite$configureLoadedUI$onAcceptClick$1 widgetGuildInvite$configureLoadedUI$onAcceptClick$1, Continuation continuation) {
             super(2, continuation);
-            this.this$0 = widgetGuildInvite$configureLoadedUI$2;
+            this.this$0 = widgetGuildInvite$configureLoadedUI$onAcceptClick$1;
         }
 
         @Override // d0.w.i.a.a
@@ -65,17 +66,17 @@ public final class WidgetGuildInvite$configureLoadedUI$2 implements View.OnClick
     }
 
     /* compiled from: WidgetGuildInvite.kt */
-    @e(c = "com.discord.widgets.guilds.invite.WidgetGuildInvite$configureLoadedUI$2$2", f = "WidgetGuildInvite.kt", l = {}, m = "invokeSuspend")
+    @e(c = "com.discord.widgets.guilds.invite.WidgetGuildInvite$configureLoadedUI$onAcceptClick$1$2", f = "WidgetGuildInvite.kt", l = {}, m = "invokeSuspend")
-    /* renamed from: com.discord.widgets.guilds.invite.WidgetGuildInvite$configureLoadedUI$2$2  reason: invalid class name */
+    /* renamed from: com.discord.widgets.guilds.invite.WidgetGuildInvite$configureLoadedUI$onAcceptClick$1$2  reason: invalid class name */
     public static final class AnonymousClass2 extends k implements Function2<ModelInvite, Continuation<? super Unit>, Object> {
         private /* synthetic */ Object L$0;
         public int label;
-        public final /* synthetic */ WidgetGuildInvite$configureLoadedUI$2 this$0;
+        public final /* synthetic */ WidgetGuildInvite$configureLoadedUI$onAcceptClick$1 this$0;
 
         /* JADX INFO: super call moved to the top of the method (can break code semantics) */
-        public AnonymousClass2(WidgetGuildInvite$configureLoadedUI$2 widgetGuildInvite$configureLoadedUI$2, Continuation continuation) {
+        public AnonymousClass2(WidgetGuildInvite$configureLoadedUI$onAcceptClick$1 widgetGuildInvite$configureLoadedUI$onAcceptClick$1, Continuation continuation) {
             super(2, continuation);
-            this.this$0 = widgetGuildInvite$configureLoadedUI$2;
+            this.this$0 = widgetGuildInvite$configureLoadedUI$onAcceptClick$1;
         }
 
         @Override // d0.w.i.a.a
@@ -123,13 +124,16 @@ public final class WidgetGuildInvite$configureLoadedUI$2 implements View.OnClick
         }
     }
 
-    public WidgetGuildInvite$configureLoadedUI$2(WidgetGuildInvite widgetGuildInvite, ModelInvite modelInvite) {
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetGuildInvite$configureLoadedUI$onAcceptClick$1(WidgetGuildInvite widgetGuildInvite, ModelInvite modelInvite) {
+        super(0);
         this.this$0 = widgetGuildInvite;
         this.$invite = modelInvite;
     }
 
-    @Override // android.view.View.OnClickListener
+    @Override // kotlin.jvm.functions.Function0
-    public final void onClick(View view) {
+    /* renamed from: invoke */
+    public final void mo1invoke() {
         InviteJoinHelper.joinViaInvite$default(InviteJoinHelper.INSTANCE, this.$invite, this.this$0.getClass(), this.this$0, "Accept Invite Page", new AnonymousClass1(this, null), null, new AnonymousClass2(this, null), null, 160, null);
     }
 }

app/src/main/java/com/discord/widgets/guilds/invite/WidgetGuildInvite.java

@@ -79,34 +79,31 @@ public final class WidgetGuildInvite extends AppFragment {
         boolean z2;
         GuildScheduledEventModel model;
         ModelInvite invite = loaded.getInvite();
-        getBinding().e.configureUI(invite);
+        getBinding().d.configureUI(invite, new WidgetGuildInvite$configureLoadedUI$onAcceptClick$1(this, invite));
-        GuildScheduledEventItemView guildScheduledEventItemView = getBinding().d;
+        GuildScheduledEventItemView guildScheduledEventItemView = getBinding().c;
         m.checkNotNullExpressionValue(guildScheduledEventItemView, "binding.guildInviteEventInfo");
         GuildScheduledEvent guildScheduledEvent = invite.getGuildScheduledEvent();
+        int i = 0;
         if (guildScheduledEvent == null || (model = GuildScheduledEventModelKt.toModel(guildScheduledEvent)) == null) {
             z2 = false;
         } else {
-            getBinding().d.configureAsPreview(model, invite.getChannel(), GuildScheduledEventUtilitiesKt.getCreatorUserGuildMember$default(model, (StoreGuilds) null, (StoreUser) null, 3, (Object) null));
+            getBinding().c.configureAsPreview(model, invite.getChannel(), GuildScheduledEventUtilitiesKt.getCreatorUserGuildMember$default(model, (StoreGuilds) null, (StoreUser) null, 3, (Object) null));
             z2 = true;
         }
-        guildScheduledEventItemView.setVisibility(z2 ? 0 : 8);
+        if (!z2) {
-        MaterialButton materialButton = getBinding().c;
+            i = 8;
+        }
+        guildScheduledEventItemView.setVisibility(i);
+        MaterialButton materialButton = getBinding().f2396b;
         m.checkNotNullExpressionValue(materialButton, "binding.guildInviteCancel");
         materialButton.setVisibility(8);
-        MaterialButton materialButton2 = getBinding().f2396b;
-        m.checkNotNullExpressionValue(materialButton2, "binding.guildInviteAccept");
-        materialButton2.setVisibility(0);
-        getBinding().f2396b.setOnClickListener(new WidgetGuildInvite$configureLoadedUI$2(this, invite));
     }
 
     private final void configureUIFailure(Error error) {
-        MaterialButton materialButton = getBinding().c;
+        MaterialButton materialButton = getBinding().f2396b;
         m.checkNotNullExpressionValue(materialButton, "binding.guildInviteCancel");
         materialButton.setVisibility(0);
-        MaterialButton materialButton2 = getBinding().f2396b;
+        getBinding().d.configureUIFailure(error);
-        m.checkNotNullExpressionValue(materialButton2, "binding.guildInviteAccept");
-        materialButton2.setVisibility(8);
-        getBinding().e.configureUIFailure(error);
         trackAndConsumeDynamicLinkCache(null);
     }
 
@@ -165,7 +162,7 @@ public final class WidgetGuildInvite extends AppFragment {
             str = inviteCode.getInviteCode();
         }
         analyticsTracker.impressionInviteAccept(str);
-        getBinding().c.setOnClickListener(new WidgetGuildInvite$onViewBound$1(this));
+        getBinding().f2396b.setOnClickListener(new WidgetGuildInvite$onViewBound$1(this));
     }
 
     @Override // com.discord.app.AppFragment

app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteInfo$configureUI$1.java

@@ -0,0 +1,17 @@
+package com.discord.widgets.guilds.invite;
+
+import android.view.View;
+import kotlin.jvm.functions.Function0;
+/* compiled from: WidgetInviteInfo.kt */
+public final class WidgetInviteInfo$configureUI$1 implements View.OnClickListener {
+    public final /* synthetic */ Function0 $onAcceptClick;
+
+    public WidgetInviteInfo$configureUI$1(Function0 function0) {
+        this.$onAcceptClick = function0;
+    }
+
+    @Override // android.view.View.OnClickListener
+    public final void onClick(View view) {
+        this.$onAcceptClick.mo1invoke();
+    }
+}

app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteInfo$parseAttributeSet$1.java

@@ -20,7 +20,7 @@ public final class WidgetInviteInfo$parseAttributeSet$1 implements Runnable {
     @Override // java.lang.Runnable
     public final void run() {
         if (this.$size != 0) {
-            GuildView guildView = WidgetInviteInfo.access$getBinding$p(this.this$0).f2395b;
+            GuildView guildView = WidgetInviteInfo.access$getBinding$p(this.this$0).c;
             m.checkNotNullExpressionValue(guildView, "binding.inviteAvatar");
             ViewGroup.LayoutParams layoutParams = guildView.getLayoutParams();
             Objects.requireNonNull(layoutParams, "null cannot be cast to non-null type android.view.ViewGroup.LayoutParams");
@@ -30,7 +30,7 @@ public final class WidgetInviteInfo$parseAttributeSet$1 implements Runnable {
             guildView.setLayoutParams(layoutParams);
         }
         if (this.$userSize != 0) {
-            SimpleDraweeView simpleDraweeView = WidgetInviteInfo.access$getBinding$p(this.this$0).c;
+            SimpleDraweeView simpleDraweeView = WidgetInviteInfo.access$getBinding$p(this.this$0).d;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.inviteAvatarSmall");
             ViewGroup.LayoutParams layoutParams2 = simpleDraweeView.getLayoutParams();
             Objects.requireNonNull(layoutParams2, "null cannot be cast to non-null type android.view.ViewGroup.LayoutParams");

app/src/main/java/com/discord/widgets/guilds/invite/WidgetInviteInfo.java

@@ -30,9 +30,12 @@ import com.discord.utilities.view.extensions.ViewExtensions;
 import com.discord.views.GuildView;
 import com.discord.views.guilds.ServerMemberCount;
 import com.facebook.drawee.view.SimpleDraweeView;
+import com.google.android.material.button.MaterialButton;
 import d0.z.d.m;
 import java.util.List;
 import java.util.Objects;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function0;
 import kotlin.jvm.functions.Function1;
 import kotlin.jvm.internal.DefaultConstructorMarker;
 /* compiled from: WidgetInviteInfo.kt */
@@ -52,34 +55,38 @@ public final class WidgetInviteInfo extends ConstraintLayout {
         super(context, attributeSet, i);
         m.checkNotNullParameter(context, "ctx");
         LayoutInflater.from(getContext()).inflate(R.layout.widget_guild_invite_info_view, this);
-        int i2 = R.id.invite_avatar;
+        int i2 = R.id.guild_invite_accept;
-        GuildView guildView = (GuildView) findViewById(R.id.invite_avatar);
+        MaterialButton materialButton = (MaterialButton) findViewById(R.id.guild_invite_accept);
-        if (guildView != null) {
+        if (materialButton != null) {
-            i2 = R.id.invite_avatar_small;
+            i2 = R.id.invite_avatar;
-            SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(R.id.invite_avatar_small);
+            GuildView guildView = (GuildView) findViewById(R.id.invite_avatar);
-            if (simpleDraweeView != null) {
+            if (guildView != null) {
-                i2 = R.id.invite_member_container_layout;
+                i2 = R.id.invite_avatar_small;
-                ServerMemberCount serverMemberCount = (ServerMemberCount) findViewById(R.id.invite_member_container_layout);
+                SimpleDraweeView simpleDraweeView = (SimpleDraweeView) findViewById(R.id.invite_avatar_small);
-                if (serverMemberCount != null) {
+                if (simpleDraweeView != null) {
-                    i2 = R.id.invite_message;
+                    i2 = R.id.invite_member_container_layout;
-                    TextView textView = (TextView) findViewById(R.id.invite_message);
+                    ServerMemberCount serverMemberCount = (ServerMemberCount) findViewById(R.id.invite_member_container_layout);
-                    if (textView != null) {
+                    if (serverMemberCount != null) {
-                        i2 = R.id.invite_title;
+                        i2 = R.id.invite_message;
-                        TextView textView2 = (TextView) findViewById(R.id.invite_title);
+                        TextView textView = (TextView) findViewById(R.id.invite_message);
-                        if (textView2 != null) {
+                        if (textView != null) {
-                            i2 = R.id.title_layout;
+                            i2 = R.id.invite_title;
-                            LinearLayout linearLayout = (LinearLayout) findViewById(R.id.title_layout);
+                            TextView textView2 = (TextView) findViewById(R.id.invite_title);
-                            if (linearLayout != null) {
+                            if (textView2 != null) {
-                                WidgetGuildInviteInfoViewBinding widgetGuildInviteInfoViewBinding = new WidgetGuildInviteInfoViewBinding(this, guildView, simpleDraweeView, serverMemberCount, textView, textView2, linearLayout);
+                                i2 = R.id.title_layout;
-                                m.checkNotNullExpressionValue(widgetGuildInviteInfoViewBinding, "WidgetGuildInviteInfoVie…ater.from(context), this)");
+                                LinearLayout linearLayout = (LinearLayout) findViewById(R.id.title_layout);
-                                this.binding = widgetGuildInviteInfoViewBinding;
+                                if (linearLayout != null) {
-                                Context context2 = getContext();
+                                    WidgetGuildInviteInfoViewBinding widgetGuildInviteInfoViewBinding = new WidgetGuildInviteInfoViewBinding(this, materialButton, guildView, simpleDraweeView, serverMemberCount, textView, textView2, linearLayout);
-                                m.checkNotNullExpressionValue(context2, "context");
+                                    m.checkNotNullExpressionValue(widgetGuildInviteInfoViewBinding, "WidgetGuildInviteInfoVie…ater.from(context), this)");
-                                parseAttributeSet(context2, attributeSet, i);
+                                    this.binding = widgetGuildInviteInfoViewBinding;
-                                setBackgroundResource(R.drawable.bg_guild_scheduled_event_list_item_primary);
+                                    Context context2 = getContext();
-                                int dpToPixels = DimenUtils.dpToPixels(24);
+                                    m.checkNotNullExpressionValue(context2, "context");
-                                setPadding(dpToPixels, dpToPixels, dpToPixels, dpToPixels);
+                                    parseAttributeSet(context2, attributeSet, i);
-                                return;
+                                    setBackgroundResource(R.drawable.bg_guild_scheduled_event_list_item_primary);
+                                    int dpToPixels = DimenUtils.dpToPixels(24);
+                                    setPadding(dpToPixels, dpToPixels, dpToPixels, dpToPixels);
+                                    return;
+                                }
                             }
                         }
                     }
@@ -99,7 +106,7 @@ public final class WidgetInviteInfo extends ConstraintLayout {
     }
 
     private final void configureForDirectFriend(ModelInvite modelInvite) {
-        GuildView guildView = this.binding.f2395b;
+        GuildView guildView = this.binding.c;
         User inviter = modelInvite.getInviter();
         String str = null;
         String forUser$default = IconUtils.getForUser$default(inviter != null ? new CoreUser(inviter) : null, true, null, 4, null);
@@ -128,20 +135,20 @@ public final class WidgetInviteInfo extends ConstraintLayout {
         }
         sb.append(str2);
         String sb2 = sb.toString();
-        SimpleDraweeView simpleDraweeView = this.binding.c;
+        SimpleDraweeView simpleDraweeView = this.binding.d;
         m.checkNotNullExpressionValue(simpleDraweeView, "binding.inviteAvatarSmall");
         simpleDraweeView.setVisibility(8);
-        ServerMemberCount serverMemberCount = this.binding.d;
+        ServerMemberCount serverMemberCount = this.binding.e;
         m.checkNotNullExpressionValue(serverMemberCount, "binding.inviteMemberContainerLayout");
         serverMemberCount.setVisibility(8);
-        TextView textView = this.binding.f;
+        TextView textView = this.binding.g;
         m.checkNotNullExpressionValue(textView, "binding.inviteTitle");
         textView.setText(getInviteTitleForDirectFriend(username));
-        this.binding.f.setTextSize(2, 26.0f);
+        this.binding.g.setTextSize(2, 26.0f);
-        TextView textView2 = this.binding.e;
+        TextView textView2 = this.binding.f;
         m.checkNotNullExpressionValue(textView2, "binding.inviteMessage");
         textView2.setText(getInviteSubtitleForDirectFriend(sb2));
-        this.binding.e.setTextSize(2, 18.0f);
+        this.binding.f.setTextSize(2, 18.0f);
     }
 
     /* JADX WARNING: Code restructure failed: missing block: B:27:0x006c, code lost:
@@ -151,7 +158,7 @@ public final class WidgetInviteInfo extends ConstraintLayout {
         Channel channel = modelInvite.getChannel();
         if (channel != null) {
             m.checkNotNullExpressionValue(channel, "model.channel ?: return");
-            SimpleDraweeView simpleDraweeView = this.binding.c;
+            SimpleDraweeView simpleDraweeView = this.binding.d;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.inviteAvatarSmall");
             User inviter = modelInvite.getInviter();
             IconUtils.setIcon$default(simpleDraweeView, inviter != null ? new CoreUser(inviter) : null, R.dimen.avatar_size_hero, null, null, null, 56, null);
@@ -166,21 +173,21 @@ public final class WidgetInviteInfo extends ConstraintLayout {
             if (ChannelUtils.w(channel) && (r6 = channel.g()) != null) {
             }
             z2 = false;
-            this.binding.f2395b.a(z2 ? IconUtils.getForChannel$default(channel, null, 2, null) : IconUtils.INSTANCE.getDefaultForGroupDM(channel.h()), null);
+            this.binding.c.a(z2 ? IconUtils.getForChannel$default(channel, null, 2, null) : IconUtils.INSTANCE.getDefaultForGroupDM(channel.h()), null);
-            SimpleDraweeView simpleDraweeView2 = this.binding.c;
+            SimpleDraweeView simpleDraweeView2 = this.binding.d;
             m.checkNotNullExpressionValue(simpleDraweeView2, "binding.inviteAvatarSmall");
             if (!z2) {
                 i = 8;
             }
             simpleDraweeView2.setVisibility(i);
-            TextView textView = this.binding.e;
+            TextView textView = this.binding.f;
             m.checkNotNullExpressionValue(textView, "binding.inviteMessage");
             textView.setText(getFormattedGuildName(c));
-            TextView textView2 = this.binding.f;
+            TextView textView2 = this.binding.g;
             m.checkNotNullExpressionValue(textView2, "binding.inviteTitle");
             textView2.setText(getIntroTextForGroup(username, ChannelUtils.c(channel)));
-            this.binding.d.setOnline(null);
+            this.binding.e.setOnline(null);
-            this.binding.d.setMembers(Integer.valueOf(modelInvite.getApproximateMemberCount()));
+            this.binding.e.setMembers(Integer.valueOf(modelInvite.getApproximateMemberCount()));
         }
     }
 
@@ -191,26 +198,26 @@ public final class WidgetInviteInfo extends ConstraintLayout {
         boolean z2 = modelInvite.getInviter() != null && modelInvite.getApproximateMemberCount() < 200;
         Guild guild = modelInvite.guild;
         if (guild != null) {
-            GuildView guildView = this.binding.f2395b;
+            GuildView guildView = this.binding.c;
             m.checkNotNullExpressionValue(guild, "it");
             guildView.a(IconUtils.getForGuild$default(new com.discord.models.guild.Guild(guild), null, true, null, 10, null), GuildUtilsKt.computeShortName(guild.x()));
         }
         String str = null;
         if (z2) {
-            SimpleDraweeView simpleDraweeView = this.binding.c;
+            SimpleDraweeView simpleDraweeView = this.binding.d;
             m.checkNotNullExpressionValue(simpleDraweeView, "binding.inviteAvatarSmall");
             User inviter = modelInvite.getInviter();
             IconUtils.setIcon$default(simpleDraweeView, IconUtils.getForUser$default(inviter != null ? new CoreUser(inviter) : null, true, null, 4, null), (int) R.dimen.avatar_size_medium, (Function1) null, (MGImages.ChangeDetector) null, 24, (Object) null);
         }
-        this.binding.d.setMembers(!z2 ? Integer.valueOf(modelInvite.getApproximateMemberCount()) : null);
+        this.binding.e.setMembers(!z2 ? Integer.valueOf(modelInvite.getApproximateMemberCount()) : null);
-        this.binding.d.setOnline(!z2 ? Integer.valueOf(modelInvite.getApproximatePresenceCount()) : null);
+        this.binding.e.setOnline(!z2 ? Integer.valueOf(modelInvite.getApproximatePresenceCount()) : null);
-        SimpleDraweeView simpleDraweeView2 = this.binding.c;
+        SimpleDraweeView simpleDraweeView2 = this.binding.d;
         m.checkNotNullExpressionValue(simpleDraweeView2, "binding.inviteAvatarSmall");
         if (!z2) {
             i = 8;
         }
         simpleDraweeView2.setVisibility(i);
-        TextView textView = this.binding.e;
+        TextView textView = this.binding.f;
         m.checkNotNullExpressionValue(textView, "binding.inviteMessage");
         Guild guild2 = modelInvite.guild;
         String x2 = guild2 != null ? guild2.x() : null;
@@ -222,16 +229,16 @@ public final class WidgetInviteInfo extends ConstraintLayout {
         if (guild3 == null || (m2 = guild3.m()) == null || !m2.contains(GuildFeature.VERIFIED)) {
             Guild guild4 = modelInvite.guild;
             if (!(guild4 == null || (m = guild4.m()) == null || !m.contains(GuildFeature.PARTNERED))) {
-                TextView textView2 = this.binding.e;
+                TextView textView2 = this.binding.f;
                 m.checkNotNullExpressionValue(textView2, "binding.inviteMessage");
                 ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView2, R.drawable.ic_partnered_badge, 0, 0, 0, 14, null);
             }
         } else {
-            TextView textView3 = this.binding.e;
+            TextView textView3 = this.binding.f;
             m.checkNotNullExpressionValue(textView3, "binding.inviteMessage");
             ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView3, R.drawable.ic_verified_badge, 0, 0, 0, 14, null);
         }
-        TextView textView4 = this.binding.f;
+        TextView textView4 = this.binding.g;
         m.checkNotNullExpressionValue(textView4, "binding.inviteTitle");
         User inviter2 = modelInvite.getInviter();
         if (inviter2 != null) {
@@ -269,9 +276,14 @@ public final class WidgetInviteInfo extends ConstraintLayout {
         }
     }
 
-    public final void configureUI(ModelInvite modelInvite) {
+    public final void configureUI(ModelInvite modelInvite, Function0<Unit> function0) {
         m.checkNotNullParameter(modelInvite, "model");
-        this.binding.f2395b.b();
+        m.checkNotNullParameter(function0, "onAcceptClick");
+        this.binding.c.b();
+        MaterialButton materialButton = this.binding.f2395b;
+        m.checkNotNullExpressionValue(materialButton, "binding.guildInviteAccept");
+        materialButton.setVisibility(0);
+        this.binding.f2395b.setOnClickListener(new WidgetInviteInfo$configureUI$1(function0));
         if (modelInvite.guild == null && modelInvite.getChannel() == null && modelInvite.getInviter() != null) {
             configureForDirectFriend(modelInvite);
         } else if (modelInvite.guild == null) {
@@ -282,27 +294,30 @@ public final class WidgetInviteInfo extends ConstraintLayout {
     }
 
     public final void configureUIFailure(Error error) {
-        this.binding.f.setText(R.string.instant_invite_expired);
+        this.binding.g.setText(R.string.instant_invite_expired);
-        this.binding.e.setText(R.string.invite_button_expired);
+        this.binding.f.setText(R.string.invite_button_expired);
+        MaterialButton materialButton = this.binding.f2395b;
+        m.checkNotNullExpressionValue(materialButton, "binding.guildInviteAccept");
+        materialButton.setVisibility(8);
         if (error != null) {
             Error.Response response = error.getResponse();
             m.checkNotNullExpressionValue(response, "e.response");
             if (response.getCode() == 30001) {
                 MeUser me2 = StoreStream.Companion.getUsers().getMe();
-                TextView textView = this.binding.f;
+                TextView textView = this.binding.g;
                 m.checkNotNullExpressionValue(textView, "binding.inviteTitle");
                 b.m(textView, R.string.too_many_user_guilds_alert_description, new Object[0], new WidgetInviteInfo$configureUIFailure$1(me2));
-                this.binding.e.setText(R.string.too_many_user_guilds_description);
+                this.binding.f.setText(R.string.too_many_user_guilds_description);
-                this.binding.e.setTextSize(0, getResources().getDimension(R.dimen.uikit_textsize_medium));
+                this.binding.f.setTextSize(0, getResources().getDimension(R.dimen.uikit_textsize_medium));
             }
         }
-        TextView textView2 = this.binding.e;
+        TextView textView2 = this.binding.f;
         m.checkNotNullExpressionValue(textView2, "binding.inviteMessage");
         ViewExtensions.setCompoundDrawableWithIntrinsicBounds$default(textView2, 0, 0, 0, 0, 15, null);
-        ServerMemberCount serverMemberCount = this.binding.d;
+        ServerMemberCount serverMemberCount = this.binding.e;
         m.checkNotNullExpressionValue(serverMemberCount, "binding.inviteMemberContainerLayout");
         serverMemberCount.setVisibility(8);
-        GuildView guildView = this.binding.f2395b;
+        GuildView guildView = this.binding.c;
         Context context = getContext();
         m.checkNotNullExpressionValue(context, "context");
         int themedDrawableRes = DrawableCompat.getThemedDrawableRes(context, (int) R.attr.img_poop, (int) R.drawable.img_poop_dark);
@@ -314,7 +329,7 @@ public final class WidgetInviteInfo extends ConstraintLayout {
         TextView textView3 = guildView.k.c;
         m.checkNotNullExpressionValue(textView3, "binding.guildText");
         textView3.setVisibility(8);
-        SimpleDraweeView simpleDraweeView2 = this.binding.c;
+        SimpleDraweeView simpleDraweeView2 = this.binding.d;
         m.checkNotNullExpressionValue(simpleDraweeView2, "binding.inviteAvatarSmall");
         simpleDraweeView2.setVisibility(8);
     }

app/src/main/java/com/discord/widgets/home/WidgetHomeHeaderManager$getOnSelectedAction$1.java

@@ -47,25 +47,25 @@ public final class WidgetHomeHeaderManager$getOnSelectedAction$1 implements Acti
         m.checkNotNullExpressionValue(parentFragmentManager, "appFragment.parentFragmentManager");
         PrivateCallLauncher privateCallLauncher = new PrivateCallLauncher(appFragment, appFragment, context, parentFragmentManager);
         switch (menuItem.getItemId()) {
-            case R.id.menu_chat_add_friend /* 2131364303 */:
+            case R.id.menu_chat_add_friend /* 2131364304 */:
                 WidgetFriendsAdd.Companion.show$default(WidgetFriendsAdd.Companion, context, null, "Toolbar", 2, null);
                 break;
-            case R.id.menu_chat_search /* 2131364304 */:
+            case R.id.menu_chat_search /* 2131364305 */:
                 launchForSearch(context);
                 break;
-            case R.id.menu_chat_side_panel /* 2131364305 */:
+            case R.id.menu_chat_side_panel /* 2131364306 */:
                 this.$panelLayout.openEndPanel();
                 break;
-            case R.id.menu_chat_start_call /* 2131364306 */:
+            case R.id.menu_chat_start_call /* 2131364307 */:
                 privateCallLauncher.launchVoiceCall(this.$this_getOnSelectedAction.getChannelId());
                 break;
-            case R.id.menu_chat_start_group /* 2131364307 */:
+            case R.id.menu_chat_start_group /* 2131364308 */:
                 ChannelInviteLaunchUtils.inviteToChannel$default(ChannelInviteLaunchUtils.INSTANCE, this.$appFragment, this.$this_getOnSelectedAction.getChannel(), "Toolbar", null, null, 24, null);
                 break;
-            case R.id.menu_chat_start_video_call /* 2131364308 */:
+            case R.id.menu_chat_start_video_call /* 2131364309 */:
                 privateCallLauncher.launchVideoCall(this.$this_getOnSelectedAction.getChannelId());
                 break;
-            case R.id.menu_chat_stop_call /* 2131364309 */:
+            case R.id.menu_chat_stop_call /* 2131364310 */:
                 StoreStream.Companion.getVoiceChannelSelected().clear();
                 break;
         }

app/src/main/java/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1.java

@@ -116,16 +116,16 @@ public final class WidgetMedia$onViewBoundOrOnResume$1<T1, T2> implements Action
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case R.id.menu_media_browser /* 2131364326 */:
+            case R.id.menu_media_browser /* 2131364327 */:
                 m.checkNotNullExpressionValue(context, "context");
                 String uri = this.$sourceUri.toString();
                 m.checkNotNullExpressionValue(uri, "sourceUri.toString()");
                 UriHandler.handleOrUntrusted$default(context, uri, null, 4, null);
                 return;
-            case R.id.menu_media_download /* 2131364327 */:
+            case R.id.menu_media_download /* 2131364328 */:
                 this.this$0.requestMediaDownload(new AnonymousClass1(this, context));
                 return;
-            case R.id.menu_media_share /* 2131364328 */:
+            case R.id.menu_media_share /* 2131364329 */:
                 m.checkNotNullExpressionValue(context, "context");
                 String uri2 = this.$sourceUri.toString();
                 m.checkNotNullExpressionValue(uri2, "sourceUri.toString()");

app/src/main/java/com/discord/widgets/notice/WidgetNoticeDialog.java

@@ -64,11 +64,11 @@ public final class WidgetNoticeDialog extends AppDialog {
     private static final String ARG_THEME_ID = "theme_id";
 
     /* renamed from: CANCEL_BUTTON */
-    public static final int notice_cancel = 2131364477;
+    public static final int notice_cancel = 2131364478;
     public static final Companion Companion = new Companion(null);
 
     /* renamed from: OK_BUTTON */
-    public static final int notice_ok = 2131364482;
+    public static final int notice_ok = 2131364483;
     public static final int ON_SHOW = 0;
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetNoticeDialog$binding$2.INSTANCE, null, 2, null);
     private Map<Integer, ? extends Function1<? super View, Unit>> listenerMap;

app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsChannels$configureUI$1.java

@@ -45,13 +45,13 @@ public final class WidgetServerSettingsChannels$configureUI$1<T1, T2> implements
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case R.id.menu_sort_channel /* 2131364344 */:
+            case R.id.menu_sort_channel /* 2131364345 */:
                 WidgetServerSettingsChannelsSortActions.Companion companion = WidgetServerSettingsChannelsSortActions.Companion;
                 FragmentManager childFragmentManager = this.this$0.getChildFragmentManager();
                 m.checkNotNullExpressionValue(childFragmentManager, "childFragmentManager");
                 companion.show(childFragmentManager, new AnonymousClass1(this));
                 return;
-            case R.id.menu_sort_done /* 2131364345 */:
+            case R.id.menu_sort_done /* 2131364346 */:
                 WidgetServerSettingsChannels.access$getChannelSortTypeSubject$p(this.this$0).onNext(-1);
                 return;
             default:

app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.java

@@ -51,9 +51,9 @@ public final class WidgetServerSettingsEditIntegration extends AppFragment {
     public static final Companion Companion = new Companion(null);
     private static final String INTENT_EXTRA_GUILD_ID = "INTENT_EXTRA_GUILD_ID";
     private static final String INTENT_EXTRA_INTEGRATION_ID = "INTENT_EXTRA_INTEGRATION_ID";
-    private static final int STATE_KEY_ENABLE_TWITCH_EMOTES = 2131363121;
+    private static final int STATE_KEY_ENABLE_TWITCH_EMOTES = 2131363122;
-    private static final int STATE_KEY_EXPIRE_BEHAVIOR = 2131363124;
+    private static final int STATE_KEY_EXPIRE_BEHAVIOR = 2131363125;
-    private static final int STATE_KEY_GRACE_PERIOD = 2131363125;
+    private static final int STATE_KEY_GRACE_PERIOD = 2131363126;
     private static final int[] gracePeriodDays = {1, 3, 7, 14, 30};
     private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetServerSettingsEditIntegration$binding$2.INSTANCE, null, 2, null);
     private RadioManager expiryBehaviorRadioManager;

app/src/main/java/com/discord/widgets/servers/WidgetServerSettingsEditRole.java

@@ -591,138 +591,138 @@ public final class WidgetServerSettingsEditRole extends AppFragment {
         for (CheckedSetting checkedSetting : n.listOf((Object[]) new CheckedSetting[]{getBinding().g, getBinding().h, getBinding().i, getBinding().j, getBinding().m, getBinding().r, getBinding().u, getBinding().v, getBinding().f2357y, getBinding().C, getBinding().f2358z, getBinding().w, getBinding().A, getBinding().B, getBinding().G, getBinding().D, getBinding().E, getBinding().I, getBinding().J, getBinding().O, getBinding().P, getBinding().o, getBinding().n, getBinding().Q, getBinding().R, getBinding().S, getBinding().T, getBinding().f, getBinding().U, getBinding().W, getBinding().f2351a0, getBinding().f2354c0, getBinding().Z, getBinding().X, getBinding().Y, getBinding().f2353b0, getBinding().H, getBinding().V, getBinding().K, getBinding().f2356x})) {
             m.checkNotNullExpressionValue(checkedSetting, "setting");
             switch (checkedSetting.getId()) {
-                case R.id.role_settings_add_reactions /* 2131364885 */:
+                case R.id.role_settings_add_reactions /* 2131364886 */:
                     j = 64;
                     break;
-                case R.id.role_settings_administrator /* 2131364886 */:
+                case R.id.role_settings_administrator /* 2131364887 */:
                     j = 8;
                     break;
-                case R.id.role_settings_attach_files /* 2131364887 */:
+                case R.id.role_settings_attach_files /* 2131364888 */:
                     j = Permission.ATTACH_FILES;
                     break;
-                case R.id.role_settings_ban_members /* 2131364888 */:
+                case R.id.role_settings_ban_members /* 2131364889 */:
                     j = 4;
                     break;
-                case R.id.role_settings_change_nickname /* 2131364889 */:
+                case R.id.role_settings_change_nickname /* 2131364890 */:
                     j = Permission.CHANGE_NICKNAME;
                     break;
-                case R.id.role_settings_color_disabled_overlay /* 2131364890 */:
+                case R.id.role_settings_color_disabled_overlay /* 2131364891 */:
-                case R.id.role_settings_color_selector_container /* 2131364891 */:
+                case R.id.role_settings_color_selector_container /* 2131364892 */:
-                case R.id.role_settings_current_color_display /* 2131364895 */:
+                case R.id.role_settings_current_color_display /* 2131364896 */:
-                case R.id.role_settings_edit_name_disabled_overlay /* 2131364896 */:
+                case R.id.role_settings_edit_name_disabled_overlay /* 2131364897 */:
-                case R.id.role_settings_hoist_checkedsetting /* 2131364898 */:
+                case R.id.role_settings_hoist_checkedsetting /* 2131364899 */:
-                case R.id.role_settings_icon_container /* 2131364899 */:
+                case R.id.role_settings_icon_container /* 2131364900 */:
-                case R.id.role_settings_mentionable_checkedsetting /* 2131364911 */:
+                case R.id.role_settings_mentionable_checkedsetting /* 2131364912 */:
-                case R.id.role_settings_overview_scroll /* 2131364913 */:
+                case R.id.role_settings_overview_scroll /* 2131364914 */:
-                case R.id.role_settings_role_icon /* 2131364918 */:
+                case R.id.role_settings_role_icon /* 2131364919 */:
-                case R.id.role_settings_role_icon_divider /* 2131364919 */:
+                case R.id.role_settings_role_icon_divider /* 2131364920 */:
-                case R.id.role_settings_role_icon_header /* 2131364920 */:
+                case R.id.role_settings_role_icon_header /* 2131364921 */:
                 default:
                     j = 0;
                     break;
-                case R.id.role_settings_create_instant_invite /* 2131364892 */:
+                case R.id.role_settings_create_instant_invite /* 2131364893 */:
                     j = 1;
                     break;
-                case R.id.role_settings_create_private_threads /* 2131364893 */:
+                case R.id.role_settings_create_private_threads /* 2131364894 */:
                     j = Permission.CREATE_PRIVATE_THREADS;
                     break;
-                case R.id.role_settings_create_public_threads /* 2131364894 */:
+                case R.id.role_settings_create_public_threads /* 2131364895 */:
                     j = Permission.CREATE_PUBLIC_THREADS;
                     break;
-                case R.id.role_settings_embed_links /* 2131364897 */:
+                case R.id.role_settings_embed_links /* 2131364898 */:
                     j = Permission.EMBED_LINKS;
                     break;
-                case R.id.role_settings_kick_members /* 2131364900 */:
+                case R.id.role_settings_kick_members /* 2131364901 */:
                     j = 2;
                     break;
-                case R.id.role_settings_manage_channels /* 2131364901 */:
+                case R.id.role_settings_manage_channels /* 2131364902 */:
                     j = 16;
                     break;
-                case R.id.role_settings_manage_emojis_and_stickers /* 2131364902 */:
+                case R.id.role_settings_manage_emojis_and_stickers /* 2131364903 */:
                     j = Permission.MANAGE_EMOJIS_AND_STICKERS;
                     break;
-                case R.id.role_settings_manage_events /* 2131364903 */:
+                case R.id.role_settings_manage_events /* 2131364904 */:
                     j = Permission.MANAGE_EVENTS;
                     break;
-                case R.id.role_settings_manage_messages /* 2131364904 */:
+                case R.id.role_settings_manage_messages /* 2131364905 */:
                     j = Permission.MANAGE_MESSAGES;
                     break;
-                case R.id.role_settings_manage_nicknames /* 2131364905 */:
+                case R.id.role_settings_manage_nicknames /* 2131364906 */:
                     j = Permission.MANAGE_NICKNAMES;
                     break;
-                case R.id.role_settings_manage_roles /* 2131364906 */:
+                case R.id.role_settings_manage_roles /* 2131364907 */:
                     j = Permission.MANAGE_ROLES;
                     break;
-                case R.id.role_settings_manage_server /* 2131364907 */:
+                case R.id.role_settings_manage_server /* 2131364908 */:
                     j = 32;
                     break;
-                case R.id.role_settings_manage_threads /* 2131364908 */:
+                case R.id.role_settings_manage_threads /* 2131364909 */:
                     j = Permission.MANAGE_THREADS;
                     break;
-                case R.id.role_settings_manage_webhooks /* 2131364909 */:
+                case R.id.role_settings_manage_webhooks /* 2131364910 */:
                     j = Permission.MANAGE_WEBHOOKS;
                     break;
-                case R.id.role_settings_mention_everyone /* 2131364910 */:
+                case R.id.role_settings_mention_everyone /* 2131364911 */:
                     j = Permission.MENTION_EVERYONE;
                     break;
-                case R.id.role_settings_moderate_member /* 2131364912 */:
+                case R.id.role_settings_moderate_member /* 2131364913 */:
                     j = Permission.MODERATE_MEMBERS;
                     break;
-                case R.id.role_settings_priority_speaker /* 2131364914 */:
+                case R.id.role_settings_priority_speaker /* 2131364915 */:
                     j = 256;
                     break;
-                case R.id.role_settings_read_message_history /* 2131364915 */:
+                case R.id.role_settings_read_message_history /* 2131364916 */:
                     j = Permission.READ_MESSAGE_HISTORY;
                     break;
-                case R.id.role_settings_read_messages /* 2131364916 */:
+                case R.id.role_settings_read_messages /* 2131364917 */:
                     j = Permission.VIEW_CHANNEL;
                     break;
-                case R.id.role_settings_request_to_speak /* 2131364917 */:
+                case R.id.role_settings_request_to_speak /* 2131364918 */:
                     j = Permission.REQUEST_TO_SPEAK;
                     break;
-                case R.id.role_settings_send_messages /* 2131364921 */:
+                case R.id.role_settings_send_messages /* 2131364922 */:
                     j = Permission.SEND_MESSAGES;
                     break;
-                case R.id.role_settings_send_messages_in_threads /* 2131364922 */:
+                case R.id.role_settings_send_messages_in_threads /* 2131364923 */:
                     j = Permission.SEND_MESSAGES_IN_THREADS;
                     break;
-                case R.id.role_settings_send_tts_messages /* 2131364923 */:
+                case R.id.role_settings_send_tts_messages /* 2131364924 */:
                     j = Permission.SEND_TTS_MESSAGES;
                     break;
-                case R.id.role_settings_use_application_commands /* 2131364924 */:
+                case R.id.role_settings_use_application_commands /* 2131364925 */:
                     j = Permission.USE_APPLICATION_COMMANDS;
                     break;
-                case R.id.role_settings_use_external_emojis /* 2131364925 */:
+                case R.id.role_settings_use_external_emojis /* 2131364926 */:
                     j = Permission.USE_EXTERNAL_EMOJIS;
                     break;
-                case R.id.role_settings_use_external_stickers /* 2131364926 */:
+                case R.id.role_settings_use_external_stickers /* 2131364927 */:
                     j = Permission.USE_EXTERNAL_STICKERS;
                     break;
-                case R.id.role_settings_view_audit_log /* 2131364927 */:
+                case R.id.role_settings_view_audit_log /* 2131364928 */:
                     j = 128;
                     break;
-                case R.id.role_settings_view_guild_analytics /* 2131364928 */:
+                case R.id.role_settings_view_guild_analytics /* 2131364929 */:
                     j = Permission.VIEW_GUILD_ANALYTICS;
                     break;
-                case R.id.role_settings_voice_connect /* 2131364929 */:
+                case R.id.role_settings_voice_connect /* 2131364930 */:
                     j = Permission.CONNECT;
                     break;
-                case R.id.role_settings_voice_deafen_members /* 2131364930 */:
+                case R.id.role_settings_voice_deafen_members /* 2131364931 */:
                     j = Permission.DEAFEN_MEMBERS;
                     break;
-                case R.id.role_settings_voice_move_members /* 2131364931 */:
+                case R.id.role_settings_voice_move_members /* 2131364932 */:
                     j = Permission.MOVE_MEMBERS;
                     break;
-                case R.id.role_settings_voice_mute_members /* 2131364932 */:
+                case R.id.role_settings_voice_mute_members /* 2131364933 */:
                     j = Permission.MUTE_MEMBERS;
                     break;
-                case R.id.role_settings_voice_speak /* 2131364933 */:
+                case R.id.role_settings_voice_speak /* 2131364934 */:
                     j = Permission.SPEAK;
                     break;
-                case R.id.role_settings_voice_use_voice_activity /* 2131364934 */:
+                case R.id.role_settings_voice_use_voice_activity /* 2131364935 */:
                     j = Permission.USE_VAD;
                     break;
-                case R.id.role_settings_voice_video /* 2131364935 */:
+                case R.id.role_settings_voice_video /* 2131364936 */:
                     j = 512;
                     break;
             }

app/src/main/java/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$onViewBound$1.java

@@ -33,10 +33,10 @@ public final class WidgetServerSettingsAuditLog$onViewBound$1<T> implements Acti
             public final boolean onMenuItemClick(MenuItem menuItem) {
                 m.checkNotNullExpressionValue(menuItem, "it");
                 switch (menuItem.getItemId()) {
-                    case R.id.menu_audit_log_sort_actions /* 2131364293 */:
+                    case R.id.menu_audit_log_sort_actions /* 2131364294 */:
                         WidgetServerSettingsAuditLogFilter.Companion.show(a.x(this.$view, "view", "view.context"), WidgetServerSettingsAuditLog.access$getGuildId$p(this.this$0.this$0.this$0), 1);
                         break;
-                    case R.id.menu_audit_log_sort_users /* 2131364294 */:
+                    case R.id.menu_audit_log_sort_users /* 2131364295 */:
                         WidgetServerSettingsAuditLogFilter.Companion.show(a.x(this.$view, "view", "view.context"), WidgetServerSettingsAuditLog.access$getGuildId$p(this.this$0.this$0.this$0), 0);
                         break;
                 }

app/src/main/java/com/discord/widgets/servers/member_verification/WidgetMemberVerificationViewModel.java

@@ -811,12 +811,13 @@ public final class WidgetMemberVerificationViewModel extends AppViewModel<ViewSt
         r12 = r2;
         r13 = true;
      */
-    /* JADX WARNING: Removed duplicated region for block: B:46:0x0093  */
+    /* JADX WARNING: Removed duplicated region for block: B:47:0x0099  */
-    /* JADX WARNING: Removed duplicated region for block: B:58:0x00c3  */
     @MainThread
     private final void handleStoreState(StoreState storeState) {
         VerificationType verificationType;
+        ViewState viewState;
         boolean z2;
+        ModelMemberVerificationForm form;
         VerificationType verificationType2;
         MeUser me2 = storeState.getMe();
         Guild guild = storeState.getGuild();
@@ -832,8 +833,8 @@ public final class WidgetMemberVerificationViewModel extends AppViewModel<ViewSt
             } else if (ordinal == 1) {
                 updateViewState(ViewState.Invalid.INSTANCE);
             } else if (ordinal == 2) {
-                ModelMemberVerificationForm form = memberVerificationFormData.getForm();
+                ModelMemberVerificationForm form2 = memberVerificationFormData.getForm();
-                List<ModelMemberVerificationForm.FormField> formFields = form != null ? form.getFormFields() : null;
+                List<ModelMemberVerificationForm.FormField> formFields = form2 != null ? form2.getFormFields() : null;
                 GuildVerificationLevel verificationLevel = guild != null ? guild.getVerificationLevel() : null;
                 GuildVerificationLevel guildVerificationLevel = GuildVerificationLevel.HIGHEST;
                 boolean z3 = verificationLevel != guildVerificationLevel;
@@ -848,7 +849,16 @@ public final class WidgetMemberVerificationViewModel extends AppViewModel<ViewSt
                 } else {
                     verificationType = null;
                     boolean z6 = false;
-                    if (formFields == null) {
+                    viewState = getViewState();
+                    if (!(viewState instanceof ViewState.Loaded)) {
+                        viewState = null;
+                    }
+                    ViewState.Loaded loaded = (ViewState.Loaded) viewState;
+                    List<ModelMemberVerificationForm.FormField> formFields2 = (loaded != null || (form = loaded.getForm()) == null) ? null : form.getFormFields();
+                    if (formFields != null || !(!m.areEqual(formFields2, formFields))) {
+                        z2 = false;
+                    } else {
+                        this.formUserInputDataMap.clear();
                         boolean z7 = false;
                         int i = 0;
                         for (Object obj : formFields) {
@@ -864,15 +874,20 @@ public final class WidgetMemberVerificationViewModel extends AppViewModel<ViewSt
                             i = i2;
                         }
                         z2 = z7;
-                    } else {
-                        z2 = false;
                     }
                     updateViewState(new ViewState.Loaded(formFields == null && !formFields.isEmpty(), false, z5 || z6, verificationType, z6, createFormItems(formFields, !z2, channels, roles, allowAnimatedEmojis), memberVerificationFormData.getForm(), channels, roles, allowAnimatedEmojis, !z5 && !z6, !z2, guild));
                 }
                 verificationType = verificationType2;
                 boolean z6 = false;
-                if (formFields == null) {
+                viewState = getViewState();
+                if (!(viewState instanceof ViewState.Loaded)) {
                 }
+                ViewState.Loaded loaded = (ViewState.Loaded) viewState;
+                if (loaded != null) {
+                }
+                if (formFields != null) {
+                }
+                z2 = false;
                 updateViewState(new ViewState.Loaded(formFields == null && !formFields.isEmpty(), false, z5 || z6, verificationType, z6, createFormItems(formFields, !z2, channels, roles, allowAnimatedEmojis), memberVerificationFormData.getForm(), channels, roles, allowAnimatedEmojis, !z5 && !z6, !z2, guild));
             }
         }

app/src/main/java/com/discord/widgets/settings/WidgetSettings$configureToolbar$1.java

@@ -17,12 +17,12 @@ public final class WidgetSettings$configureToolbar$1<T1, T2> implements Action2<
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case R.id.menu_settings_debugging /* 2131364339 */:
+            case R.id.menu_settings_debugging /* 2131364340 */:
                 WidgetDebugging.Companion companion = WidgetDebugging.Companion;
                 m.checkNotNullExpressionValue(context, "context");
                 companion.launch(context);
                 return;
-            case R.id.menu_settings_log_out /* 2131364340 */:
+            case R.id.menu_settings_log_out /* 2131364341 */:
                 WidgetSettings widgetSettings = this.this$0;
                 m.checkNotNullExpressionValue(context, "context");
                 WidgetSettings.access$showLogoutDialog(widgetSettings, context);

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

@@ -346,7 +346,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 + " - 115.3 - Alpha (115203)");
+        textView.setText(string + " - 116.0 - Alpha (116200)");
         binding.B.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/tos/WidgetTos$binding$2.java

@@ -0,0 +1,64 @@
+package com.discord.widgets.tos;
+
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import com.discord.R;
+import com.discord.databinding.WidgetTosBinding;
+import com.discord.utilities.view.text.LinkifiedTextView;
+import com.google.android.material.button.MaterialButton;
+import d0.z.d.k;
+import d0.z.d.m;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetTos.kt */
+public final /* synthetic */ class WidgetTos$binding$2 extends k implements Function1<View, WidgetTosBinding> {
+    public static final WidgetTos$binding$2 INSTANCE = new WidgetTos$binding$2();
+
+    public WidgetTos$binding$2() {
+        super(1, WidgetTosBinding.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/WidgetTosBinding;", 0);
+    }
+
+    public final WidgetTosBinding invoke(View view) {
+        m.checkNotNullParameter(view, "p1");
+        int i = R.id.alert_tos_ack_continue;
+        MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.alert_tos_ack_continue);
+        if (materialButton != null) {
+            i = R.id.alert_tos_ack_wrap;
+            LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.alert_tos_ack_wrap);
+            if (linearLayout != null) {
+                i = R.id.alert_tos_blog_post;
+                LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.alert_tos_blog_post);
+                if (linkifiedTextView != null) {
+                    i = R.id.alert_tos_community_guidelines;
+                    LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(R.id.alert_tos_community_guidelines);
+                    if (linkifiedTextView2 != null) {
+                        i = R.id.alert_tos_privacy_policy;
+                        LinkifiedTextView linkifiedTextView3 = (LinkifiedTextView) view.findViewById(R.id.alert_tos_privacy_policy);
+                        if (linkifiedTextView3 != null) {
+                            i = R.id.alert_tos_terms_of_service;
+                            LinkifiedTextView linkifiedTextView4 = (LinkifiedTextView) view.findViewById(R.id.alert_tos_terms_of_service);
+                            if (linkifiedTextView4 != null) {
+                                i = R.id.alert_tos_text_description_bottom;
+                                TextView textView = (TextView) view.findViewById(R.id.alert_tos_text_description_bottom);
+                                if (textView != null) {
+                                    i = R.id.alert_tos_text_description_top;
+                                    TextView textView2 = (TextView) view.findViewById(R.id.alert_tos_text_description_top);
+                                    if (textView2 != null) {
+                                        i = R.id.tos_icon;
+                                        ImageView imageView = (ImageView) view.findViewById(R.id.tos_icon);
+                                        if (imageView != null) {
+                                            return new WidgetTosBinding((RelativeLayout) view, materialButton, linearLayout, linkifiedTextView, linkifiedTextView2, linkifiedTextView3, linkifiedTextView4, textView, textView2, imageView);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
+    }
+}

app/src/main/java/com/discord/widgets/tos/WidgetTos$configureAgreementUI$$inlined$with$lambda$1.java

@@ -0,0 +1,21 @@
+package com.discord.widgets.tos;
+
+import android.view.View;
+import b.a.d.o;
+import com.discord.restapi.RestAPIParams;
+import com.discord.utilities.rest.RestAPI;
+import com.discord.utilities.rx.ObservableExtensionsKt;
+/* compiled from: WidgetTos.kt */
+public final class WidgetTos$configureAgreementUI$$inlined$with$lambda$1 implements View.OnClickListener {
+    public final /* synthetic */ WidgetTos this$0;
+
+    public WidgetTos$configureAgreementUI$$inlined$with$lambda$1(WidgetTos widgetTos) {
+        this.this$0 = widgetTos;
+    }
+
+    @Override // android.view.View.OnClickListener
+    public final void onClick(View view) {
+        ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().userAgreements(RestAPIParams.UserAgreements.Companion.agree()), false, 1, null), this.this$0, null, 2, null).k(o.a.g(this.this$0.getContext(), WidgetTos$configureAgreementUI$1$1$1.INSTANCE, null));
+        this.this$0.requireActivity().finish();
+    }
+}

app/src/main/java/com/discord/widgets/tos/WidgetTos$configureAgreementUI$1$1$1.java

@@ -0,0 +1,24 @@
+package com.discord.widgets.tos;
+
+import d0.z.d.o;
+import kotlin.Unit;
+import kotlin.jvm.functions.Function1;
+/* compiled from: WidgetTos.kt */
+public final class WidgetTos$configureAgreementUI$1$1$1 extends o implements Function1<Void, Unit> {
+    public static final WidgetTos$configureAgreementUI$1$1$1 INSTANCE = new WidgetTos$configureAgreementUI$1$1$1();
+
+    public WidgetTos$configureAgreementUI$1$1$1() {
+        super(1);
+    }
+
+    /* 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(Void r1) {
+        invoke(r1);
+        return Unit.a;
+    }
+
+    public final void invoke(Void r1) {
+    }
+}

app/src/main/java/com/discord/widgets/tos/WidgetTos$configureCommonTosModalUI$1.java

@@ -7,12 +7,13 @@ import com.discord.utilities.rx.ObservableExtensionsKt;
 import d0.z.d.o;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
-/* compiled from: WidgetTosAccept.kt */
+/* compiled from: WidgetTos.kt */
-public final class WidgetTosAccept$configureUI$2 implements View.OnClickListener {
+public final class WidgetTos$configureCommonTosModalUI$1 implements View.OnClickListener {
-    public final /* synthetic */ WidgetTosAccept this$0;
+    public final /* synthetic */ RestAPIParams.UserAgreements $userAgreementsParam;
+    public final /* synthetic */ WidgetTos this$0;
 
-    /* compiled from: WidgetTosAccept.kt */
+    /* compiled from: WidgetTos.kt */
-    /* renamed from: com.discord.widgets.tos.WidgetTosAccept$configureUI$2$1  reason: invalid class name */
+    /* renamed from: com.discord.widgets.tos.WidgetTos$configureCommonTosModalUI$1$1  reason: invalid class name */
     public static final class AnonymousClass1 extends o implements Function1<Void, Unit> {
         public static final AnonymousClass1 INSTANCE = new AnonymousClass1();
 
@@ -32,12 +33,14 @@ public final class WidgetTosAccept$configureUI$2 implements View.OnClickListener
         }
     }
 
-    public WidgetTosAccept$configureUI$2(WidgetTosAccept widgetTosAccept) {
+    public WidgetTos$configureCommonTosModalUI$1(WidgetTos widgetTos, RestAPIParams.UserAgreements userAgreements) {
-        this.this$0 = widgetTosAccept;
+        this.this$0 = widgetTos;
+        this.$userAgreementsParam = userAgreements;
     }
 
     @Override // android.view.View.OnClickListener
     public final void onClick(View view) {
-        ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().userAgreements(new RestAPIParams.UserAgreements()), false, 1, null), this.this$0, null, 2, null).k(b.a.d.o.a.g(this.this$0.getContext(), AnonymousClass1.INSTANCE, null));
+        ObservableExtensionsKt.ui$default(ObservableExtensionsKt.restSubscribeOn$default(RestAPI.Companion.getApi().userAgreements(this.$userAgreementsParam), false, 1, null), this.this$0, null, 2, null).k(b.a.d.o.a.g(this.this$0.getContext(), AnonymousClass1.INSTANCE, null));
+        this.this$0.requireActivity().finish();
     }
 }

app/src/main/java/com/discord/widgets/tos/WidgetTos$isAcknowledgement$2.java

@@ -0,0 +1,22 @@
+package com.discord.widgets.tos;
+
+import d0.z.d.o;
+import kotlin.jvm.functions.Function0;
+/* compiled from: WidgetTos.kt */
+public final class WidgetTos$isAcknowledgement$2 extends o implements Function0<Boolean> {
+    public final /* synthetic */ WidgetTos this$0;
+
+    /* JADX INFO: super call moved to the top of the method (can break code semantics) */
+    public WidgetTos$isAcknowledgement$2(WidgetTos widgetTos) {
+        super(0);
+        this.this$0 = widgetTos;
+    }
+
+    /* 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 mo1invoke() {
+        return this.this$0.getMostRecentIntent().getBooleanExtra("intent_args_key", false);
+    }
+}

app/src/main/java/com/discord/widgets/tos/WidgetTos$onViewBound$1.java

@@ -0,0 +1,12 @@
+package com.discord.widgets.tos;
+
+import rx.functions.Func0;
+/* compiled from: WidgetTos.kt */
+public final class WidgetTos$onViewBound$1<R> implements Func0<Boolean> {
+    public static final WidgetTos$onViewBound$1 INSTANCE = new WidgetTos$onViewBound$1();
+
+    @Override // rx.functions.Func0, java.util.concurrent.Callable
+    public final Boolean call() {
+        return Boolean.TRUE;
+    }
+}

app/src/main/java/com/discord/widgets/tos/WidgetTos$onViewBound$2.java

@@ -6,9 +6,9 @@ import com.discord.R;
 import com.discord.stores.StoreStream;
 import d0.z.d.m;
 import rx.functions.Action2;
-/* compiled from: WidgetTosAccept.kt */
+/* compiled from: WidgetTos.kt */
-public final class WidgetTosAccept$onViewBound$2<T1, T2> implements Action2<MenuItem, Context> {
+public final class WidgetTos$onViewBound$2<T1, T2> implements Action2<MenuItem, Context> {
-    public static final WidgetTosAccept$onViewBound$2 INSTANCE = new WidgetTosAccept$onViewBound$2();
+    public static final WidgetTos$onViewBound$2 INSTANCE = new WidgetTos$onViewBound$2();
 
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");

app/src/main/java/com/discord/widgets/tos/WidgetTos.java

@@ -0,0 +1,132 @@
+package com.discord.widgets.tos;
+
+import android.content.Context;
+import android.content.Intent;
+import android.text.format.DateUtils;
+import android.view.View;
+import android.widget.TextView;
+import androidx.fragment.app.Fragment;
+import b.a.d.j;
+import b.a.k.b;
+import b.d.b.a.a;
+import com.discord.R;
+import com.discord.app.AppFragment;
+import com.discord.databinding.WidgetTosBinding;
+import com.discord.restapi.RestAPIParams;
+import com.discord.utilities.view.text.LinkifiedTextView;
+import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
+import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
+import com.google.android.material.button.MaterialButton;
+import d0.g;
+import d0.z.d.m;
+import kotlin.Lazy;
+import kotlin.jvm.internal.DefaultConstructorMarker;
+import kotlin.reflect.KProperty;
+/* compiled from: WidgetTos.kt */
+public final class WidgetTos extends AppFragment {
+    public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.b0(WidgetTos.class, "binding", "getBinding()Lcom/discord/databinding/WidgetTosBinding;", 0)};
+    public static final Companion Companion = new Companion(null);
+    private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetTos$binding$2.INSTANCE, null, 2, null);
+    private final Lazy isAcknowledgement$delegate = g.lazy(new WidgetTos$isAcknowledgement$2(this));
+
+    /* compiled from: WidgetTos.kt */
+    public static final class Companion {
+        private Companion() {
+        }
+
+        public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
+            this();
+        }
+
+        public final void show(Context context, boolean z2) {
+            m.checkNotNullParameter(context, "context");
+            Intent intent = new Intent();
+            intent.putExtra("intent_args_key", z2);
+            j.d(context, WidgetTos.class, intent);
+        }
+    }
+
+    public WidgetTos() {
+        super(R.layout.widget_tos);
+    }
+
+    private final void configureAcknowledgementUI() {
+        configureCommonTosModalUI();
+        WidgetTosBinding binding = getBinding();
+        TextView textView = binding.h;
+        m.checkNotNullExpressionValue(textView, "alertTosTextDescriptionTop");
+        b.n(textView, R.string.terms_acknowledgement_description_1, new Object[]{DateUtils.formatDateTime(requireContext(), 1648454400000L, 4)}, null, 4);
+        TextView textView2 = binding.g;
+        m.checkNotNullExpressionValue(textView2, "alertTosTextDescriptionBottom");
+        b.n(textView2, R.string.terms_acknowledgement_description_2, new Object[0], null, 4);
+    }
+
+    private final void configureAgreementUI() {
+        configureCommonTosModalUI();
+        WidgetTosBinding binding = getBinding();
+        binding.f2648b.setOnClickListener(new WidgetTos$configureAgreementUI$$inlined$with$lambda$1(this));
+        TextView textView = binding.h;
+        m.checkNotNullExpressionValue(textView, "alertTosTextDescriptionTop");
+        b.n(textView, R.string.terms_agreement_description_1, new Object[0], null, 4);
+        TextView textView2 = binding.g;
+        m.checkNotNullExpressionValue(textView2, "alertTosTextDescriptionBottom");
+        b.n(textView2, R.string.terms_agreement_description_2, new Object[0], null, 4);
+        MaterialButton materialButton = binding.f2648b;
+        m.checkNotNullExpressionValue(materialButton, "alertTosAckContinue");
+        b.n(materialButton, R.string.got_it, new Object[0], null, 4);
+    }
+
+    private final void configureCommonTosModalUI() {
+        MaterialButton materialButton = getBinding().f2648b;
+        m.checkNotNullExpressionValue(materialButton, "binding.alertTosAckContinue");
+        b.n(materialButton, R.string.got_it, new Object[0], null, 4);
+        getBinding().f2648b.setOnClickListener(new WidgetTos$configureCommonTosModalUI$1(this, isAcknowledgement() ? RestAPIParams.UserAgreements.Companion.acknowledge() : RestAPIParams.UserAgreements.Companion.agree()));
+    }
+
+    private final void configureCommonUI() {
+        WidgetTosBinding binding = getBinding();
+        LinkifiedTextView linkifiedTextView = binding.f;
+        m.checkNotNullExpressionValue(linkifiedTextView, "alertTosTermsOfService");
+        b.n(linkifiedTextView, R.string.terms_of_service, new Object[]{getString(R.string.terms_of_service_url)}, null, 4);
+        LinkifiedTextView linkifiedTextView2 = binding.e;
+        m.checkNotNullExpressionValue(linkifiedTextView2, "alertTosPrivacyPolicy");
+        b.n(linkifiedTextView2, R.string.privacy_policy, new Object[]{getString(R.string.privacy_policy_url)}, null, 4);
+        LinkifiedTextView linkifiedTextView3 = binding.d;
+        m.checkNotNullExpressionValue(linkifiedTextView3, "alertTosCommunityGuidelines");
+        b.n(linkifiedTextView3, R.string.community_guidelines, new Object[]{getString(R.string.community_guidelines_url)}, null, 4);
+        LinkifiedTextView linkifiedTextView4 = binding.c;
+        m.checkNotNullExpressionValue(linkifiedTextView4, "alertTosBlogPost");
+        b.n(linkifiedTextView4, R.string.blog_post, new Object[]{getString(R.string.important_updates_url)}, null, 4);
+    }
+
+    private final void configureUI() {
+        configureCommonUI();
+        if (isAcknowledgement()) {
+            configureAcknowledgementUI();
+        } else {
+            configureAgreementUI();
+        }
+    }
+
+    private final WidgetTosBinding getBinding() {
+        return (WidgetTosBinding) this.binding$delegate.getValue((Fragment) this, $$delegatedProperties[0]);
+    }
+
+    private final boolean isAcknowledgement() {
+        return ((Boolean) this.isAcknowledgement$delegate.getValue()).booleanValue();
+    }
+
+    @Override // com.discord.app.AppFragment
+    public void onViewBound(View view) {
+        m.checkNotNullParameter(view, "view");
+        super.onViewBound(view);
+        AppFragment.setOnBackPressed$default(this, WidgetTos$onViewBound$1.INSTANCE, 0, 2, null);
+        AppFragment.setActionBarOptionsMenu$default(this, R.menu.menu_settings_logout, WidgetTos$onViewBound$2.INSTANCE, null, 4, null);
+    }
+
+    @Override // com.discord.app.AppFragment
+    public void onViewBoundOrOnResume() {
+        super.onViewBoundOrOnResume();
+        configureUI();
+    }
+}

app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$binding$2.java

@@ -1,56 +0,0 @@
-package com.discord.widgets.tos;
-
-import android.view.View;
-import android.widget.CheckBox;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import com.discord.R;
-import com.discord.databinding.WidgetTosAcceptBinding;
-import com.discord.utilities.view.text.LinkifiedTextView;
-import com.google.android.material.button.MaterialButton;
-import d0.z.d.k;
-import d0.z.d.m;
-import kotlin.jvm.functions.Function1;
-/* compiled from: WidgetTosAccept.kt */
-public final /* synthetic */ class WidgetTosAccept$binding$2 extends k implements Function1<View, WidgetTosAcceptBinding> {
-    public static final WidgetTosAccept$binding$2 INSTANCE = new WidgetTosAccept$binding$2();
-
-    public WidgetTosAccept$binding$2() {
-        super(1, WidgetTosAcceptBinding.class, "bind", "bind(Landroid/view/View;)Lcom/discord/databinding/WidgetTosAcceptBinding;", 0);
-    }
-
-    public final WidgetTosAcceptBinding invoke(View view) {
-        m.checkNotNullParameter(view, "p1");
-        int i = R.id.alert_tos_ack;
-        CheckBox checkBox = (CheckBox) view.findViewById(R.id.alert_tos_ack);
-        if (checkBox != null) {
-            i = R.id.alert_tos_ack_continue;
-            MaterialButton materialButton = (MaterialButton) view.findViewById(R.id.alert_tos_ack_continue);
-            if (materialButton != null) {
-                i = R.id.alert_tos_ack_wrap;
-                LinearLayout linearLayout = (LinearLayout) view.findViewById(R.id.alert_tos_ack_wrap);
-                if (linearLayout != null) {
-                    i = R.id.alert_tos_privacy_policy;
-                    LinkifiedTextView linkifiedTextView = (LinkifiedTextView) view.findViewById(R.id.alert_tos_privacy_policy);
-                    if (linkifiedTextView != null) {
-                        i = R.id.alert_tos_terms_of_service;
-                        LinkifiedTextView linkifiedTextView2 = (LinkifiedTextView) view.findViewById(R.id.alert_tos_terms_of_service);
-                        if (linkifiedTextView2 != null) {
-                            i = R.id.alert_tos_text_description;
-                            TextView textView = (TextView) view.findViewById(R.id.alert_tos_text_description);
-                            if (textView != null) {
-                                i = R.id.alert_tos_text_title;
-                                TextView textView2 = (TextView) view.findViewById(R.id.alert_tos_text_title);
-                                if (textView2 != null) {
-                                    return new WidgetTosAcceptBinding((RelativeLayout) view, checkBox, materialButton, linearLayout, linkifiedTextView, linkifiedTextView2, textView, textView2);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        throw new NullPointerException("Missing required view with ID: ".concat(view.getResources().getResourceName(i)));
-    }
-}

app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$configureUI$1.java

@@ -1,20 +0,0 @@
-package com.discord.widgets.tos;
-
-import android.widget.CompoundButton;
-import com.google.android.material.button.MaterialButton;
-import d0.z.d.m;
-/* compiled from: WidgetTosAccept.kt */
-public final class WidgetTosAccept$configureUI$1 implements CompoundButton.OnCheckedChangeListener {
-    public final /* synthetic */ WidgetTosAccept this$0;
-
-    public WidgetTosAccept$configureUI$1(WidgetTosAccept widgetTosAccept) {
-        this.this$0 = widgetTosAccept;
-    }
-
-    @Override // android.widget.CompoundButton.OnCheckedChangeListener
-    public final void onCheckedChanged(CompoundButton compoundButton, boolean z2) {
-        MaterialButton materialButton = WidgetTosAccept.access$getBinding$p(this.this$0).c;
-        m.checkNotNullExpressionValue(materialButton, "binding.alertTosAckContinue");
-        materialButton.setEnabled(z2);
-    }
-}

app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$onViewBound$1.java

@@ -1,12 +0,0 @@
-package com.discord.widgets.tos;
-
-import rx.functions.Func0;
-/* compiled from: WidgetTosAccept.kt */
-public final class WidgetTosAccept$onViewBound$1<R> implements Func0<Boolean> {
-    public static final WidgetTosAccept$onViewBound$1 INSTANCE = new WidgetTosAccept$onViewBound$1();
-
-    @Override // rx.functions.Func0, java.util.concurrent.Callable
-    public final Boolean call() {
-        return Boolean.TRUE;
-    }
-}

app/src/main/java/com/discord/widgets/tos/WidgetTosAccept$onViewBoundOrOnResume$1.java

@@ -1,26 +0,0 @@
-package com.discord.widgets.tos;
-
-import com.discord.models.requiredaction.RequiredAction;
-import d0.z.d.k;
-import d0.z.d.m;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
-/* compiled from: WidgetTosAccept.kt */
-public final /* synthetic */ class WidgetTosAccept$onViewBoundOrOnResume$1 extends k implements Function1<RequiredAction, Unit> {
-    public WidgetTosAccept$onViewBoundOrOnResume$1(WidgetTosAccept widgetTosAccept) {
-        super(1, widgetTosAccept, WidgetTosAccept.class, "configureUI", "configureUI(Lcom/discord/models/requiredaction/RequiredAction;)V", 0);
-    }
-
-    /* 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(RequiredAction requiredAction) {
-        invoke(requiredAction);
-        return Unit.a;
-    }
-
-    public final void invoke(RequiredAction requiredAction) {
-        m.checkNotNullParameter(requiredAction, "p1");
-        WidgetTosAccept.access$configureUI((WidgetTosAccept) this.receiver, requiredAction);
-    }
-}

app/src/main/java/com/discord/widgets/tos/WidgetTosAccept.java

@@ -1,93 +0,0 @@
-package com.discord.widgets.tos;
-
-import android.content.Context;
-import android.view.View;
-import android.widget.CheckBox;
-import androidx.fragment.app.Fragment;
-import b.a.d.j;
-import b.a.k.b;
-import b.d.b.a.a;
-import com.discord.R;
-import com.discord.app.AppFragment;
-import com.discord.databinding.WidgetTosAcceptBinding;
-import com.discord.models.requiredaction.RequiredAction;
-import com.discord.stores.StoreStream;
-import com.discord.utilities.rx.ObservableExtensionsKt;
-import com.discord.utilities.view.text.LinkifiedTextView;
-import com.discord.utilities.viewbinding.FragmentViewBindingDelegate;
-import com.discord.utilities.viewbinding.FragmentViewBindingDelegateKt;
-import com.google.android.material.button.MaterialButton;
-import d0.z.d.m;
-import kotlin.jvm.functions.Function0;
-import kotlin.jvm.functions.Function1;
-import kotlin.jvm.internal.DefaultConstructorMarker;
-import kotlin.reflect.KProperty;
-/* compiled from: WidgetTosAccept.kt */
-public final class WidgetTosAccept extends AppFragment {
-    public static final /* synthetic */ KProperty[] $$delegatedProperties = {a.b0(WidgetTosAccept.class, "binding", "getBinding()Lcom/discord/databinding/WidgetTosAcceptBinding;", 0)};
-    public static final Companion Companion = new Companion(null);
-    private final FragmentViewBindingDelegate binding$delegate = FragmentViewBindingDelegateKt.viewBinding$default(this, WidgetTosAccept$binding$2.INSTANCE, null, 2, null);
-
-    /* compiled from: WidgetTosAccept.kt */
-    public static final class Companion {
-        private Companion() {
-        }
-
-        public /* synthetic */ Companion(DefaultConstructorMarker defaultConstructorMarker) {
-            this();
-        }
-
-        public final void show(Context context) {
-            m.checkNotNullParameter(context, "context");
-            j.e(context, WidgetTosAccept.class, null, 4);
-        }
-    }
-
-    public WidgetTosAccept() {
-        super(R.layout.widget_tos_accept);
-    }
-
-    public static final /* synthetic */ void access$configureUI(WidgetTosAccept widgetTosAccept, RequiredAction requiredAction) {
-        widgetTosAccept.configureUI(requiredAction);
-    }
-
-    public static final /* synthetic */ WidgetTosAcceptBinding access$getBinding$p(WidgetTosAccept widgetTosAccept) {
-        return widgetTosAccept.getBinding();
-    }
-
-    private final void configureUI(RequiredAction requiredAction) {
-        if (requiredAction == RequiredAction.AGREEMENTS) {
-            LinkifiedTextView linkifiedTextView = getBinding().e;
-            m.checkNotNullExpressionValue(linkifiedTextView, "binding.alertTosTermsOfService");
-            b.n(linkifiedTextView, R.string.terms_of_service_url, new Object[0], null, 4);
-            LinkifiedTextView linkifiedTextView2 = getBinding().d;
-            m.checkNotNullExpressionValue(linkifiedTextView2, "binding.alertTosPrivacyPolicy");
-            b.n(linkifiedTextView2, R.string.privacy_policy_url, new Object[0], null, 4);
-            getBinding().f2648b.setOnCheckedChangeListener(new WidgetTosAccept$configureUI$1(this));
-            MaterialButton materialButton = getBinding().c;
-            m.checkNotNullExpressionValue(materialButton, "binding.alertTosAckContinue");
-            CheckBox checkBox = getBinding().f2648b;
-            m.checkNotNullExpressionValue(checkBox, "binding.alertTosAck");
-            materialButton.setEnabled(checkBox.isChecked());
-            getBinding().c.setOnClickListener(new WidgetTosAccept$configureUI$2(this));
-        }
-    }
-
-    private final WidgetTosAcceptBinding getBinding() {
-        return (WidgetTosAcceptBinding) this.binding$delegate.getValue((Fragment) this, $$delegatedProperties[0]);
-    }
-
-    @Override // com.discord.app.AppFragment
-    public void onViewBound(View view) {
-        m.checkNotNullParameter(view, "view");
-        super.onViewBound(view);
-        AppFragment.setOnBackPressed$default(this, WidgetTosAccept$onViewBound$1.INSTANCE, 0, 2, null);
-        AppFragment.setActionBarOptionsMenu$default(this, R.menu.menu_settings_logout, WidgetTosAccept$onViewBound$2.INSTANCE, null, 4, null);
-    }
-
-    @Override // com.discord.app.AppFragment
-    public void onViewBoundOrOnResume() {
-        super.onViewBoundOrOnResume();
-        ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.ui$default(StoreStream.Companion.getUserRequiredActions().observeUserRequiredAction(), this, null, 2, null), WidgetTosAccept.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetTosAccept$onViewBoundOrOnResume$1(this), 62, (Object) null);
-    }
-}

app/src/main/java/com/discord/widgets/tos/WidgetTosKt.java

@@ -0,0 +1,5 @@
+package com.discord.widgets.tos;
+/* compiled from: WidgetTos.kt */
+public final class WidgetTosKt {
+    private static final long ACCEPT_BY_DATE = 1648454400000L;
+}

app/src/main/java/com/discord/widgets/user/WidgetBanUser$onViewBound$3.java

@@ -65,13 +65,13 @@ public final class WidgetBanUser$onViewBound$3 implements View.OnClickListener {
         List access$getHistoryRadios$p = WidgetBanUser.access$getHistoryRadios$p(this.this$0);
         RadioManager access$getDeleteHistoryRadioManager$p = WidgetBanUser.access$getDeleteHistoryRadioManager$p(this.this$0);
         switch (((CheckedSetting) access$getHistoryRadios$p.get(access$getDeleteHistoryRadioManager$p != null ? access$getDeleteHistoryRadioManager$p.b() : 0)).getId()) {
-            case R.id.ban_user_delete_messages_1_day /* 2131362122 */:
+            case R.id.ban_user_delete_messages_1_day /* 2131362123 */:
                 i = 1;
                 break;
-            case R.id.ban_user_delete_messages_7_days /* 2131362123 */:
+            case R.id.ban_user_delete_messages_7_days /* 2131362124 */:
                 i = 7;
                 break;
-            case R.id.ban_user_delete_messages_none /* 2131362124 */:
+            case R.id.ban_user_delete_messages_none /* 2131362125 */:
             default:
                 i = 0;
                 break;

app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$1.java

@@ -52,21 +52,21 @@ public final class WidgetCallFullscreen$configureMenu$1<T1, T2> implements Actio
     public final void call(MenuItem menuItem, Context context) {
         m.checkNotNullExpressionValue(menuItem, "menuItem");
         switch (menuItem.getItemId()) {
-            case R.id.menu_call_overlay_launcher /* 2131364297 */:
+            case R.id.menu_call_overlay_launcher /* 2131364298 */:
                 DiscordOverlayService.Companion companion = DiscordOverlayService.Companion;
                 m.checkNotNullExpressionValue(context, "context");
                 companion.launchForConnect(context);
                 return;
-            case R.id.menu_call_switch_camera /* 2131364298 */:
+            case R.id.menu_call_switch_camera /* 2131364299 */:
                 WidgetCallFullscreen.access$getViewModel$p(this.this$0).switchCameraInputPressed();
                 return;
-            case R.id.menu_call_video_list /* 2131364299 */:
+            case R.id.menu_call_video_list /* 2131364300 */:
                 WidgetVoiceBottomSheet.Companion companion2 = WidgetVoiceBottomSheet.Companion;
                 FragmentManager parentFragmentManager = this.this$0.getParentFragmentManager();
                 m.checkNotNullExpressionValue(parentFragmentManager, "parentFragmentManager");
                 companion2.show(parentFragmentManager, this.$viewState.getCallModel().getChannel().h(), false, WidgetVoiceBottomSheet.FeatureContext.FULLSCREEN_CALL).setOnStreamPreviewClickedListener(new AnonymousClass1(this));
                 return;
-            case R.id.menu_call_voice_settings /* 2131364300 */:
+            case R.id.menu_call_voice_settings /* 2131364301 */:
                 WidgetVoiceSettingsBottomSheet.Companion companion3 = WidgetVoiceSettingsBottomSheet.Companion;
                 Long valueOf = Long.valueOf(this.$viewState.getCallModel().getChannel().h());
                 FragmentManager parentFragmentManager2 = this.this$0.getParentFragmentManager();

app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen$configureMenu$2.java

@@ -57,7 +57,7 @@ public final class WidgetCallFullscreen$configureMenu$2<T> implements Action1<Me
                     ViewKt.setVisible(textView, true);
                 }
                 if (imageView != null) {
-                    imageView.setImageResource(R.drawable.ic_text_in_voice_cutout);
+                    imageView.setImageResource(R.drawable.ic_text_in_voice_cutout_dark);
                 }
                 if (textView != null) {
                     textView.setBackground(ContextCompat.getDrawable(this.this$0.requireContext(), R.drawable.drawable_circle_red));
@@ -73,7 +73,7 @@ public final class WidgetCallFullscreen$configureMenu$2<T> implements Action1<Me
                     ViewKt.setVisible(textView, true);
                 }
                 if (imageView != null) {
-                    imageView.setImageResource(R.drawable.ic_text_in_voice_cutout);
+                    imageView.setImageResource(R.drawable.ic_text_in_voice_cutout_dark);
                 }
                 if (textView != null) {
                     textView.setBackground(ContextCompat.getDrawable(this.this$0.requireContext(), R.drawable.drawable_circle_white));
@@ -86,7 +86,7 @@ public final class WidgetCallFullscreen$configureMenu$2<T> implements Action1<Me
                 }
             } else {
                 if (imageView != null) {
-                    imageView.setImageResource(R.drawable.ic_text_in_voice);
+                    imageView.setImageResource(R.drawable.ic_text_in_voice_dark);
                 }
                 if (textView != null) {
                     ViewKt.setVisible(textView, false);

app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallFullscreen.java

@@ -506,7 +506,7 @@ public final class WidgetCallFullscreen extends AppFragment {
         if (valid.isTextInVoiceEnabled() || valid.getDisplayMode() == WidgetCallFullscreenViewModel.DisplayMode.STAGE) {
             TextView textView6 = getBinding().h;
             m.checkNotNullExpressionValue(textView6, "binding.callFullscreenMentions");
-            i = textView6.getVisibility() == 0 ? R.drawable.ic_call_toolbar_stage_minimize_cutout : R.drawable.ic_call_toolbar_stage_minimize;
+            i = textView6.getVisibility() == 0 ? R.drawable.ic_call_toolbar_stage_minimize_cutout_dark : R.drawable.ic_call_toolbar_stage_minimize_dark;
             toolbar.setNavigationIcon(ContextCompat.getDrawable(requireContext, i));
             getBinding().f2230b.setNavigationOnClickListener(new WidgetCallFullscreen$configureActionBar$1(this, valid));
             CallEventsButtonView callEventsButtonView = getBinding().w;

app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallPreviewFullscreen$onViewBoundOrOnResume$4.java

@@ -0,0 +1,17 @@
+package com.discord.widgets.voice.fullscreen;
+
+import rx.functions.Func0;
+/* compiled from: WidgetCallPreviewFullscreen.kt */
+public final class WidgetCallPreviewFullscreen$onViewBoundOrOnResume$4<R> implements Func0<Boolean> {
+    public final /* synthetic */ WidgetCallPreviewFullscreen this$0;
+
+    public WidgetCallPreviewFullscreen$onViewBoundOrOnResume$4(WidgetCallPreviewFullscreen widgetCallPreviewFullscreen) {
+        this.this$0 = widgetCallPreviewFullscreen;
+    }
+
+    @Override // rx.functions.Func0, java.util.concurrent.Callable
+    public final Boolean call() {
+        WidgetCallPreviewFullscreen.finishActivity$default(this.this$0, true, false, 2, null);
+        return Boolean.TRUE;
+    }
+}

app/src/main/java/com/discord/widgets/voice/fullscreen/WidgetCallPreviewFullscreen.java

@@ -361,5 +361,6 @@ public final class WidgetCallPreviewFullscreen extends AppFragment {
         super.onViewBoundOrOnResume();
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(getViewModel().observeViewState(), this, null, 2, null), WidgetCallPreviewFullscreen.class, (Context) null, (Function1) null, (Function1) null, (Function0) null, (Function0) null, new WidgetCallPreviewFullscreen$onViewBoundOrOnResume$1(this), 62, (Object) null);
         ObservableExtensionsKt.appSubscribe$default(ObservableExtensionsKt.bindToComponentLifecycle$default(getViewModel().observeEvents(), this, null, 2, null), WidgetCallPreviewFullscreen.class, (Context) null, new WidgetCallPreviewFullscreen$onViewBoundOrOnResume$3(this), (Function1) null, (Function0) null, (Function0) null, new WidgetCallPreviewFullscreen$onViewBoundOrOnResume$2(this), 58, (Object) null);
+        AppFragment.setOnBackPressed$default(this, new WidgetCallPreviewFullscreen$onViewBoundOrOnResume$4(this), 0, 2, null);
     }
 }

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="32dp" android:width="32dp" android:autoMirrored="true" android:viewportWidth="32" android:viewportHeight="32">
+    <path android:fillColor="#202225" android:pathData="M31.7673,18.7339C31.9203,17.8455 32,16.9321 32,16C32,7.1634 24.8366,0 16,0C7.1634,0 0,7.1634 0,16C0,24.8366 7.1634,32 16,32C16.9321,32 17.8455,31.9203 18.7339,31.7673C18.2607,30.6046 18,29.3327 18,28C18,22.4772 22.4772,18 28,18C29.3327,18 30.6046,18.2607 31.7673,18.7339Z" android:strokeAlpha="0.5" android:fillAlpha="0.5"/>
+    <path android:fillColor="#ffffff" android:pathData="M15.3263,20.9L8.7695,14.4111C8.4102,14.0334 8.4102,13.4556 8.7695,13.1C9.1287,12.7445 9.7126,12.7445 10.0943,13.1L16,18.9445L21.9057,13.1C22.265,12.7445 22.8713,12.7445 23.2305,13.1C23.5898,13.4556 23.5898,14.0334 23.2305,14.4111L16.6512,20.9C16.2919,21.2556 15.7081,21.2556 15.3263,20.9Z" android:fillType="evenOdd"/>
+</vector>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="32dp" android:width="32dp" android:autoMirrored="true" android:viewportWidth="32" android:viewportHeight="32">
+    <path android:fillColor="#202225" android:pathData="M16,0L16,0A16,16 0,0 1,32 16L32,16A16,16 0,0 1,16 32L16,32A16,16 0,0 1,0 16L0,16A16,16 0,0 1,16 0z" android:strokeAlpha="0.5" android:fillAlpha="0.5"/>
+    <path android:fillColor="#ffffff" android:pathData="M15.3263,20.9L8.7695,14.4111C8.4102,14.0334 8.4102,13.4556 8.7695,13.1C9.1287,12.7445 9.7126,12.7445 10.0943,13.1L16,18.9445L21.9057,13.1C22.265,12.7445 22.8713,12.7445 23.2305,13.1C23.5898,13.4556 23.5898,14.0334 23.2305,14.4111L16.6512,20.9C16.2919,21.2556 15.7081,21.2556 15.3263,20.9Z" android:fillType="evenOdd"/>
+</vector>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="32dp" android:width="32dp" android:viewportWidth="32" android:viewportHeight="32">
-    <path android:fillColor="#202225" android:pathData="M16,0C7.1634,0 0,7.1634 0,16C0,24.8366 7.1634,32 16,32C16.6482,32 17.2873,31.9615 17.9153,31.8865C16.7108,30.2351 16,28.2005 16,26C16,20.4772 20.4772,16 26,16C28.2005,16 30.2351,16.7108 31.8865,17.9153C31.9615,17.2873 32,16.6482 32,16C32,7.1634 24.8366,0 16,0Z" android:strokeAlpha="0.6" android:fillAlpha="0.5" android:fillType="evenOdd"/>
+    <path android:fillColor="#ffffff" android:pathData="M16,0C7.1634,0 0,7.1634 0,16C0,24.8366 7.1634,32 16,32C16.6482,32 17.2873,31.9615 17.9153,31.8865C16.7108,30.2351 16,28.2005 16,26C16,20.4772 20.4772,16 26,16C28.2005,16 30.2351,16.7108 31.8865,17.9153C31.9615,17.2873 32,16.6482 32,16C32,7.1634 24.8366,0 16,0Z" android:strokeAlpha="0.6" android:fillAlpha="0.1" android:fillType="evenOdd"/>
     <path android:fillColor="#ffffff" android:pathData="M8.498,10.8335C8.498,10.0047 9.17,9.3335 9.998,9.3335H21.998C22.8268,9.3335 23.498,10.0047 23.498,10.8335V16.3156C20.7458,17.0245 18.4523,18.8756 17.1531,21.3335H15.248L12.248,24.3335V21.3335H9.998C9.17,21.3335 8.498,20.6615 8.498,19.8335V10.8335Z" android:fillType="evenOdd"/>
 </vector>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="32dp" android:width="32dp" android:viewportWidth="32" android:viewportHeight="32">
+    <path android:fillColor="#202225" android:pathData="M16,0C7.1634,0 0,7.1634 0,16C0,24.8366 7.1634,32 16,32C16.6482,32 17.2873,31.9615 17.9153,31.8865C16.7108,30.2351 16,28.2005 16,26C16,20.4772 20.4772,16 26,16C28.2005,16 30.2351,16.7108 31.8865,17.9153C31.9615,17.2873 32,16.6482 32,16C32,7.1634 24.8366,0 16,0Z" android:strokeAlpha="0.6" android:fillAlpha="0.5" android:fillType="evenOdd"/>
+    <path android:fillColor="#ffffff" android:pathData="M8.498,10.8335C8.498,10.0047 9.17,9.3335 9.998,9.3335H21.998C22.8268,9.3335 23.498,10.0047 23.498,10.8335V16.3156C20.7458,17.0245 18.4523,18.8756 17.1531,21.3335H15.248L12.248,24.3335V21.3335H9.998C9.17,21.3335 8.498,20.6615 8.498,19.8335V10.8335Z" android:fillType="evenOdd"/>
+</vector>