From 50bb8044188d5f356b1bc668ef29cd479b88544c Mon Sep 17 00:00:00 2001 From: Ave Ozkal Date: Fri, 10 Jan 2020 17:08:24 +0300 Subject: [PATCH] slashcommands:Fix 10.1.9 builds --- patches/notrack/1019-post.sh | 2 -- patches/slashcommands/1019.patch | 21 +++++++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/patches/notrack/1019-post.sh b/patches/notrack/1019-post.sh index 956e2fc..43dc557 100644 --- a/patches/notrack/1019-post.sh +++ b/patches/notrack/1019-post.sh @@ -1,5 +1,3 @@ #!/bin/bash mv smali/com/crashlytics smali_classes2/com/ -cp -r smali/com/facebook smali_classes2/com/ -rm -rf smali/com/facebook mv smali/com/airbnb smali_classes2/com/ diff --git a/patches/slashcommands/1019.patch b/patches/slashcommands/1019.patch index 4e4a198..febd89f 100644 --- a/patches/slashcommands/1019.patch +++ b/patches/slashcommands/1019.patch @@ -1,6 +1,8 @@ -diff -crB from/smali/com/discord/stores/StoreMessages.smali to/smali/com/discord/stores/StoreMessages.smali -*** from/smali/com/discord/stores/StoreMessages.smali 2020-01-10 14:08:30.055000416 +0300 ---- to/smali/com/discord/stores/StoreMessages.smali 2020-01-10 14:34:07.402810627 +0300 +Only in com.discord-1019: build +Only in com.discord-1019: dist +diff -crB com.discord-1019-base/smali/com/discord/stores/StoreMessages.smali com.discord-1019/smali/com/discord/stores/StoreMessages.smali +*** com.discord-1019-base/smali/com/discord/stores/StoreMessages.smali 2020-01-10 14:08:30.055000416 +0300 +--- com.discord-1019/smali/com/discord/stores/StoreMessages.smali 2020-01-10 17:07:41.483341834 +0300 *************** *** 611,616 **** --- 611,620 ---- @@ -16,10 +18,12 @@ diff -crB from/smali/com/discord/stores/StoreMessages.smali to/smali/com/discord *************** *** 1285,1290 **** ---- 1289,1300 ---- +--- 1289,1302 ---- const/4 v14, 0x0 ++ move-object/from16 v8, p4 ++ + invoke-static {v8}, Lcom/discord/stores/StoreMessages;->interceptSendMessage(Ljava/lang/String;)Ljava/lang/String; + + move-result-object v8 @@ -31,7 +35,7 @@ diff -crB from/smali/com/discord/stores/StoreMessages.smali to/smali/com/discord iget-object v0, v7, Lcom/discord/stores/StoreMessages;->clock:Lcom/discord/utilities/time/Clock; *************** *** 1369,1371 **** ---- 1379,4118 ---- +--- 1381,4120 ---- throw v0 .end method @@ -2773,9 +2777,9 @@ diff -crB from/smali/com/discord/stores/StoreMessages.smali to/smali/com/discord + return-object p0 + .end method \ No newline at end of file -diff -crB from/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali to/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali -*** from/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali 2020-01-10 14:08:30.331668478 +0300 ---- to/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali 2020-01-10 14:34:07.402810627 +0300 +diff -crB com.discord-1019-base/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali com.discord-1019/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali +*** com.discord-1019-base/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali 2020-01-10 14:08:30.331668478 +0300 +--- com.discord-1019/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali 2020-01-10 16:59:31.223187411 +0300 *************** *** 305,310 **** --- 305,340 ---- @@ -2854,3 +2858,4 @@ diff -crB from/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configur invoke-static {v13, v4}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V .line 27 +