From af9c3084c49328b19cff007a2ab389bc9b81da9c Mon Sep 17 00:00:00 2001 From: eatsfoobars Date: Sun, 13 Sep 2020 15:09:25 +0100 Subject: [PATCH] Fix supplemental breaking image uploading on 1259 --- patches/supplemental/1259.patch | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/patches/supplemental/1259.patch b/patches/supplemental/1259.patch index b4261d5..757736c 100644 --- a/patches/supplemental/1259.patch +++ b/patches/supplemental/1259.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-09-13 11:49:33.979152367 +0100 ---- to/smali/com/discord/gateway/io/IncomingParser.smali 2020-09-13 11:49:46.556261724 +0100 +--- to/smali/com/discord/gateway/io/IncomingParser.smali 2020-09-13 15:06:04.485817866 +0100 *************** *** 754,759 **** --- 754,770 ---- @@ -23,7 +23,7 @@ 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-09-13 11:49:33.989152768 +0100 ---- to/smali/com/discord/models/domain/ModelChannel.smali 2020-09-13 11:49:46.558263319 +0100 +--- to/smali/com/discord/models/domain/ModelChannel.smali 2020-09-13 15:06:04.485817866 +0100 *************** *** 2372,2377 **** --- 2372,2387 ---- @@ -45,7 +45,7 @@ diff -crB from/smali/com/discord/models/domain/ModelChannel.smali to/smali/com/d diff -crB from/smali/com/discord/models/domain/ModelMessageEmbed.smali to/smali/com/discord/models/domain/ModelMessageEmbed.smali *** from/smali/com/discord/models/domain/ModelMessageEmbed.smali 2020-09-13 11:49:34.009153565 +0100 ---- to/smali/com/discord/models/domain/ModelMessageEmbed.smali 2020-09-13 11:49:46.558263319 +0100 +--- to/smali/com/discord/models/domain/ModelMessageEmbed.smali 2020-09-13 15:06:04.485817866 +0100 *************** *** 2019,2025 **** .end method @@ -105,7 +105,7 @@ diff -crB from/smali/com/discord/models/domain/ModelMessageEmbed.smali to/smali/ .method public toString()Ljava/lang/String; diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/discord/stores/StoreUserSettings.smali *** from/smali/com/discord/stores/StoreUserSettings.smali 2020-09-13 11:49:34.131158397 +0100 ---- to/smali/com/discord/stores/StoreUserSettings.smali 2020-09-13 11:49:46.558263319 +0100 +--- to/smali/com/discord/stores/StoreUserSettings.smali 2020-09-13 15:06:04.487817876 +0100 *************** *** 421,426 **** --- 421,710 ---- @@ -401,7 +401,7 @@ diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/dis 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-09-13 11:49:34.199161090 +0100 ---- to/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali 2020-09-13 11:49:46.558263319 +0100 +--- to/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali 2020-09-13 15:06:39.409966444 +0100 *************** *** 46,51 **** --- 46,85 ---- @@ -451,16 +451,16 @@ diff -crB from/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali to/s move-result-object v2 -+ invoke-static {v3}, Lcom/discord/utilities/rest/SendUtils$getPart$1$1;->interceptFilename(Ljava/lang/String;)Ljava/lang/String; ++ invoke-static {v2}, Lcom/discord/utilities/rest/SendUtils$getPart$1$1;->interceptFilename(Ljava/lang/String;)Ljava/lang/String; + -+ move-result-object v3 ++ move-result-object v2 + .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-09-13 11:49:34.341166714 +0100 ---- to/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali 2020-09-13 11:49:46.558263319 +0100 +--- to/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali 2020-09-13 15:06:04.487817876 +0100 *************** *** 59,64 **** --- 59,74 ---- @@ -482,7 +482,7 @@ diff -crB from/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.sm 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-09-13 11:49:34.343166793 +0100 ---- to/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali 2020-09-13 11:49:46.558263319 +0100 +--- to/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali 2020-09-13 15:06:04.487817876 +0100 *************** *** 60,65 **** --- 60,92 ---- @@ -521,7 +521,7 @@ diff -crB from/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali to diff -crB from/smali/com/discord/widgets/chat/list/InlineMediaView.smali to/smali/com/discord/widgets/chat/list/InlineMediaView.smali *** from/smali/com/discord/widgets/chat/list/InlineMediaView.smali 2020-09-13 11:49:34.391168694 +0100 ---- to/smali/com/discord/widgets/chat/list/InlineMediaView.smali 2020-09-13 11:49:46.558263319 +0100 +--- to/smali/com/discord/widgets/chat/list/InlineMediaView.smali 2020-09-13 15:06:04.487817876 +0100 *************** *** 1233,1238 **** --- 1233,1248 ----