From 4719221fc4eb63d3b1346b524465daf47281778a Mon Sep 17 00:00:00 2001 From: Ave Ozkal Date: Thu, 31 Oct 2019 11:39:12 +0300 Subject: [PATCH] slashcommands: attempt a fix on 9.8.0 --- patches/slashcommands/980.patch | 41 ++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/patches/slashcommands/980.patch b/patches/slashcommands/980.patch index 95a8e33..b6a0ed1 100644 --- a/patches/slashcommands/980.patch +++ b/patches/slashcommands/980.patch @@ -1,6 +1,6 @@ diff -crB com.discord-980-base/smali/com/discord/gateway/io/IncomingParser.smali com.discord-980/smali/com/discord/gateway/io/IncomingParser.smali *** com.discord-980-base/smali/com/discord/gateway/io/IncomingParser.smali 2019-10-31 11:15:16.505805365 +0300 ---- com.discord-980/smali/com/discord/gateway/io/IncomingParser.smali 2019-10-31 11:24:23.145366351 +0300 +--- com.discord-980/smali/com/discord/gateway/io/IncomingParser.smali 2019-10-31 11:38:08.909649817 +0300 *************** *** 703,708 **** --- 703,719 ---- @@ -21,10 +21,9 @@ diff -crB com.discord-980-base/smali/com/discord/gateway/io/IncomingParser.smali new-instance v0, Lcom/discord/models/domain/ModelMessageDelete; invoke-direct {v0}, Lcom/discord/models/domain/ModelMessageDelete;->()V -Only in com.discord-980/smali/com/discord/gateway/io: IncomingParser.smali.orig diff -crB com.discord-980-base/smali/com/discord/models/domain/ModelChannel.smali com.discord-980/smali/com/discord/models/domain/ModelChannel.smali *** com.discord-980-base/smali/com/discord/models/domain/ModelChannel.smali 2019-10-31 11:15:16.529138822 +0300 ---- com.discord-980/smali/com/discord/models/domain/ModelChannel.smali 2019-10-31 11:24:23.148699701 +0300 +--- com.discord-980/smali/com/discord/models/domain/ModelChannel.smali 2019-10-31 11:38:08.909649817 +0300 *************** *** 2193,2198 **** --- 2193,2208 ---- @@ -46,7 +45,7 @@ diff -crB com.discord-980-base/smali/com/discord/models/domain/ModelChannel.smal diff -crB com.discord-980-base/smali/com/discord/stores/StoreMessages.smali com.discord-980/smali/com/discord/stores/StoreMessages.smali *** com.discord-980-base/smali/com/discord/stores/StoreMessages.smali 2019-10-31 11:15:16.735806580 +0300 ---- com.discord-980/smali/com/discord/stores/StoreMessages.smali 2019-10-31 11:25:31.425720540 +0300 +--- com.discord-980/smali/com/discord/stores/StoreMessages.smali 2019-10-31 11:38:08.912983167 +0300 *************** *** 480,485 **** --- 480,489 ---- @@ -2942,11 +2941,9 @@ diff -crB com.discord-980-base/smali/com/discord/stores/StoreMessages.smali com. const/4 v0, 0x1 if-eqz p6, :cond_0 -Only in com.discord-980/smali/com/discord/stores: StoreMessages.smali.orig -Only in com.discord-980/smali/com/discord/stores: StoreMessages.smali.rej diff -crB com.discord-980-base/smali/com/discord/stores/StoreUserSettings.smali com.discord-980/smali/com/discord/stores/StoreUserSettings.smali *** com.discord-980-base/smali/com/discord/stores/StoreUserSettings.smali 2019-10-31 11:15:16.802473599 +0300 ---- com.discord-980/smali/com/discord/stores/StoreUserSettings.smali 2019-10-31 11:24:23.155366403 +0300 +--- com.discord-980/smali/com/discord/stores/StoreUserSettings.smali 2019-10-31 11:38:08.916316518 +0300 *************** *** 1514,1519 **** --- 1514,1767 ---- @@ -3204,10 +3201,9 @@ diff -crB com.discord-980-base/smali/com/discord/stores/StoreUserSettings.smali .method handleConnectionOpen(Lcom/discord/models/domain/ModelPayload;)V .locals 0 -Only in com.discord-980/smali/com/discord/stores: StoreUserSettings.smali.orig diff -crB com.discord-980-base/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali com.discord-980/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali *** com.discord-980-base/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali 2019-10-31 11:15:17.142475394 +0300 ---- com.discord-980/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali 2019-10-31 11:26:13.789273624 +0300 +--- com.discord-980/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali 2019-10-31 11:38:08.916316518 +0300 *************** *** 55,60 **** --- 55,70 ---- @@ -3227,11 +3223,26 @@ diff -crB com.discord-980-base/smali/com/discord/widgets/chat/input/WidgetChatIn .line 221 invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z -Only in com.discord-980/smali/com/discord/widgets/chat/input: WidgetChatInputEditText$1.smali.orig -Only in com.discord-980/smali/com/discord/widgets/chat/input: WidgetChatInputEditText$1.smali.rej diff -crB com.discord-980-base/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali com.discord-980/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali *** com.discord-980-base/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali 2019-10-31 11:15:17.145808745 +0300 ---- com.discord-980/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali 2019-10-31 11:27:53.439790535 +0300 +--- com.discord-980/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali 2019-10-31 11:39:01.976591759 +0300 +*************** +*** 75,81 **** + .end method + + .method public final invoke(Ljava/util/List;)Z +! .locals 20 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", +--- 75,81 ---- + .end method + + .method public final invoke(Ljava/util/List;)Z +! .locals 22 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", *************** *** 375,380 **** --- 375,406 ---- @@ -3267,11 +3278,9 @@ diff -crB com.discord-980-base/smali/com/discord/widgets/chat/input/WidgetChatIn invoke-static {v12, v4}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V .line 74 -Only in com.discord-980/smali/com/discord/widgets/chat/input: WidgetChatInputSend$configureSendListeners$1.smali.orig -Only in com.discord-980/smali/com/discord/widgets/chat/input: WidgetChatInputSend$configureSendListeners$1.smali.rej diff -crB com.discord-980-base/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali com.discord-980/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali *** com.discord-980-base/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali 2019-10-31 11:15:17.149142096 +0300 ---- com.discord-980/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali 2019-10-31 11:24:23.158699753 +0300 +--- com.discord-980/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali 2019-10-31 11:38:08.916316518 +0300 *************** *** 60,65 **** --- 60,89 ---- @@ -3307,7 +3316,7 @@ diff -crB com.discord-980-base/smali/com/discord/widgets/chat/input/WidgetChatIn diff -crB com.discord-980-base/smali/okhttp3/MultipartBody$Part.smali com.discord-980/smali/okhttp3/MultipartBody$Part.smali *** com.discord-980-base/smali/okhttp3/MultipartBody$Part.smali 2019-10-31 11:15:17.639144684 +0300 ---- com.discord-980/smali/okhttp3/MultipartBody$Part.smali 2019-10-31 11:24:23.158699753 +0300 +--- com.discord-980/smali/okhttp3/MultipartBody$Part.smali 2019-10-31 11:38:08.916316518 +0300 *************** *** 43,50 **** return-void