From 687fff10fc0fbedbfcc5bd1114e9382bbcbc49ea Mon Sep 17 00:00:00 2001 From: Ave Ozkal Date: Thu, 31 Oct 2019 12:16:47 +0300 Subject: [PATCH] slashcommands: Hopefully fix the 9.8.0 issue 16 bit variables are hell. Couldn't do this fix without: - https://github.com/JesusFreke/smali/wiki/Registers - http://pallergabor.uw.hu/androidblog/dalvik_opcodes.html --- patches/slashcommands/980.patch | 53 +++++++++++++-------------------- 1 file changed, 21 insertions(+), 32 deletions(-) diff --git a/patches/slashcommands/980.patch b/patches/slashcommands/980.patch index 47ec36cc..46d7ebd6 100644 --- a/patches/slashcommands/980.patch +++ b/patches/slashcommands/980.patch @@ -1,6 +1,8 @@ +Only in com.discord-980: build +Only in com.discord-980: dist 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:38:08.909649817 +0300 +--- com.discord-980/smali/com/discord/gateway/io/IncomingParser.smali 2019-10-31 11:54:20.838095041 +0300 *************** *** 703,708 **** --- 703,719 ---- @@ -23,7 +25,7 @@ diff -crB com.discord-980-base/smali/com/discord/gateway/io/IncomingParser.smali invoke-direct {v0}, Lcom/discord/models/domain/ModelMessageDelete;->()V 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:38:08.909649817 +0300 +--- com.discord-980/smali/com/discord/models/domain/ModelChannel.smali 2019-10-31 11:54:20.841428392 +0300 *************** *** 2193,2198 **** --- 2193,2208 ---- @@ -45,7 +47,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:38:08.912983167 +0300 +--- com.discord-980/smali/com/discord/stores/StoreMessages.smali 2019-10-31 12:15:32.691348882 +0300 *************** *** 480,485 **** --- 480,489 ---- @@ -2934,7 +2936,7 @@ diff -crB com.discord-980-base/smali/com/discord/stores/StoreMessages.smali com. invoke-static {v2, v0}, Lkotlin/jvm/internal/l;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V -+ invoke-static {p4}, Lcom/discord/stores/StoreMessages;->interceptSendMessage(Ljava/lang/String;)Ljava/lang/String; ++ invoke-static {v2}, Lcom/discord/stores/StoreMessages;->interceptSendMessage(Ljava/lang/String;)Ljava/lang/String; + + move-result-object p4 + @@ -2943,7 +2945,7 @@ diff -crB com.discord-980-base/smali/com/discord/stores/StoreMessages.smali com. if-eqz p6, :cond_0 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:38:08.916316518 +0300 +--- com.discord-980/smali/com/discord/stores/StoreUserSettings.smali 2019-10-31 11:54:20.841428392 +0300 *************** *** 1514,1519 **** --- 1514,1767 ---- @@ -3203,7 +3205,7 @@ diff -crB com.discord-980-base/smali/com/discord/stores/StoreUserSettings.smali 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:38:08.916316518 +0300 +--- com.discord-980/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali 2019-10-31 11:54:20.841428392 +0300 *************** *** 55,60 **** --- 55,70 ---- @@ -3225,27 +3227,10 @@ diff -crB com.discord-980-base/smali/com/discord/widgets/chat/input/WidgetChatIn 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: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 30 - .annotation system Ldalvik/annotation/Signature; - value = { - "(", +--- com.discord-980/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali 2019-10-31 12:14:12.337601666 +0300 *************** *** 375,380 **** ---- 375,406 ---- +--- 375,410 ---- move-result-object v12 @@ -3263,15 +3248,19 @@ diff -crB com.discord-980-base/smali/com/discord/widgets/chat/input/WidgetChatIn + + move-result-object v10 + -+ sget-object p1, Lcom/discord/widgets/chat/input/WidgetChatInputSend;->INSTANCE:Lcom/discord/widgets/chat/input/WidgetChatInputSend; ++ move-object/from16 v14, p0 + -+ iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1;->$chatInput:Lcom/discord/widgets/chat/input/WidgetChatInputEditText; ++ move-object/from16 v15, p1 + -+ invoke-static {p1, v0, v10}, Lcom/discord/widgets/chat/input/WidgetChatInputSend;->access$SetInput(Lcom/discord/widgets/chat/input/WidgetChatInputSend;Lcom/discord/widgets/chat/input/WidgetChatInputEditText;Ljava/lang/CharSequence;)Z ++ sget-object v15, Lcom/discord/widgets/chat/input/WidgetChatInputSend;->INSTANCE:Lcom/discord/widgets/chat/input/WidgetChatInputSend; + -+ move-result p1 ++ iget-object v0, v14, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1;->$chatInput:Lcom/discord/widgets/chat/input/WidgetChatInputEditText; + -+ return p1 ++ invoke-static {v15, v0, v10}, Lcom/discord/widgets/chat/input/WidgetChatInputSend;->access$SetInput(Lcom/discord/widgets/chat/input/WidgetChatInputSend;Lcom/discord/widgets/chat/input/WidgetChatInputEditText;Ljava/lang/CharSequence;)Z ++ ++ move-result v15 ++ ++ return v15 + + :cond_6 + @@ -3280,7 +3269,7 @@ diff -crB com.discord-980-base/smali/com/discord/widgets/chat/input/WidgetChatIn .line 74 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:38:08.916316518 +0300 +--- com.discord-980/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali 2019-10-31 11:54:20.841428392 +0300 *************** *** 60,65 **** --- 60,89 ---- @@ -3316,7 +3305,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:38:08.916316518 +0300 +--- com.discord-980/smali/okhttp3/MultipartBody$Part.smali 2019-10-31 11:54:20.841428392 +0300 *************** *** 43,50 **** return-void