From c240dde4ef0815c6f704b613bf240f0d94696005 Mon Sep 17 00:00:00 2001 From: Ave Ozkal Date: Sun, 12 May 2019 17:58:35 +0300 Subject: [PATCH] Fix pureevil, include pureevil in experiments once more --- patches/experiments/896.patch | 57 +++++++++++++++++++++++++++++------ patches/pureevil/896.patch | 50 ++++++++++++++---------------- 2 files changed, 70 insertions(+), 37 deletions(-) diff --git a/patches/experiments/896.patch b/patches/experiments/896.patch index 8250e01554..4bde2ca609 100644 --- a/patches/experiments/896.patch +++ b/patches/experiments/896.patch @@ -1,6 +1,6 @@ -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-05-12 12:13:46.831159818 +0300 ---- to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2019-05-12 12:15:27.027110432 +0300 +diff -crB com.discord-896-base/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali com.discord-896/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali +*** com.discord-896-base/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2019-05-12 12:13:46.831159818 +0300 +--- com.discord-896/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali 2019-05-12 17:57:29.788493519 +0300 *************** *** 81,108 **** .method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z @@ -32,9 +32,9 @@ diff -crB from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1. return p1 --- 81,86 ---- -diff -crB from/smali/com/discord/stores/StoreExperiments.smali to/smali/com/discord/stores/StoreExperiments.smali -*** from/smali/com/discord/stores/StoreExperiments.smali 2019-05-12 12:13:46.834493281 +0300 ---- to/smali/com/discord/stores/StoreExperiments.smali 2019-05-12 12:15:27.027110432 +0300 +diff -crB com.discord-896-base/smali/com/discord/stores/StoreExperiments.smali com.discord-896/smali/com/discord/stores/StoreExperiments.smali +*** com.discord-896-base/smali/com/discord/stores/StoreExperiments.smali 2019-05-12 12:13:46.834493281 +0300 +--- com.discord-896/smali/com/discord/stores/StoreExperiments.smali 2019-05-12 17:57:29.788493519 +0300 *************** *** 1231,1282 **** @@ -90,9 +90,47 @@ diff -crB from/smali/com/discord/stores/StoreExperiments.smali to/smali/com/disc .method public final isInitialized()Lrx/Observable; --- 1231,1237 ---- -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-05-12 12:13:47.341179553 +0300 ---- to/smali/com/discord/widgets/settings/WidgetSettings.smali 2019-05-12 12:15:27.027110432 +0300 +diff -crB com.discord-896-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali com.discord-896/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali +*** com.discord-896-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2019-05-12 12:13:47.341179553 +0300 +--- com.discord-896/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2019-05-12 17:58:07.975377325 +0300 +*************** +*** 77,96 **** + const-string v0, "meUser" + + .line 187 +! invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V +! +! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z +! +! move-result v2 + + const-string v1, "fontScale" + + .line 188 +! invoke-static {p3, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V +! +! invoke-virtual {p3}, Ljava/lang/Integer;->intValue()I +! +! move-result v3 + + const-string p3, "isAlphaTesterOrStaff" + +--- 77,88 ---- + const-string v0, "meUser" + + .line 187 +! const/4 v2, 0x1 + + const-string v1, "fontScale" + + .line 188 +! const/4 v3, 0x1 + + const-string p3, "isAlphaTesterOrStaff" + +diff -crB com.discord-896-base/smali/com/discord/widgets/settings/WidgetSettings.smali com.discord-896/smali/com/discord/widgets/settings/WidgetSettings.smali +*** com.discord-896-base/smali/com/discord/widgets/settings/WidgetSettings.smali 2019-05-12 12:13:47.341179553 +0300 +--- com.discord-896/smali/com/discord/widgets/settings/WidgetSettings.smali 2019-05-12 17:57:29.788493519 +0300 *************** *** 783,791 **** if-eqz p1, :cond_1 @@ -112,3 +150,4 @@ diff -crB from/smali/com/discord/widgets/settings/WidgetSettings.smali to/smali/ if-eq v2, v0, :cond_0 + diff --git a/patches/pureevil/896.patch b/patches/pureevil/896.patch index 41656612fd..0c9b9775da 100644 --- a/patches/pureevil/896.patch +++ b/patches/pureevil/896.patch @@ -1,45 +1,39 @@ -diff -crB -x dist -x build com.discord-876-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$2.smali com.discord-876/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$2.smali -*** com.discord-876-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$2.smali 2019-04-25 11:32:35.082923567 +0300 ---- com.discord-876/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$2.smali 2019-04-25 11:28:58.758998696 +0300 +diff -crB com.discord-896-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali com.discord-896/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali +*** com.discord-896-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2019-05-12 12:13:47.341179553 +0300 +--- com.discord-896/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2019-05-12 17:56:09.818038790 +0300 *************** -*** 108,118 **** +*** 77,96 **** const-string v0, "meUser" - .line 206 + .line 187 ! invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V ! ! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z ! ! move-result v2 - .line 207 - invoke-virtual {p3}, Ljava/lang/Boolean;->booleanValue()Z ---- 108,114 ---- + const-string v1, "fontScale" + + .line 188 +! invoke-static {p3, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V +! +! invoke-virtual {p3}, Ljava/lang/Integer;->intValue()I +! +! move-result v3 + + const-string p3, "isAlphaTesterOrStaff" + +--- 77,88 ---- const-string v0, "meUser" - .line 206 + .line 187 ! const/4 v2, 0x1 - .line 207 - invoke-virtual {p3}, Ljava/lang/Boolean;->booleanValue()Z -*************** -*** 124,134 **** - const-string p3, "fontScale" + const-string v1, "fontScale" - .line 208 -! invoke-static {p4, p3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V -! -! invoke-virtual {p4}, Ljava/lang/Integer;->intValue()I -! -! move-result v4 - - const-string p3, "isAlphaTesterOrStaff" - ---- 120,126 ---- - const-string p3, "fontScale" - - .line 208 -! const/4 v4, 0x1 + .line 188 +! const/4 v3, 0x1 const-string p3, "isAlphaTesterOrStaff" +