From f41212cb0ddaa6241444368fe9f685809f90e1c6 Mon Sep 17 00:00:00 2001
From: Juby210 <juby210@protonmail.com>
Date: Thu, 20 Jan 2022 22:07:33 +0000
Subject: [PATCH] 111.5 - Beta (111105)

---
 app/build.gradle                              |  4 +--
 app/src/main/AndroidManifest.xml              |  2 +-
 .../ChannelSelector$selectChannel$2.java      | 27 ++++++++++++++++---
 .../widgets/settings/WidgetSettings.java      |  2 +-
 app/src/main/res/values/strings.xml           |  2 +-
 5 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 88dcd673b6..9887f9a529 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId 'com.discord'
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 111104
-        versionName "111.4 - Beta"
+        versionCode 111105
+        versionName "111.5 - Beta"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 89cd879f70..8bcb34f53f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/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="111104" android:versionName="111.4 - Beta" android:installLocation="auto" android:compileSdkVersion="30" android:compileSdkVersionCodename="11" package="com.discord" platformBuildVersionCode="30" platformBuildVersionName="11">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="111105" android:versionName="111.5 - Beta" android:installLocation="auto" android:compileSdkVersion="30" android:compileSdkVersionCodename="11" package="com.discord" platformBuildVersionCode="30" platformBuildVersionName="11">
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30"/>
     <uses-feature android:name="android.hardware.camera" android:required="false"/>
     <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
diff --git a/app/src/main/java/com/discord/utilities/channel/ChannelSelector$selectChannel$2.java b/app/src/main/java/com/discord/utilities/channel/ChannelSelector$selectChannel$2.java
index bbf93599bd..74b436f3f2 100644
--- a/app/src/main/java/com/discord/utilities/channel/ChannelSelector$selectChannel$2.java
+++ b/app/src/main/java/com/discord/utilities/channel/ChannelSelector$selectChannel$2.java
@@ -3,6 +3,7 @@ package com.discord.utilities.channel;
 import com.discord.api.channel.Channel;
 import com.discord.api.channel.ChannelUtils;
 import com.discord.stores.SelectedChannelAnalyticsLocation;
+import com.discord.widgets.chat.list.TextInVoiceFeatureFlag;
 import d0.z.d.m;
 import d0.z.d.o;
 import kotlin.Unit;
@@ -33,11 +34,31 @@ public final class ChannelSelector$selectChannel$2 extends o implements Function
         return Unit.a;
     }
 
+    /* JADX WARNING: Code restructure failed: missing block: B:3:0x001d, code lost:
+        if (com.discord.api.channel.ChannelUtils.E(r10) == false) goto L_0x001f;
+     */
+    /* JADX WARNING: Removed duplicated region for block: B:10:0x0030  */
+    /* JADX WARNING: Removed duplicated region for block: B:13:0x0040  */
+    /* JADX WARNING: Removed duplicated region for block: B:15:? A[RETURN, SYNTHETIC] */
+    /* JADX WARNING: Removed duplicated region for block: B:9:0x002d  */
     public final void invoke(Channel channel) {
+        boolean z2;
+        if (!TextInVoiceFeatureFlag.Companion.getINSTANCE().isEnabled(Long.valueOf(channel.f()))) {
+            m.checkNotNullExpressionValue(channel, "channel");
+        }
         m.checkNotNullExpressionValue(channel, "channel");
-        ChannelSelector.access$gotoChannel(this.this$0, this.$guildId, ChannelUtils.z(channel) ? this.$guildId : this.$channelId, this.$peekParent, this.$analyticsLocation);
-        if (ChannelUtils.z(channel)) {
-            this.this$0.getStream().getVoiceChannelSelected$app_productionBetaRelease().selectVoiceChannel(this.$channelId);
+        if (!ChannelUtils.z(channel)) {
+            z2 = false;
+            ChannelSelector.access$gotoChannel(this.this$0, this.$guildId, !z2 ? this.$guildId : this.$channelId, this.$peekParent, this.$analyticsLocation);
+            if (!z2) {
+                this.this$0.getStream().getVoiceChannelSelected$app_productionBetaRelease().selectVoiceChannel(this.$channelId);
+                return;
+            }
+            return;
+        }
+        z2 = true;
+        ChannelSelector.access$gotoChannel(this.this$0, this.$guildId, !z2 ? this.$guildId : this.$channelId, this.$peekParent, this.$analyticsLocation);
+        if (!z2) {
         }
     }
 }
diff --git a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java
index a40e32526c..5db9fd4ae3 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java
+++ b/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 + " - 111.4 - Beta (111104)");
+        textView.setText(string + " - 111.5 - Beta (111105)");
         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);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6095b568e3..5d7b9c98b1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1451,7 +1451,7 @@
     <string name="color_picker_custom">Custom</string>
     <string name="color_picker_presets">Presets</string>
     <string name="color_picker_use_default">Use Default</string>
-    <string name="res_2131887531_com_crashlytics_android_build_id">efce44569c2f40a6850e83bdfc8a79bb</string>
+    <string name="res_2131887531_com_crashlytics_android_build_id">6c93c192a1a74ea995bc7a6eb93f5eab</string>
     <string name="command_accessibility_desc_app_header_item">Slash command application {applicationName}</string>
     <string name="command_accessibility_desc_app_item">{applicationName} application</string>
     <string name="command_accessibility_desc_app_item_selected">{applicationName} application selected</string>