From 671ec46f701da1c435e096baf73d5301ae2d1d0e Mon Sep 17 00:00:00 2001
From: Juby210 <juby210@protonmail.com>
Date: Sat, 16 Oct 2021 09:24:10 +0200
Subject: [PATCH] 97.8 - Beta (97108)

---
 app/build.gradle                                    |  4 ++--
 app/src/main/AndroidManifest.xml                    |  2 +-
 .../discord/stores/StoreApplicationCommands.java    | 13 +++++++++++--
 .../discord/widgets/settings/WidgetSettings.java    |  2 +-
 app/src/main/res/values/strings.xml                 |  2 +-
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 76f3384fb4..f63fc6ef97 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId 'com.discord'
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 97107
-        versionName "97.7 - Beta"
+        versionCode 97108
+        versionName "97.8 - Beta"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index eff821eb97..94f9dbce21 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="97107" android:versionName="97.7 - 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="97108" android:versionName="97.8 - Beta" android:installLocation="auto" android:compileSdkVersion="30" android:compileSdkVersionCodename="11" package="com.discord" platformBuildVersionCode="30" platformBuildVersionName="11">
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29"/>
     <uses-feature android:name="android.hardware.camera" android:required="false"/>
     <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
diff --git a/app/src/main/java/com/discord/stores/StoreApplicationCommands.java b/app/src/main/java/com/discord/stores/StoreApplicationCommands.java
index ef650a3e74..48bd2c6870 100644
--- a/app/src/main/java/com/discord/stores/StoreApplicationCommands.java
+++ b/app/src/main/java/com/discord/stores/StoreApplicationCommands.java
@@ -80,6 +80,7 @@ public final class StoreApplicationCommands extends StoreV2 {
     private final NonceGenerator nonceGenerator;
     private int numRemoteCommands;
     private final ObservationDeck observationDeck;
+    private User pendingBotUser;
     private Long pendingGatewayGuildId;
     private String query;
     private final List<ApplicationCommand> queryCommands;
@@ -742,14 +743,22 @@ public final class StoreApplicationCommands extends StoreV2 {
             Long l = this.pendingGatewayGuildId;
             requestFrecencyCommands(l != null ? l.longValue() : 0);
             requestApplications(this.pendingGatewayGuildId);
-            this.pendingGatewayGuildId = null;
+            User user = this.pendingBotUser;
+            if (user != null) {
+                handleDmUserApplication(user);
+                this.pendingBotUser = null;
+            }
         }
     }
 
     public final void handleDmUserApplication(User user) {
         m.checkNotNullParameter(user, "botUser");
         if (user.isBot()) {
-            this.dispatcher.schedule(new StoreApplicationCommands$handleDmUserApplication$1(this, user));
+            if (!this.connectionReady) {
+                this.pendingBotUser = user;
+            } else {
+                this.dispatcher.schedule(new StoreApplicationCommands$handleDmUserApplication$1(this, user));
+            }
         }
     }
 
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 b8a876a9b9..7933e6219d 100644
--- a/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java
+++ b/app/src/main/java/com/discord/widgets/settings/WidgetSettings.java
@@ -314,7 +314,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 + " - 97.7 - Beta (97107)");
+        textView.setText(string + " - 97.8 - Beta (97108)");
         binding.A.setOnClickListener(new WidgetSettings$onViewBound$$inlined$with$lambda$3(this));
         binding.u.setOnClickListener(WidgetSettings$onViewBound$1$5.INSTANCE);
         binding.q.setOnClickListener(WidgetSettings$onViewBound$1$6.INSTANCE);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c54f4331ae..af2945e460 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1436,7 +1436,7 @@
     <string name="color_picker_title">Select a color</string>
     <string name="color_picker_transparency">Transparency</string>
     <string name="color_picker_use_default">Use Default</string>
-    <string name="res_2131887516_com_crashlytics_android_build_id">9637831652614c7485fd87700518aa62</string>
+    <string name="res_2131887516_com_crashlytics_android_build_id">ba5847b5f8e548e188031f40cb7748c9</string>
     <string name="coming_soon">Coming Soon</string>
     <string name="command_accessibility_desc_app_header_item">Slash command application {applicationName}</string>
     <string name="command_accessibility_desc_app_item">{applicationName} application</string>