Fix some issues no 10.1.3

Closes #43
2019-12-21 21:01:40 +03:00 · 2019-12-21 21:01:40 +03:00 · 89a5dd1989
commit 89a5dd1989
parent 6c67440a91
2 changed files with 101 additions and 36 deletions
--- a/patches/slashcommands/1013.patch
+++ b/patches/slashcommands/1013.patch
@ -1,9 +1,6 @@
-Only in com.discord-1006: build
-Only in com.discord-1006: dist
-Only in com.discord-1006-base/smali/com: crashlytics
-diff -crB com.discord-1006-base/smali/com/discord/stores/StoreMessages.smali com.discord-1006/smali/com/discord/stores/StoreMessages.smali
-*** com.discord-1006-base/smali/com/discord/stores/StoreMessages.smali	2019-12-13 11:10:57.260791171 +0300
--- com.discord-1006/smali/com/discord/stores/StoreMessages.smali	2019-12-13 11:56:04.105650591 +0300
+diff -crB com.discord-1013-base/smali/com/discord/stores/StoreMessages.smali com.discord-1013/smali/com/discord/stores/StoreMessages.smali
+*** com.discord-1013-base/smali/com/discord/stores/StoreMessages.smali	2019-12-21 20:49:58.459280835 +0300
+--- com.discord-1013/smali/com/discord/stores/StoreMessages.smali	2019-12-21 20:54:46.217565221 +0300
 ***************
 *** 592,597 ****
 --- 592,601 ----
@ -2776,19 +2773,85 @@ diff -crB com.discord-1006-base/smali/com/discord/stores/StoreMessages.smali com
 +     return-object p0
 + .end method
 \ No newline at end of file
-Only in com.discord-1006/smali/com/discord/stores: StoreMessages.smali.orig
-Only in com.discord-1006/smali/com/discord/stores: StoreMessages.smali.rej
-Only in com.discord-1006/smali/com/discord/widgets/chat/input: WidgetChatInputSend$configureSendListeners$1.smali.orig
-Only in com.discord-1006/smali/com/discord/widgets/chat/input: WidgetChatInputSend$configureSendListeners$1.smali.rej
-Only in com.discord-1006-base/smali/com: facebook
-Only in com.discord-1006/smali_classes2/com: crashlytics
-Only in com.discord-1006/smali_classes2/com/facebook: animated
-Only in com.discord-1006/smali_classes2/com/facebook: cache
-Only in com.discord-1006/smali_classes2/com/facebook: common
-Only in com.discord-1006/smali_classes2/com/facebook: datasource
-Only in com.discord-1006/smali_classes2/com/facebook: drawee
-Only in com.discord-1006/smali_classes2/com/facebook: fbcore
-Only in com.discord-1006/smali_classes2/com/facebook: fresco
-Only in com.discord-1006/smali_classes2/com/facebook/imagepipeline: animated
-Only in com.discord-1006/smali_classes2/com/facebook/imagepipeline: R.smali
+diff -crB com.discord-1013-base/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali com.discord-1013/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali
+*** com.discord-1013-base/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali	2019-12-21 20:49:58.685948776 +0300
+--- com.discord-1013/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali	2019-12-21 20:59:52.242618939 +0300
+***************
+*** 305,310 ****
+--- 305,340 ----
+  
+      move-result-object v10
+  
+     # intercept edit here
+ 
+     const-string v15, "/ctc "
+ 
+     invoke-virtual {v10, v15}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
+ 
+     move-result v15
+ 
+     if-eqz v15, :cond_6
+ 
+     invoke-static {v10}, Lcom/discord/stores/StoreMessages;->slashCtc(Ljava/lang/String;)Ljava/lang/String;
+ 
+     move-result-object v10
+ 
+     move-object/from16 v14, p0
+ 
+     move-object/from16 v15, p1
+ 
+     sget-object v15, Lcom/discord/widgets/chat/input/WidgetChatInputSend;->INSTANCE:Lcom/discord/widgets/chat/input/WidgetChatInputSend;
+ 
+     iget-object v0, v14, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1;->$chatInput:Lcom/discord/widgets/chat/input/WidgetChatInputEditText;
+ 
+     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
+ 
+      invoke-static {v10, v4}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+  
+      .line 18
+***************
+*** 353,358 ****
+--- 383,418 ----
+  
+      move-result-object v13
+  
+     # intercept send here
+ 
+     const-string v15, "/ctc "
+ 
+     invoke-virtual {v12, v15}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
+ 
+     move-result v15
+ 
+     if-eqz v15, :cond_7
+ 
+     invoke-static {v12}, Lcom/discord/stores/StoreMessages;->slashCtc(Ljava/lang/String;)Ljava/lang/String;
+ 
+     move-result-object v12
+ 
+     move-object/from16 v14, p0
+ 
+     move-object/from16 v15, p1
+ 
+     sget-object v15, Lcom/discord/widgets/chat/input/WidgetChatInputSend;->INSTANCE:Lcom/discord/widgets/chat/input/WidgetChatInputSend;
+ 
+     iget-object v0, v14, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1;->$chatInput:Lcom/discord/widgets/chat/input/WidgetChatInputEditText;
+ 
+     invoke-static {v15, v0, v12}, 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_7
+ 
+      invoke-static {v13, v4}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+  
+      .line 27