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/stores/StoreExperiments$ExperimentAndStaff.smali /tmp/patchport/smali/com/discord/stores/StoreExperiments$ExperimentAndStaff.smali
*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/StoreExperiments$ExperimentAndStaff.smali 2019-03-08 14:06:28.231364315 +0300
--- /tmp/patchport/smali/com/discord/stores/StoreExperiments$ExperimentAndStaff.smali 2019-03-08 14:56:18.065910145 +0300
diff -crB from/smali/com/discord/stores/StoreExperiments$ExperimentAndStaff.smali to/smali/com/discord/stores/StoreExperiments$ExperimentAndStaff.smali
*** from/smali/com/discord/stores/StoreExperiments$ExperimentAndStaff.smali 2019-03-08 15:11:35.454824030 +0300
--- to/smali/com/discord/stores/StoreExperiments$ExperimentAndStaff.smali 2019-03-08 16:16:14.428416070 +0300
***************
*** 212,219 ****
.method public final isStaff()Z
@ -19,9 +19,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/Store
return v0
.end method
diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali /tmp/patchport/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2019-03-08 14:06:28.231364315 +0300
--- /tmp/patchport/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2019-03-08 14:56:18.065910145 +0300
diff -crB from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
*** from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2019-03-08 15:11:35.454824030 +0300
--- to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2019-03-08 16:16:14.428416070 +0300
***************
*** 81,108 ****
.method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z
@ -53,9 +53,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/Store
return p1
--- 81,86 ----
diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali /tmp/patchport/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali
*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali 2019-03-08 14:06:28.231364315 +0300
--- /tmp/patchport/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali 2019-03-08 14:56:18.065910145 +0300
diff -crB from/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali to/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali
*** from/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali 2019-03-08 15:11:35.454824030 +0300
--- to/smali/com/discord/stores/StoreExperiments$getExperimentAndStaff$1.smali 2019-03-08 16:16:14.428416070 +0300
***************
*** 77,90 ****
.method public final call(Lcom/discord/models/domain/ModelUser;)Z
@ -80,9 +80,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/Store
return p1
.end method
diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/StoreExperiments.smali /tmp/patchport/smali/com/discord/stores/StoreExperiments.smali
*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/StoreExperiments.smali 2019-03-08 14:06:28.234697668 +0300
--- /tmp/patchport/smali/com/discord/stores/StoreExperiments.smali 2019-03-08 14:56:18.065910145 +0300
diff -crB from/smali/com/discord/stores/StoreExperiments.smali to/smali/com/discord/stores/StoreExperiments.smali
*** from/smali/com/discord/stores/StoreExperiments.smali 2019-03-08 15:11:35.454824030 +0300
--- to/smali/com/discord/stores/StoreExperiments.smali 2019-03-08 16:16:14.428416070 +0300
***************
*** 1247,1255 ****
@ -102,9 +102,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/stores/Store
if-eq v0, v1, :cond_1
diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali /tmp/patchport/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali
*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali 2019-03-08 14:06:28.828034604 +0300
--- /tmp/patchport/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali 2019-03-08 14:56:18.065910145 +0300
diff -crB from/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali to/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali
*** from/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali 2019-03-08 15:11:35.521491104 +0300
--- to/smali/com/discord/widgets/settings/WidgetSettingsAppearance$onViewBoundOrOnResume$1.smali 2019-03-08 16:16:14.428416070 +0300
***************
*** 71,83 ****
@ -128,9 +128,9 @@ diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/widgets/sett
const/4 v1, 0x0
diff -crB /home/ave/workbench/ctc/com.discord-856/smali/com/discord/widgets/settings/WidgetSettings.smali /tmp/patchport/smali/com/discord/widgets/settings/WidgetSettings.smali
*** /home/ave/workbench/ctc/com.discord-856/smali/com/discord/widgets/settings/WidgetSettings.smali 2019-03-08 14:06:28.831367958 +0300
--- /tmp/patchport/smali/com/discord/widgets/settings/WidgetSettings.smali 2019-03-08 14:56:18.065910145 +0300
diff -crB from/smali/com/discord/widgets/settings/WidgetSettings.smali to/smali/com/discord/widgets/settings/WidgetSettings.smali
*** from/smali/com/discord/widgets/settings/WidgetSettings.smali 2019-03-08 15:11:35.521491104 +0300
--- to/smali/com/discord/widgets/settings/WidgetSettings.smali 2019-03-08 16:16:14.428416070 +0300
***************
*** 785,793 ****
if-eqz p1, :cond_1