patchport: fix dir-level issues also fix auto-fixed patches

This commit is contained in:
ave 2019-03-08 16:17:28 +03:00
parent bec0c97fd1
commit 29ca523bfe
No known key found for this signature in database
GPG key ID: 09356ABAA42C842B
5 changed files with 66 additions and 65 deletions

View file

@ -1,6 +1,6 @@
diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/app/App.smali /tmp/patchport/smali/com/discord/app/App.smali
*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/app/App.smali 2019-03-08 14:06:27.984696150 +0300
--- /tmp/patchport/smali/com/discord/app/App.smali 2019-03-08 14:56:15.429227454 +0300
diff -crB from/smali/com/discord/app/App.smali to/smali/com/discord/app/App.smali
*** from/smali/com/discord/app/App.smali 2019-03-08 15:11:35.434823908 +0300
--- to/smali/com/discord/app/App.smali 2019-03-08 16:16:11.778400066 +0300
***************
*** 212,218 ****
@ -18,9 +18,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/app/App.smal
.line 71
invoke-static {v0}, Lcom/discord/models/domain/emoji/ModelEmojiCustom;->setCdnUri(Ljava/lang/String;)V
diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/BuildConfig.smali /tmp/patchport/smali/com/discord/BuildConfig.smali
*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/BuildConfig.smali 2019-03-08 14:06:27.981362796 +0300
--- /tmp/patchport/smali/com/discord/BuildConfig.smali 2019-03-08 14:56:15.429227454 +0300
diff -crB from/smali/com/discord/BuildConfig.smali to/smali/com/discord/BuildConfig.smali
*** from/smali/com/discord/BuildConfig.smali 2019-03-08 15:11:35.431490555 +0300
--- to/smali/com/discord/BuildConfig.smali 2019-03-08 16:16:11.778400066 +0300
***************
*** 16,30 ****
@ -54,9 +54,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/BuildConfig.
.field public static final LOCAL_IP:Ljava/lang/String; = ""
diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/gateway/GatewaySocket.smali /tmp/patchport/smali/com/discord/gateway/GatewaySocket.smali
*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/gateway/GatewaySocket.smali 2019-03-08 14:06:28.034696454 +0300
--- /tmp/patchport/smali/com/discord/gateway/GatewaySocket.smali 2019-03-08 14:56:15.429227454 +0300
diff -crB from/smali/com/discord/gateway/GatewaySocket.smali to/smali/com/discord/gateway/GatewaySocket.smali
*** from/smali/com/discord/gateway/GatewaySocket.smali 2019-03-08 15:11:35.438157262 +0300
--- to/smali/com/discord/gateway/GatewaySocket.smali 2019-03-08 16:16:11.778400066 +0300
***************
*** 42,48 ****
.end annotation
@ -91,9 +91,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/gateway/Gate
invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali /tmp/patchport/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali
*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali 2019-03-08 14:06:28.028029746 +0300
--- /tmp/patchport/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali 2019-03-08 14:56:15.429227454 +0300
diff -crB from/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali to/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali
*** from/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali 2019-03-08 15:11:35.438157262 +0300
--- to/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali 2019-03-08 16:16:11.778400066 +0300
***************
*** 59,64 ****
--- 59,66 ----
@ -105,9 +105,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/gateway/io/O
.line 27
invoke-direct {p0, v0}, Lcom/discord/gateway/io/OutgoingPayload;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/StoreGatewayConnection.smali /tmp/patchport/smali/com/discord/stores/StoreGatewayConnection.smali
*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/StoreGatewayConnection.smali 2019-03-08 14:06:28.241364375 +0300
--- /tmp/patchport/smali/com/discord/stores/StoreGatewayConnection.smali 2019-03-08 14:56:15.429227454 +0300
diff -crB from/smali/com/discord/stores/StoreGatewayConnection.smali to/smali/com/discord/stores/StoreGatewayConnection.smali
*** from/smali/com/discord/stores/StoreGatewayConnection.smali 2019-03-08 15:11:35.458157384 +0300
--- to/smali/com/discord/stores/StoreGatewayConnection.smali 2019-03-08 16:16:11.778400066 +0300
***************
*** 1338,1344 ****
.line 232
@ -125,9 +125,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/Store
sget-object v3, Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider;->INSTANCE:Lcom/discord/utilities/rest/RestAPI$AppHeadersProvider;
diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/utilities/icon/IconUtils.smali /tmp/patchport/smali/com/discord/utilities/icon/IconUtils.smali
*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/utilities/icon/IconUtils.smali 2019-03-08 14:06:28.374698518 +0300
--- /tmp/patchport/smali/com/discord/utilities/icon/IconUtils.smali 2019-03-08 14:56:15.429227454 +0300
diff -crB from/smali/com/discord/utilities/icon/IconUtils.smali to/smali/com/discord/utilities/icon/IconUtils.smali
*** from/smali/com/discord/utilities/icon/IconUtils.smali 2019-03-08 15:11:35.471490799 +0300
--- to/smali/com/discord/utilities/icon/IconUtils.smali 2019-03-08 16:16:11.778400066 +0300
***************
*** 359,365 ****
goto :goto_2
@ -247,9 +247,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/utilities/ic
invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/utilities/rest/RestAPI$Companion.smali /tmp/patchport/smali/com/discord/utilities/rest/RestAPI$Companion.smali
*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/utilities/rest/RestAPI$Companion.smali 2019-03-08 14:06:28.411365407 +0300
--- /tmp/patchport/smali/com/discord/utilities/rest/RestAPI$Companion.smali 2019-03-08 14:56:15.432560807 +0300
diff -crB from/smali/com/discord/utilities/rest/RestAPI$Companion.smali to/smali/com/discord/utilities/rest/RestAPI$Companion.smali
*** from/smali/com/discord/utilities/rest/RestAPI$Companion.smali 2019-03-08 15:11:35.474824152 +0300
--- to/smali/com/discord/utilities/rest/RestAPI$Companion.smali 2019-03-08 16:16:11.778400066 +0300
***************
*** 318,324 ****
.line 213
@ -267,9 +267,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/utilities/re
check-cast v6, Lokhttp3/m;
diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali /tmp/patchport/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali
*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali 2019-03-08 14:06:28.441365589 +0300
--- /tmp/patchport/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali 2019-03-08 14:56:15.432560807 +0300
diff -crB from/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali to/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali
*** from/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali 2019-03-08 15:11:35.478157506 +0300
--- to/smali/com/discord/utilities/textprocessing/Rules$createCustomEmojiRule$1$parse$emojiNode$1.smali 2019-03-08 16:16:11.778400066 +0300
***************
*** 105,111 ****
:goto_1
@ -287,9 +287,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/utilities/te
invoke-direct {p2, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali /tmp/patchport/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali
*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali 2019-03-08 14:06:28.608033268 +0300
--- /tmp/patchport/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali 2019-03-08 14:56:15.432560807 +0300
diff -crB from/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali to/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali
*** from/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali 2019-03-08 15:11:35.494824274 +0300
--- to/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali 2019-03-08 16:16:11.778400066 +0300
***************
*** 610,616 ****
.line 104
@ -307,9 +307,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/widgets/chat
invoke-direct {v1, v6}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali /tmp/patchport/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali
*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali 2019-03-08 14:06:28.614699975 +0300
--- /tmp/patchport/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali 2019-03-08 14:56:15.432560807 +0300
diff -crB from/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali to/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali
*** from/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali 2019-03-08 15:11:35.498157628 +0300
--- to/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali 2019-03-08 16:16:11.778400066 +0300
***************
*** 1042,1048 ****
:goto_3