diff --git a/patches/mutant/1167.patch b/patches/mutant/1167.patch index 7267df2..c5c6a59 100644 --- a/patches/mutant/1167.patch +++ b/patches/mutant/1167.patch @@ -1,6 +1,6 @@ -diff -crB com.discord-1006-base/assets/data/emojis.json com.discord-1006/assets/data/emojis.json -*** com.discord-1006-base/assets/data/emojis.json 2019-12-13 11:10:59.267469722 +0300 ---- com.discord-1006/assets/data/emojis.json 2019-12-13 12:23:07.968967697 +0300 +diff -crB from/assets/data/emojis.json to/assets/data/emojis.json +*** from/assets/data/emojis.json 2020-06-20 17:42:10.947242367 +0100 +--- to/assets/data/emojis.json 2020-06-20 17:42:22.747090236 +0100 *************** *** 4,31 **** "names": [ @@ -51945,9 +51945,9 @@ diff -crB com.discord-1006-base/assets/data/emojis.json com.discord-1006/assets/ ] } \ No newline at end of file -diff -crB com.discord-1006-base/smali/com/discord/models/domain/emoji/ModelEmojiUnicode.smali com.discord-1006/smali/com/discord/models/domain/emoji/ModelEmojiUnicode.smali -*** com.discord-1006-base/smali/com/discord/models/domain/emoji/ModelEmojiUnicode.smali 2019-12-13 11:10:57.130790401 +0300 ---- com.discord-1006/smali/com/discord/models/domain/emoji/ModelEmojiUnicode.smali 2019-12-13 12:23:44.642532931 +0300 +diff -crB from/smali/com/discord/models/domain/emoji/ModelEmojiUnicode.smali to/smali/com/discord/models/domain/emoji/ModelEmojiUnicode.smali +*** from/smali/com/discord/models/domain/emoji/ModelEmojiUnicode.smali 2020-06-20 17:42:08.573273169 +0100 +--- to/smali/com/discord/models/domain/emoji/ModelEmojiUnicode.smali 2020-06-20 17:42:22.747090236 +0100 *************** *** 79,85 **** @@ -51955,7 +51955,7 @@ diff -crB com.discord-1006-base/smali/com/discord/models/domain/emoji/ModelEmoji .method public static constructor ()V ! .locals 5 - const-string v0, "\ud83c\udffb" + const-string/jumbo v0, "\ud83c\udffb" --- 79,85 ---- @@ -51963,12 +51963,12 @@ diff -crB com.discord-1006-base/smali/com/discord/models/domain/emoji/ModelEmoji .method public static constructor ()V ! .locals 50 - const-string v0, "\ud83c\udffb" + const-string/jumbo v0, "\ud83c\udffb" *************** *** 91,98 **** - const-string v4, "\ud83c\udfff" + const-string/jumbo v4, "\ud83c\udfff" .line 1 ! filled-new-array {v0, v1, v2, v3, v4}, [Ljava/lang/String; @@ -51977,7 +51977,7 @@ diff -crB com.discord-1006-base/smali/com/discord/models/domain/emoji/ModelEmoji --- 91,188 ---- - const-string v4, "\ud83c\udfff" + const-string/jumbo v4, "\ud83c\udfff" + const-string v5, "􁘀" + @@ -52091,6 +52091,3 @@ diff -crB com.discord-1006-base/smali/com/discord/models/domain/emoji/ModelEmoji goto :goto_1 -Only in com.discord-1006/smali/com/discord/models/domain/emoji: ModelEmojiUnicode.smali.orig -Only in com.discord-1006/smali/com/discord/models/domain/emoji: ModelEmojiUnicode.smali.rej - diff --git a/patches/supplemental/1167.patch b/patches/supplemental/1167.patch index e100c9b..7ba5b67 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 ----