From 8baa11bd630aba690b47e13d44b5711894a0e9a5 Mon Sep 17 00:00:00 2001 From: eatsfoobars Date: Sat, 20 Jun 2020 17:40:34 +0100 Subject: [PATCH] Fix supplemental patch crashing image sending --- patches/supplemental/1167.patch | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/patches/supplemental/1167.patch b/patches/supplemental/1167.patch index e100c9b9..7ba5b670 100644 --- a/patches/supplemental/1167.patch +++ b/patches/supplemental/1167.patch @@ -1,6 +1,6 @@ diff -crB from/smali/com/discord/gateway/io/IncomingParser.smali to/smali/com/discord/gateway/io/IncomingParser.smali -*** from/smali/com/discord/gateway/io/IncomingParser.smali 2020-06-20 04:18:51.361374166 +0100 ---- to/smali/com/discord/gateway/io/IncomingParser.smali 2020-06-20 04:19:03.349286602 +0100 +*** from/smali/com/discord/gateway/io/IncomingParser.smali 2020-06-20 17:31:26.270341616 +0100 +--- to/smali/com/discord/gateway/io/IncomingParser.smali 2020-06-20 17:31:48.507403499 +0100 *************** *** 754,759 **** --- 754,770 ---- @@ -22,8 +22,8 @@ diff -crB from/smali/com/discord/gateway/io/IncomingParser.smali to/smali/com/di invoke-direct {v0}, Lcom/discord/models/domain/ModelMessageDelete;->()V diff -crB from/smali/com/discord/models/domain/ModelChannel.smali to/smali/com/discord/models/domain/ModelChannel.smali -*** from/smali/com/discord/models/domain/ModelChannel.smali 2020-06-20 04:18:51.383374005 +0100 ---- to/smali/com/discord/models/domain/ModelChannel.smali 2020-06-20 04:19:03.349286602 +0100 +*** from/smali/com/discord/models/domain/ModelChannel.smali 2020-06-20 17:31:26.286342537 +0100 +--- to/smali/com/discord/models/domain/ModelChannel.smali 2020-06-20 17:31:48.507403499 +0100 *************** *** 2230,2235 **** --- 2230,2245 ---- @@ -44,8 +44,8 @@ diff -crB from/smali/com/discord/models/domain/ModelChannel.smali to/smali/com/d iget-object v0, p0, Lcom/discord/models/domain/ModelChannel;->permissionOverwrites:Ljava/util/Map; diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/discord/stores/StoreUserSettings.smali -*** from/smali/com/discord/stores/StoreUserSettings.smali 2020-06-20 04:18:51.667371929 +0100 ---- to/smali/com/discord/stores/StoreUserSettings.smali 2020-06-20 04:19:03.351286588 +0100 +*** from/smali/com/discord/stores/StoreUserSettings.smali 2020-06-20 17:31:26.462352671 +0100 +--- to/smali/com/discord/stores/StoreUserSettings.smali 2020-06-20 17:31:48.509403576 +0100 *************** *** 396,401 **** --- 396,649 ---- @@ -304,8 +304,8 @@ diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/dis .locals 1 diff -crB from/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali to/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali -*** from/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali 2020-06-20 04:18:51.787371051 +0100 ---- to/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali 2020-06-20 04:19:03.351286588 +0100 +*** from/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali 2020-06-20 17:31:26.526356357 +0100 +--- to/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali 2020-06-20 17:37:06.226648224 +0100 *************** *** 46,51 **** --- 46,85 ---- @@ -355,16 +355,16 @@ diff -crB from/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali to/s move-result-object v4 -+ invoke-static {v3}, Lcom/discord/utilities/rest/SendUtils$getPart$1$1;->interceptFilename(Ljava/lang/String;)Ljava/lang/String; ++ invoke-static {v4}, Lcom/discord/utilities/rest/SendUtils$getPart$1$1;->interceptFilename(Ljava/lang/String;)Ljava/lang/String; + -+ move-result-object v3 ++ move-result-object v4 + .line 4 iget-object p1, p0, Lcom/discord/utilities/rest/SendUtils$getPart$1$1;->this$0:Lcom/discord/utilities/rest/SendUtils$getPart$1; diff -crB from/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali to/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali -*** from/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali 2020-06-20 04:18:52.031369267 +0100 ---- to/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali 2020-06-20 04:19:03.351286588 +0100 +*** from/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali 2020-06-20 17:31:26.646363267 +0100 +--- to/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali 2020-06-20 17:31:48.509403576 +0100 *************** *** 59,64 **** --- 59,74 ---- @@ -385,8 +385,8 @@ diff -crB from/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.sm invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z diff -crB from/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali to/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali -*** from/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali 2020-06-20 04:18:52.035369238 +0100 ---- to/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali 2020-06-20 04:19:03.351286588 +0100 +*** from/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali 2020-06-20 17:31:26.650363497 +0100 +--- to/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali 2020-06-20 17:31:48.509403576 +0100 *************** *** 60,65 **** --- 60,89 ----