From 4135a5166ee79533e4532d766964c6207a681fa8 Mon Sep 17 00:00:00 2001 From: eatsfoobars Date: Mon, 7 Sep 2020 12:06:56 +0100 Subject: [PATCH] Fix supplemental breaking image uploading on 1251 --- patches/supplemental/1251.patch | 36 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/patches/supplemental/1251.patch b/patches/supplemental/1251.patch index 9bf0456..12a0a3b 100644 --- a/patches/supplemental/1251.patch +++ b/patches/supplemental/1251.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-07 10:44:48.839504135 +0100 ---- to/smali/com/discord/gateway/io/IncomingParser.smali 2020-09-07 10:45:02.975386067 +0100 +*** from/smali/com/discord/gateway/io/IncomingParser.smali 2020-09-07 11:59:55.461828650 +0100 +--- to/smali/com/discord/gateway/io/IncomingParser.smali 2020-09-07 12:00:58.597984163 +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-09-07 10:44:48.877503818 +0100 ---- to/smali/com/discord/models/domain/ModelChannel.smali 2020-09-07 10:45:02.975386067 +0100 +*** from/smali/com/discord/models/domain/ModelChannel.smali 2020-09-07 11:59:55.473828679 +0100 +--- to/smali/com/discord/models/domain/ModelChannel.smali 2020-09-07 12:00:58.597984163 +0100 *************** *** 2372,2377 **** --- 2372,2387 ---- @@ -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/models/domain/ModelMessageEmbed.smali to/smali/com/discord/models/domain/ModelMessageEmbed.smali -*** from/smali/com/discord/models/domain/ModelMessageEmbed.smali 2020-09-07 10:44:48.905503584 +0100 ---- to/smali/com/discord/models/domain/ModelMessageEmbed.smali 2020-09-07 10:45:02.975386067 +0100 +*** from/smali/com/discord/models/domain/ModelMessageEmbed.smali 2020-09-07 11:59:55.497828737 +0100 +--- to/smali/com/discord/models/domain/ModelMessageEmbed.smali 2020-09-07 12:00:58.597984163 +0100 *************** *** 2019,2025 **** .end method @@ -104,8 +104,8 @@ 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-07 10:44:49.165501412 +0100 ---- to/smali/com/discord/stores/StoreUserSettings.smali 2020-09-07 10:45:02.977386050 +0100 +*** from/smali/com/discord/stores/StoreUserSettings.smali 2020-09-07 11:59:55.693829216 +0100 +--- to/smali/com/discord/stores/StoreUserSettings.smali 2020-09-07 12:00:58.597984163 +0100 *************** *** 396,401 **** --- 396,685 ---- @@ -400,8 +400,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-09-07 10:44:49.289500376 +0100 ---- to/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali 2020-09-07 10:45:02.977386050 +0100 +*** from/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali 2020-09-07 11:59:55.783829436 +0100 +--- to/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali 2020-09-07 12:04:02.524440038 +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-07 10:44:49.477498805 +0100 ---- to/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali 2020-09-07 10:45:02.977386050 +0100 +*** from/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali 2020-09-07 11:59:55.927829787 +0100 +--- to/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali 2020-09-07 12:00:58.597984163 +0100 *************** *** 59,64 **** --- 59,74 ---- @@ -481,8 +481,8 @@ diff -crB from/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.sm iget-boolean v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputEditText$1;->empty: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-09-07 10:44:49.481498772 +0100 ---- to/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali 2020-09-07 10:45:02.977386050 +0100 +*** from/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali 2020-09-07 11:59:55.931829797 +0100 +--- to/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali 2020-09-07 12:00:58.597984163 +0100 *************** *** 60,65 **** --- 60,92 ---- @@ -520,8 +520,8 @@ diff -crB from/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali to .locals 1 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-07 10:44:49.507498555 +0100 ---- to/smali/com/discord/widgets/chat/list/InlineMediaView.smali 2020-09-07 10:45:02.977386050 +0100 +*** from/smali/com/discord/widgets/chat/list/InlineMediaView.smali 2020-09-07 11:59:55.953829851 +0100 +--- to/smali/com/discord/widgets/chat/list/InlineMediaView.smali 2020-09-07 12:00:58.597984163 +0100 *************** *** 1235,1240 **** --- 1235,1250 ----