Fix experiments, notrack and litecord for 939

(also remove litecord for 938 as I broke it back then it seems, whoops!)
2019-08-17 00:15:04 +03:00 · 2019-08-17 00:15:04 +03:00 · 3d9e789198
parent eef14a819d
commit 3d9e789198
5 changed files with 3520 additions and 4 deletions
--- a/patches/experiments/939.patch
+++ b/patches/experiments/939.patch
@ -1 +1,182 @@
-1565988026
+diff -crB com.discord-939-base/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali com.discord-939/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
+*** com.discord-939-base/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali	2019-08-16 21:39:30.562937403 +0300
+--- com.discord-939/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali	2019-08-17 00:13:15.896483413 +0300
+***************
+*** 80,108 ****
+  
+  .method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z
+      .locals 1
+- 
+-     const-string v0, "meUser"
+- 
+-     .line 98
+-     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+- 
+-     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
+- 
+-     move-result p1
+- 
+-     if-nez p1, :cond_1
+- 
+-     if-eqz p2, :cond_0
+- 
+-     goto :goto_0
+- 
+-     :cond_0
+-     const/4 p1, 0x0
+- 
+-     return p1
+- 
+-     :cond_1
+-     :goto_0
+      const/4 p1, 0x1
+  
+      return p1
+--- 80,85 ----
+Only in com.discord-939/smali/com/discord/stores: StoreExperiments$getExperimentalAlpha$1.smali.orig
+Only in com.discord-939/smali/com/discord/stores: StoreExperiments$getExperimentalAlpha$1.smali.rej
+diff -crB com.discord-939-base/smali/com/discord/stores/StoreExperiments.smali com.discord-939/smali/com/discord/stores/StoreExperiments.smali
+*** com.discord-939-base/smali/com/discord/stores/StoreExperiments.smali	2019-08-16 21:39:30.566270755 +0300
+--- com.discord-939/smali/com/discord/stores/StoreExperiments.smali	2019-08-17 00:13:30.536572396 +0300
+***************
+*** 1236,1296 ****
+  .end method
+  
+  .method public final isExperimentalAlpha()Z
+!     .locals 4
+! 
+!     .line 91
+!     iget-boolean v0, p0, Lcom/discord/stores/StoreExperiments;->initialized:Z
+! 
+!     const/4 v1, 0x1
+! 
+!     if-eqz v0, :cond_0
+! 
+!     iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->stream:Lcom/discord/stores/StoreStream;
+! 
+!     invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getUsers$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreUser;
+! 
+!     move-result-object v0
+! 
+!     iget-object v0, v0, Lcom/discord/stores/StoreUser;->me:Lcom/discord/models/domain/ModelUser$Me;
+! 
+!     if-eqz v0, :cond_0
+! 
+!     invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser$Me;->isStaff()Z
+! 
+!     move-result v0
+! 
+!     if-eq v0, v1, :cond_1
+! 
+!     :cond_0
+!     iget-object v0, p0, Lcom/discord/stores/StoreExperiments;->stream:Lcom/discord/stores/StoreStream;
+! 
+!     invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getGuilds$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreGuilds;
+! 
+!     move-result-object v0
+! 
+!     iget-object v0, v0, Lcom/discord/stores/StoreGuilds;->guilds:Ljava/util/Map;
+! 
+!     const-string v2, "stream.guilds.guilds"
+! 
+!     invoke-static {v0, v2}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+! 
+!     const-wide v2, 0x2bc056ab0800006L
+! 
+!     invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+! 
+!     move-result-object v2
+! 
+!     invoke-interface {v0, v2}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z
+! 
+!     move-result v0
+! 
+!     if-eqz v0, :cond_2
+! 
+!     :cond_1
+!     return v1
+! 
+!     :cond_2
+!     const/4 v0, 0x0
+  
+      return v0
+  .end method
+--- 1236,1243 ----
+  .end method
+  
+  .method public final isExperimentalAlpha()Z
+!     .locals 1
+!     const/4 v0, 0x1
+  
+      return v0
+  .end method
+Only in com.discord-939/smali/com/discord/stores: StoreExperiments.smali.orig
+Only in com.discord-939/smali/com/discord/stores: StoreExperiments.smali.rej
+diff -crB com.discord-939-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali com.discord-939/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
+*** com.discord-939-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali	2019-08-16 21:39:30.952939553 +0300
+--- com.discord-939/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali	2019-08-17 00:12:49.739657765 +0300
+***************
+*** 77,87 ****
+      const-string v0, "meUser"
+  
+      .line 186
+!     invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->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"
+  
+--- 77,83 ----
+      const-string v0, "meUser"
+  
+      .line 186
+!     const/4 v2, 0x1
+  
+      const-string v1, "fontScale"
+  
+***************
+*** 95,105 ****
+      const-string p3, "isAlphaTesterOrStaff"
+  
+      .line 188
+!     invoke-static {p4, p3}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+! 
+!     invoke-virtual {p4}, Ljava/lang/Boolean;->booleanValue()Z
+! 
+!     move-result v4
+  
+      .line 189
+      invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+--- 91,97 ----
+      const-string p3, "isAlphaTesterOrStaff"
+  
+      .line 188
+!     const/4 v4, 0x1
+  
+      .line 189
+      invoke-static {p1, v0}, Lkotlin/jvm/internal/k;->g(Ljava/lang/Object;Ljava/lang/String;)V
+diff -crB com.discord-939-base/smali/com/discord/widgets/settings/WidgetSettings.smali com.discord-939/smali/com/discord/widgets/settings/WidgetSettings.smali
+*** com.discord-939-base/smali/com/discord/widgets/settings/WidgetSettings.smali	2019-08-16 21:39:30.956272904 +0300
+--- com.discord-939/smali/com/discord/widgets/settings/WidgetSettings.smali	2019-08-17 00:12:49.739657765 +0300
+***************
+*** 888,896 ****
+      if-eqz p1, :cond_1
+  
+      .line 118
+!     invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z
+! 
+!     move-result v2
+  
+      if-eq v2, v0, :cond_0
+  
+--- 888,894 ----
+      if-eqz p1, :cond_1
+  
+      .line 118
+!     const/4 v2, 0x1
+  
+      if-eq v2, v0, :cond_0
+  
+
--- a/patches/litecord/938.patch
+++ b/patches/litecord/938.patch
@ -1 +0,0 @@
-dev.litecord.top
--- a/patches/litecord/939.patch
+++ b/patches/litecord/939.patch
@ -1 +1,294 @@
-dev.litecord.top
+diff -crB com.discord-939-base/smali/com/discord/app/App.smali com.discord-939/smali/com/discord/app/App.smali
+*** com.discord-939-base/smali/com/discord/app/App.smali	2019-08-16 21:39:30.392936467 +0300
+--- com.discord-939/smali/com/discord/app/App.smali	2019-08-17 00:14:43.040346403 +0300
+***************
+*** 217,223 ****
+  
+      invoke-virtual {v1, v2}, Lcom/discord/utilities/view/text/LinkifiedTextView$Companion;->init(Lkotlin/jvm/functions/Function2;)Lkotlin/Unit;
+  
+!     const-string v1, "https://cdn.discordapp.com"
+  
+      .line 74
+      invoke-static {v1}, Lcom/discord/models/domain/emoji/ModelEmojiCustom;->setCdnUri(Ljava/lang/String;)V
+--- 217,223 ----
+  
+      invoke-virtual {v1, v2}, Lcom/discord/utilities/view/text/LinkifiedTextView$Companion;->init(Lkotlin/jvm/functions/Function2;)Lkotlin/Unit;
+  
+!     const-string v1, "https://dev.litecord.top"
+  
+      .line 74
+      invoke-static {v1}, Lcom/discord/models/domain/emoji/ModelEmojiCustom;->setCdnUri(Ljava/lang/String;)V
+Only in com.discord-939/smali/com/discord/app: App.smali.orig
+Only in com.discord-939/smali/com/discord/app: App.smali.rej
+diff -crB com.discord-939-base/smali/com/discord/BuildConfig.smali com.discord-939/smali/com/discord/BuildConfig.smali
+*** com.discord-939-base/smali/com/discord/BuildConfig.smali	2019-08-16 21:39:30.389603115 +0300
+--- com.discord-939/smali/com/discord/BuildConfig.smali	2019-08-17 00:14:19.146867850 +0300
+***************
+*** 18,32 ****
+  
+  .field public static final FLAVOR_vendor:Ljava/lang/String; = "discord"
+  
+! .field public static final HOST:Ljava/lang/String; = "https://discordapp.com"
+  
+! .field public static final HOST_API:Ljava/lang/String; = "https://discordapp.com/api/"
+  
+! .field public static final HOST_CDN:Ljava/lang/String; = "https://cdn.discordapp.com"
+  
+  .field public static final HOST_GIFT:Ljava/lang/String; = "https://discord.gift"
+  
+! .field public static final HOST_INVITE:Ljava/lang/String; = "https://discord.gg"
+  
+  .field public static final LOCAL_IP:Ljava/lang/String; = ""
+  
+--- 18,32 ----
+  
+  .field public static final FLAVOR_vendor:Ljava/lang/String; = "discord"
+  
+! .field public static final HOST:Ljava/lang/String; = "https://dev.litecord.top"
+  
+! .field public static final HOST_API:Ljava/lang/String; = "https://dev.litecord.top/api/"
+  
+! .field public static final HOST_CDN:Ljava/lang/String; = "https://dev.litecord.top"
+  
+  .field public static final HOST_GIFT:Ljava/lang/String; = "https://discord.gift"
+  
+! .field public static final HOST_INVITE:Ljava/lang/String; = "https://dev.litecord.top"
+  
+  .field public static final LOCAL_IP:Ljava/lang/String; = ""
+  
+Only in com.discord-939/smali/com/discord: BuildConfig.smali.orig
+diff -crB com.discord-939-base/smali/com/discord/gateway/GatewaySocket.smali com.discord-939/smali/com/discord/gateway/GatewaySocket.smali
+*** com.discord-939-base/smali/com/discord/gateway/GatewaySocket.smali	2019-08-16 21:39:30.419603280 +0300
+--- com.discord-939/smali/com/discord/gateway/GatewaySocket.smali	2019-08-17 00:14:19.150201204 +0300
+***************
+*** 42,48 ****
+      .end annotation
+  .end field
+  
+! .field private static final GATEWAY_COMPRESSION:Ljava/lang/String; = "zlib-stream"
+  
+  .field private static final GATEWAY_ENCODING:Ljava/lang/String; = "json"
+  
+--- 42,48 ----
+      .end annotation
+  .end field
+  
+! .field private static final GATEWAY_COMPRESSION:Ljava/lang/String; = ""
+  
+  .field private static final GATEWAY_ENCODING:Ljava/lang/String; = "json"
+  
+***************
+*** 1050,1056 ****
+  
+      invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+  
+!     const-string p1, "/?encoding=json&v=6&compress=zlib-stream"
+  
+      invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+  
+--- 1050,1056 ----
+  
+      invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+  
+!     const-string p1, "/?encoding=json&v=6"
+  
+      invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+  
+diff -crB com.discord-939-base/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali com.discord-939/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali
+*** com.discord-939-base/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali	2019-08-16 21:39:30.422936632 +0300
+--- com.discord-939/smali/com/discord/gateway/io/OutgoingPayload$Identify.smali	2019-08-17 00:14:19.150201204 +0300
+***************
+*** 59,64 ****
+--- 59,66 ----
+  
+      const/4 v0, 0x0
+  
+     const/4 p3, 0x0
+ 
+      .line 27
+      invoke-direct {p0, v0}, Lcom/discord/gateway/io/OutgoingPayload;-><init>(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+  
+diff -crB com.discord-939-base/smali/com/discord/stores/StoreGatewayConnection.smali com.discord-939/smali/com/discord/stores/StoreGatewayConnection.smali
+*** com.discord-939-base/smali/com/discord/stores/StoreGatewayConnection.smali	2019-08-16 21:39:30.569604107 +0300
+--- com.discord-939/smali/com/discord/stores/StoreGatewayConnection.smali	2019-08-17 00:14:19.150201204 +0300
+***************
+*** 1337,1343 ****
+  
+      check-cast v2, Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;
+  
+!     const-string v3, "https://discordapp.com/api/"
+  
+      invoke-direct {v9, v3, v2, v0}, Lcom/discord/gateway/rest/RestConfig;-><init>(Ljava/lang/String;Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;Ljava/util/List;)V
+  
+--- 1337,1343 ----
+  
+      check-cast v2, Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;
+  
+!     const-string v3, "https://dev.litecord.top/api/"
+  
+      invoke-direct {v9, v3, v2, v0}, Lcom/discord/gateway/rest/RestConfig;-><init>(Ljava/lang/String;Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;Ljava/util/List;)V
+  
+diff -crB com.discord-939-base/smali/com/discord/utilities/icon/IconUtils.smali com.discord-939/smali/com/discord/utilities/icon/IconUtils.smali
+*** com.discord-939-base/smali/com/discord/utilities/icon/IconUtils.smali	2019-08-16 21:39:30.666271306 +0300
+--- com.discord-939/smali/com/discord/utilities/icon/IconUtils.smali	2019-08-17 00:14:19.156867911 +0300
+***************
+*** 377,383 ****
+      goto :goto_2
+  
+      :cond_1
+!     const-string p3, "https://cdn.discordapp.com"
+  
+      .line 111
+      check-cast p3, Ljava/lang/CharSequence;
+--- 377,383 ----
+      goto :goto_2
+  
+      :cond_1
+!     const-string p3, "https://dev.litecord.top"
+  
+      .line 111
+      check-cast p3, Ljava/lang/CharSequence;
+***************
+*** 425,431 ****
+      :cond_3
+      new-instance p3, Ljava/lang/StringBuilder;
+  
+!     const-string v0, "https://cdn.discordapp.com/channel-icons/"
+  
+      invoke-direct {p3, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+  
+--- 425,431 ----
+      :cond_3
+      new-instance p3, Ljava/lang/StringBuilder;
+  
+!     const-string v0, "https://dev.litecord.top/channel-icons/"
+  
+      invoke-direct {p3, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+  
+***************
+*** 713,719 ****
+      goto :goto_2
+  
+      :cond_0
+!     const-string p2, "https://cdn.discordapp.com"
+  
+      .line 144
+      check-cast p2, Ljava/lang/CharSequence;
+--- 713,719 ----
+      goto :goto_2
+  
+      :cond_0
+!     const-string p2, "https://dev.litecord.top"
+  
+      .line 144
+      check-cast p2, Ljava/lang/CharSequence;
+***************
+*** 790,796 ****
+      :goto_1
+      new-instance p3, Ljava/lang/StringBuilder;
+  
+!     const-string v0, "https://cdn.discordapp.com/icons/"
+  
+      invoke-direct {p3, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+  
+--- 790,796 ----
+      :goto_1
+      new-instance p3, Ljava/lang/StringBuilder;
+  
+!     const-string v0, "https://dev.litecord.top/icons/"
+  
+      invoke-direct {p3, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+  
+***************
+*** 1009,1015 ****
+      :cond_0
+      if-eqz p1, :cond_4
+  
+!     const-string p2, "https://cdn.discordapp.com"
+  
+      .line 90
+      check-cast p2, Ljava/lang/CharSequence;
+--- 1009,1015 ----
+      :cond_0
+      if-eqz p1, :cond_4
+  
+!     const-string p2, "https://dev.litecord.top"
+  
+      .line 90
+      check-cast p2, Ljava/lang/CharSequence;
+***************
+*** 1076,1082 ****
+      :goto_1
+      new-instance p3, Ljava/lang/StringBuilder;
+  
+!     const-string v0, "https://cdn.discordapp.com/avatars/"
+  
+      invoke-direct {p3, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+  
+--- 1076,1082 ----
+      :goto_1
+      new-instance p3, Ljava/lang/StringBuilder;
+  
+!     const-string v0, "https://dev.litecord.top/avatars/"
+  
+      invoke-direct {p3, v0}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+  
+***************
+*** 2034,2040 ****
+      .line 186
+      new-instance v0, Ljava/lang/StringBuilder;
+  
+!     const-string v1, "https://cdn.discordapp.com/app-assets/"
+  
+      invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+  
+--- 2034,2040 ----
+      .line 186
+      new-instance v0, Ljava/lang/StringBuilder;
+  
+!     const-string v1, "https://dev.litecord.top/app-assets/"
+  
+      invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+  
+Only in com.discord-939/smali/com/discord/utilities/icon: IconUtils.smali.orig
+diff -crB com.discord-939-base/smali/com/discord/utilities/rest/RestAPI$Companion.smali com.discord-939/smali/com/discord/utilities/rest/RestAPI$Companion.smali
+*** com.discord-939-base/smali/com/discord/utilities/rest/RestAPI$Companion.smali	2019-08-16 21:39:30.686271417 +0300
+--- com.discord-939/smali/com/discord/utilities/rest/RestAPI$Companion.smali	2019-08-17 00:14:19.156867911 +0300
+***************
+*** 296,302 ****
+  
+      check-cast v6, Lokhttp3/m;
+  
+!     const-string v9, "https://discordapp.com/api/"
+  
+      invoke-direct {v0, v9, v6}, Lcom/discord/restapi/RestAPIBuilder;-><init>(Ljava/lang/String;Lokhttp3/m;)V
+  
+--- 296,302 ----
+  
+      check-cast v6, Lokhttp3/m;
+  
+!     const-string v9, "https://dev.litecord.top/api/"
+  
+      invoke-direct {v0, v9, v6}, Lcom/discord/restapi/RestAPIBuilder;-><init>(Ljava/lang/String;Lokhttp3/m;)V
+  
+diff -crB com.discord-939-base/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali com.discord-939/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali
+*** com.discord-939-base/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali	2019-08-16 21:39:30.822938836 +0300
+--- com.discord-939/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali	2019-08-17 00:14:19.156867911 +0300
+***************
+*** 606,612 ****
+      .line 106
+      new-instance v1, Ljava/lang/StringBuilder;
+  
+!     const-string v6, "https://cdn.discordapp.com/app-icons/"
+  
+      invoke-direct {v1, v6}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+  
+--- 606,612 ----
+      .line 106
+      new-instance v1, Ljava/lang/StringBuilder;
+  
+!     const-string v6, "https://dev.litecord.top/app-icons/"
+  
+      invoke-direct {v1, v6}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
+  
+
--- a/patches/litecord/README.md
+++ b/patches/litecord/README.md
@ -43,6 +43,5 @@ Please keep in mind that litecord is free (gratis and libre) software, provided
 - 9.0.6
 - 9.0.9
 - 9.1.0
- 9.3.8-SAO-Heathcliff
 - 9.3.9

--- a/patches/notrack/939.patch
+++ b/patches/notrack/939.patch