From 36b408b3447d1802b4cd8c427f9b50ea1e0c8479 Mon Sep 17 00:00:00 2001 From: eatsfoobars Date: Wed, 8 Jul 2020 01:56:27 +0300 Subject: [PATCH] Fix supplemental breaking image upload Daily reminder that I'm dumb --- patches/supplemental/1180.patch | 36 +++++++++++++++++---------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/patches/supplemental/1180.patch b/patches/supplemental/1180.patch index 7ba5b67073..6fcc69232e 100644 --- a/patches/supplemental/1180.patch +++ b/patches/supplemental/1180.patch @@ -1,9 +1,9 @@ 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 17:31:26.270341616 +0100 ---- to/smali/com/discord/gateway/io/IncomingParser.smali 2020-06-20 17:31:48.507403499 +0100 +*** from/smali/com/discord/gateway/io/IncomingParser.smali 2020-07-07 21:22:23.990000000 +0300 +--- to/smali/com/discord/gateway/io/IncomingParser.smali 2020-07-08 01:48:57.070000000 +0300 *************** -*** 754,759 **** ---- 754,770 ---- +*** 762,767 **** +--- 762,778 ---- .line 57 :goto_2 @@ -21,9 +21,10 @@ diff -crB from/smali/com/discord/gateway/io/IncomingParser.smali to/smali/com/di new-instance v0, Lcom/discord/models/domain/ModelMessageDelete; invoke-direct {v0}, Lcom/discord/models/domain/ModelMessageDelete;->()V +Only in to/smali/com/discord/gateway/io: IncomingParser.smali.orig 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 17:31:26.286342537 +0100 ---- to/smali/com/discord/models/domain/ModelChannel.smali 2020-06-20 17:31:48.507403499 +0100 +*** from/smali/com/discord/models/domain/ModelChannel.smali 2020-07-07 21:22:24.010000000 +0300 +--- to/smali/com/discord/models/domain/ModelChannel.smali 2020-07-08 01:48:57.070000000 +0300 *************** *** 2230,2235 **** --- 2230,2245 ---- @@ -44,8 +45,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 17:31:26.462352671 +0100 ---- to/smali/com/discord/stores/StoreUserSettings.smali 2020-06-20 17:31:48.509403576 +0100 +*** from/smali/com/discord/stores/StoreUserSettings.smali 2020-07-07 21:22:24.420000000 +0300 +--- to/smali/com/discord/stores/StoreUserSettings.smali 2020-07-08 01:48:57.070000000 +0300 *************** *** 396,401 **** --- 396,649 ---- @@ -304,8 +305,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 17:31:26.526356357 +0100 ---- to/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali 2020-06-20 17:37:06.226648224 +0100 +*** from/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali 2020-07-07 21:22:24.590000000 +0300 +--- to/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali 2020-07-08 01:49:10.340000000 +0300 *************** *** 46,51 **** --- 46,85 ---- @@ -353,18 +354,19 @@ diff -crB from/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali to/s *** 77,82 **** --- 111,120 ---- - move-result-object v4 + move-result-object v3 -+ invoke-static {v4}, Lcom/discord/utilities/rest/SendUtils$getPart$1$1;->interceptFilename(Ljava/lang/String;)Ljava/lang/String; ++ invoke-static {v3}, Lcom/discord/utilities/rest/SendUtils$getPart$1$1;->interceptFilename(Ljava/lang/String;)Ljava/lang/String; + -+ move-result-object v4 ++ move-result-object v3 + .line 4 iget-object p1, p0, Lcom/discord/utilities/rest/SendUtils$getPart$1$1;->this$0:Lcom/discord/utilities/rest/SendUtils$getPart$1; +Only in to/smali/com/discord/utilities/rest: SendUtils$getPart$1$1.smali.orig 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 17:31:26.646363267 +0100 ---- to/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali 2020-06-20 17:31:48.509403576 +0100 +*** from/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali 2020-07-07 21:22:24.900000000 +0300 +--- to/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali 2020-07-08 01:48:57.070000000 +0300 *************** *** 59,64 **** --- 59,74 ---- @@ -385,8 +387,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 17:31:26.650363497 +0100 ---- to/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali 2020-06-20 17:31:48.509403576 +0100 +*** from/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali 2020-07-07 21:22:24.900000000 +0300 +--- to/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali 2020-07-08 01:48:57.070000000 +0300 *************** *** 60,65 **** --- 60,89 ----