Re-port 10.1.3

Revert "10.1.3"

This reverts commit 12c11a1451.

Re-port 10.1.3

old-patches/README.md

@@ -8,3 +8,4 @@ Here's why these patches are no longer maintained in this form:
 - pureevil: It's now upstream (yay.)
 - compact: It's just a pain to maintain.
 - smalltime: It's just a pain to maintain.
+- customdefaultemoji: There doesn't seem to be default emojis anymore?

old-patches/customdefaultemoji/991.patch-failed

@@ -0,0 +1,80 @@
+diff -crB from/smali/com/discord/stores/StoreEmoji.smali to/smali/com/discord/stores/StoreEmoji.smali
+*** from/smali/com/discord/stores/StoreEmoji.smali	2019-11-14 22:32:21.079850865 +0300
+--- to/smali/com/discord/stores/StoreEmoji.smali	2019-11-14 22:33:18.846833515 +0300
+***************
+*** 103,139 ****
+  
+      const/4 v1, 0x0
+  
+!     const-string v2, "thinking"
+  
+      aput-object v2, v0, v1
+  
+      const/4 v1, 0x1
+  
+!     const-string v2, "ok_hand"
+  
+      aput-object v2, v0, v1
+  
+      const/4 v1, 0x2
+  
+!     const-string v2, "eyes"
+  
+      aput-object v2, v0, v1
+  
+      const/4 v1, 0x3
+  
+!     const-string v2, "sweat_drops"
+  
+      aput-object v2, v0, v1
+  
+      const/4 v1, 0x4
+  
+!     const-string v2, "joy"
+  
+      aput-object v2, v0, v1
+  
+      const/4 v1, 0x5
+  
+!     const-string v2, "pig"
+  
+      aput-object v2, v0, v1
+  
+--- 103,139 ----
+  
+      const/4 v1, 0x0
+  
+!     const-string v2, "star"
+  
+      aput-object v2, v0, v1
+  
+      const/4 v1, 0x1
+  
+!     const-string v2, "thinking"
+  
+      aput-object v2, v0, v1
+  
+      const/4 v1, 0x2
+  
+!     const-string v2, "ok_hand"
+  
+      aput-object v2, v0, v1
+  
+      const/4 v1, 0x3
+  
+!     const-string v2, "eyes"
+  
+      aput-object v2, v0, v1
+  
+      const/4 v1, 0x4
+  
+!     const-string v2, "sweat_drops"
+  
+      aput-object v2, v0, v1
+  
+      const/4 v1, 0x5
+  
+!     const-string v2, "joy"
+  
+      aput-object v2, v0, v1
+  

old-patches/customdefaultemoji/996.patch

@@ -0,0 +1,43 @@
+diff -crB com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali com.discord-992/smali/com/discord/stores/StoreEmoji.smali
+*** com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali	2019-11-26 10:48:46.036158964 +0300
+--- com.discord-992/smali/com/discord/stores/StoreEmoji.smali	2019-11-26 12:08:01.403160008 +0300
+***************
+*** 97,113 ****
+  
+      sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
+  
+!     const-string v2, "thinking"
+  
+!     const-string v3, "ok_hand"
+  
+!     const-string v4, "eyes"
+  
+!     const-string v5, "sweat_drops"
+  
+!     const-string v6, "joy"
+  
+!     const-string v7, "pig"
+  
+      .line 350
+      filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
+--- 97,113 ----
+  
+      sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
+  
+!     const-string v2, "star"
+  
+!     const-string v3, "thinking"
+  
+!     const-string v4, "ok_hand"
+  
+!     const-string v5, "eyes"
+  
+!     const-string v6, "sweat_drops"
+  
+!     const-string v7, "joy"
+  
+      .line 350
+      filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
+Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.orig
+Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.rej
+

patches/branding/1013.patch

@@ -1,6 +1,6 @@
 diff -crB com.discord-1013-base/AndroidManifest.xml com.discord-1013/AndroidManifest.xml
-*** com.discord-1013-base/AndroidManifest.xml	2019-12-21 20:51:33.103146237 +0300
+*** com.discord-1013-base/AndroidManifest.xml	2019-12-21 21:31:39.126821471 +0300
---- com.discord-1013/AndroidManifest.xml	2019-12-21 20:52:20.913415017 +0300
+--- com.discord-1013/AndroidManifest.xml	2019-12-21 21:38:27.075863549 +0300
 ***************
 *** 1,4 ****
 ! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="1013" platformBuildVersionName="10.1.3">
@@ -146,9 +146,11 @@ diff -crB com.discord-1013-base/AndroidManifest.xml com.discord-1013/AndroidMani
           <meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
       </application>
 ! </manifest>
+Only in com.discord-1013: AndroidManifest.xml.orig
+Only in com.discord-1013: AndroidManifest.xml.rej
 diff -crB com.discord-1013-base/apktool.yml com.discord-1013/apktool.yml
-*** com.discord-1013-base/apktool.yml	2019-12-21 20:50:00.862627680 +0300
+*** com.discord-1013-base/apktool.yml	2019-12-21 21:31:19.773375445 +0300
---- com.discord-1013/apktool.yml	2019-12-21 20:52:09.236682706 +0300
+--- com.discord-1013/apktool.yml	2019-12-21 21:37:33.032215527 +0300
 ***************
 *** 184,188 ****
     tag: null
@@ -164,8 +166,8 @@ diff -crB com.discord-1013-base/apktool.yml com.discord-1013/apktool.yml
 !   versionName: 10.1.3-cutthecord-CTCBUILD
 Only in com.discord-1013: apktool.yml.orig
 diff -crB com.discord-1013-base/res/values/strings.xml com.discord-1013/res/values/strings.xml
-*** com.discord-1013-base/res/values/strings.xml	2019-12-21 20:49:56.712604349 +0300
+*** com.discord-1013-base/res/values/strings.xml	2019-12-21 21:31:15.933353085 +0300
---- com.discord-1013/res/values/strings.xml	2019-12-21 20:52:09.240016058 +0300
+--- com.discord-1013/res/values/strings.xml	2019-12-21 21:37:33.035548879 +0300
 ***************
 *** 1347,1353 ****
       <string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
@@ -217,9 +219,10 @@ diff -crB com.discord-1013-base/res/values/strings.xml com.discord-1013/res/valu
       <string name="suppress_all_embeds">Remove all embeds</string>
       <string name="suppressed">Suppressed</string>
       <string name="suppressed_afk_body">"It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel."</string>
+Only in com.discord-1013/res/values: strings.xml.orig
 diff -crB com.discord-1013-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali com.discord-1013/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
-*** com.discord-1013-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali	2019-12-21 20:49:58.519281172 +0300
+*** com.discord-1013-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali	2019-12-21 21:31:17.590029398 +0300
---- com.discord-1013/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali	2019-12-21 20:52:09.240016058 +0300
+--- com.discord-1013/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali	2019-12-21 21:37:33.035548879 +0300
 ***************
 *** 76,82 ****
       .line 3

patches/customdefaultemoji/1013.patch

@@ -1,48 +0,0 @@
-diff -crB from/smali/com/discord/stores/StoreEmoji.smali to/smali/com/discord/stores/StoreEmoji.smali
-*** from/smali/com/discord/stores/StoreEmoji.smali	2019-12-21 11:43:12.363840487 +0200
---- to/smali/com/discord/stores/StoreEmoji.smali	2019-12-21 11:59:40.866248132 +0200
-***************
-*** 97,117 ****
-  
-      sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
-  
-!     const-string v2, "bread"
-  
-!     const-string v3, "fork_and_knife"
-  
-!     const-string v4, "yum"
-  
-!     const-string v5, "weary"
-  
-!     const-string v6, "tired_face"
-  
-!     const-string v7, "poop"
-  
-!     const-string v8, "thumbsup"
-  
-!     const-string v9, "100"
-  
-      .line 1
-      filled-new-array/range {v2 .. v9}, [Ljava/lang/String;
---- 97,117 ----
-  
-      sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
-  
-!     const-string v2, "star"
-  
-!     const-string v3, "bread"
-  
-!     const-string v4, "fork_and_knife"
-  
-!     const-string v5, "yum"
-  
-!     const-string v6, "weary"
-  
-!     const-string v7, "tired_face"
-  
-!     const-string v8, "poop"
-  
-!     const-string v9, "thumbsup"
-  
-      .line 1
-      filled-new-array/range {v2 .. v9}, [Ljava/lang/String;

patches/customtheme/1013.patch

@@ -1,6 +1,6 @@
-diff -crB from/res/drawable/drawable_overlay_channels_active.xml to/res/drawable/drawable_overlay_channels_active.xml
+diff -crB com.discord-1013-base/res/drawable/drawable_overlay_channels_active.xml com.discord-1013/res/drawable/drawable_overlay_channels_active.xml
-*** from/res/drawable/drawable_overlay_channels_active.xml	2019-12-21 11:43:09.593796226 +0200
+*** com.discord-1013-base/res/drawable/drawable_overlay_channels_active.xml	2019-12-21 21:31:15.310016122 +0300
---- to/res/drawable/drawable_overlay_channels_active.xml	2019-12-21 11:49:28.100592813 +0200
+--- com.discord-1013/res/drawable/drawable_overlay_channels_active.xml	2019-12-21 21:42:02.377117220 +0300
 ***************
 *** 3,9 ****
     xmlns:android="http://schemas.android.com/apk/res/android">
@@ -18,9 +18,9 @@ diff -crB from/res/drawable/drawable_overlay_channels_active.xml to/res/drawable
               <corners android:radius="4.0dip" />
           </shape>
       </item>
-diff -crB from/res/values/colors.xml to/res/values/colors.xml
+diff -crB com.discord-1013-base/res/values/colors.xml com.discord-1013/res/values/colors.xml
-*** from/res/values/colors.xml	2019-12-21 11:43:10.273807283 +0200
+*** com.discord-1013-base/res/values/colors.xml	2019-12-21 21:31:15.996686787 +0300
---- to/res/values/colors.xml	2019-12-21 11:49:28.100592813 +0200
+--- com.discord-1013/res/values/colors.xml	2019-12-21 21:42:02.380450573 +0300
 ***************
 *** 52,58 ****
       <color name="cardview_shadow_start_color">#37000000</color>
@@ -172,9 +172,10 @@ diff -crB from/res/values/colors.xml to/res/values/colors.xml
       <color name="tooltip_background_light">#e6ffffff</color>
       <color name="transparent">@android:color/transparent</color>
       <color name="twitch">#ff593695</color>
-diff -crB from/res/values/styles.xml to/res/values/styles.xml
+Only in com.discord-1013/res/values: colors.xml.orig
-*** from/res/values/styles.xml	2019-12-21 11:43:10.427143086 +0200
+diff -crB com.discord-1013-base/res/values/styles.xml com.discord-1013/res/values/styles.xml
---- to/res/values/styles.xml	2019-12-21 11:49:28.100592813 +0200
+*** com.discord-1013-base/res/values/styles.xml	2019-12-21 21:31:15.670018218 +0300
+--- com.discord-1013/res/values/styles.xml	2019-12-21 21:42:02.380450573 +0300
 ***************
 *** 380,386 ****
           <item name="tabTextColor">@color/white_alpha_40</item>
@@ -253,9 +254,10 @@ diff -crB from/res/values/styles.xml to/res/values/styles.xml
       </style>
       <style name="AppTheme.Dark.Notice.PositiveRed" parent="@style/AppTheme.Dark.Notice">
           <item name="buttonBarPositiveButtonStyle">@style/UiKit.Button.Red.Fit</item>
-diff -crB from/smali/com/discord/app/AppActivity$d.smali to/smali/com/discord/app/AppActivity$d.smali
+Only in com.discord-1013/res/values: styles.xml.orig
-*** from/smali/com/discord/app/AppActivity$d.smali	2019-12-21 11:43:12.150503828 +0200
+diff -crB com.discord-1013-base/smali/com/discord/app/AppActivity$d.smali com.discord-1013/smali/com/discord/app/AppActivity$d.smali
---- to/smali/com/discord/app/AppActivity$d.smali	2019-12-21 11:49:59.707157308 +0200
+*** com.discord-1013-base/smali/com/discord/app/AppActivity$d.smali	2019-12-21 21:31:17.270027535 +0300
+--- com.discord-1013/smali/com/discord/app/AppActivity$d.smali	2019-12-21 21:42:12.703844019 +0300
 ***************
 *** 115,121 ****
       .line 7
@@ -273,3 +275,6 @@ diff -crB from/smali/com/discord/app/AppActivity$d.smali to/smali/com/discord/ap
   
       invoke-static {v0, v1}, Lcom/discord/utilities/color/ColorCompat;->setStatusBarColorResourceId(Landroid/app/Activity;I)V
   
+Only in com.discord-1013/smali/com/discord/app: AppActivity$d.smali.orig
+Only in com.discord-1013/smali/com/discord/app: AppActivity$d.smali.rej
+

patches/experiments/1013.patch

@@ -1,13 +1,14 @@
-diff -crB from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
+diff -crB com.discord-1013-base/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali com.discord-1013/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali
-*** from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali	2019-12-21 11:43:12.353840330 +0200
+*** com.discord-1013-base/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali	2019-12-21 21:31:17.426695114 +0300
---- to/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali	2019-12-21 11:44:49.811078316 +0200
+--- com.discord-1013/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.smali	2019-12-21 21:33:22.047420765 +0300
 ***************
-*** 81,110 ****
+*** 80,110 ****
+  
   .method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z
       .locals 1
   
 !     const-string v0, "meUser"
-  
+! 
 !     .line 2
 !     invoke-static {p1, v0}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
 ! 
@@ -33,22 +34,25 @@ diff -crB from/smali/com/discord/stores/StoreExperiments$getExperimentalAlpha$1.
 !     :goto_1
 !     return p1
   .end method
---- 81,87 ----
+--- 80,86 ----
+  
   .method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelGuild;)Z
       .locals 1
-  
++     const/4 v0, 0x1
-!     const/4 v0, 0x1
   
 !     return v0
   .end method
-diff -crB from/smali/com/discord/stores/StoreExperiments.smali to/smali/com/discord/stores/StoreExperiments.smali
+Only in com.discord-1013/smali/com/discord/stores: StoreExperiments$getExperimentalAlpha$1.smali.orig
-*** from/smali/com/discord/stores/StoreExperiments.smali	2019-12-21 11:43:12.360507101 +0200
+Only in com.discord-1013/smali/com/discord/stores: StoreExperiments$getExperimentalAlpha$1.smali.rej
---- to/smali/com/discord/stores/StoreExperiments.smali	2019-12-21 11:45:21.660675886 +0200
+diff -crB com.discord-1013-base/smali/com/discord/stores/StoreExperiments.smali com.discord-1013/smali/com/discord/stores/StoreExperiments.smali
+*** com.discord-1013-base/smali/com/discord/stores/StoreExperiments.smali	2019-12-21 21:31:17.430028467 +0300
+--- com.discord-1013/smali/com/discord/stores/StoreExperiments.smali	2019-12-21 21:34:51.907943989 +0300
 ***************
-*** 1282,1344 ****
+*** 1281,1344 ****
+  .end method
   
   .method public final isExperimentalAlpha()Z
-      .locals 4
+!     .locals 4
   
 !     .line 1
 !     iget-boolean v0, p0, Lcom/discord/stores/StoreExperiments;->initialized:Z
@@ -109,19 +113,22 @@ diff -crB from/smali/com/discord/stores/StoreExperiments.smali to/smali/com/disc
   .end method
   
   .method public final isInitialized()Lrx/Observable;
---- 1282,1290 ----
+--- 1281,1290 ----
+  .end method
   
   .method public final isExperimentalAlpha()Z
-      .locals 4
+!     .locals 1
-+     const/4 v0, 0x0
+!     const/4 v0, 0x1
   
 !     return v0
   .end method
   
   .method public final isInitialized()Lrx/Observable;
-diff -crB from/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali to/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
+Only in com.discord-1013/smali/com/discord/stores: StoreExperiments.smali.orig
-*** from/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali	2019-12-21 11:43:12.930515985 +0200
+Only in com.discord-1013/smali/com/discord/stores: StoreExperiments.smali.rej
---- to/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali	2019-12-21 11:45:52.687156483 +0200
+diff -crB com.discord-1013-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali com.discord-1013/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali
+*** com.discord-1013-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali	2019-12-21 21:31:17.946698142 +0300
+--- com.discord-1013/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali	2019-12-21 21:35:39.508221156 +0300
 ***************
 *** 87,97 ****
   
@@ -143,3 +150,6 @@ diff -crB from/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model
   
       if-eqz p4, :cond_0
   
+Only in com.discord-1013/smali/com/discord/widgets/settings: WidgetSettingsAppearance$Model$Companion$get$1.smali.orig
+Only in com.discord-1013/smali/com/discord/widgets/settings: WidgetSettingsAppearance$Model$Companion$get$1.smali.rej
+

patches/litecord/1013.patch

@@ -1,6 +1,6 @@
-diff -crB from/smali/com/discord/app/App.smali to/smali/com/discord/app/App.smali
+diff -crB com.discord-1013-base/smali/com/discord/app/App.smali com.discord-1013/smali/com/discord/app/App.smali
-*** from/smali/com/discord/app/App.smali	2019-12-21 11:43:12.150503828 +0200
+*** com.discord-1013-base/smali/com/discord/app/App.smali	2019-12-21 21:31:17.270027535 +0300
---- to/smali/com/discord/app/App.smali	2019-12-21 12:05:43.599037211 +0200
+--- com.discord-1013/smali/com/discord/app/App.smali	2019-12-21 21:36:16.655104125 +0300
 ***************
 *** 197,203 ****
   
@@ -18,9 +18,9 @@ diff -crB from/smali/com/discord/app/App.smali to/smali/com/discord/app/App.smal
   
       .line 23
       invoke-static {v0}, Lcom/discord/models/domain/emoji/ModelEmojiCustom;->setCdnUri(Ljava/lang/String;)V
-diff -crB from/smali/com/discord/BuildConfig.smali to/smali/com/discord/BuildConfig.smali
+diff -crB com.discord-1013-base/smali/com/discord/BuildConfig.smali com.discord-1013/smali/com/discord/BuildConfig.smali
-*** from/smali/com/discord/BuildConfig.smali	2019-12-21 11:43:12.147170442 +0200
+*** com.discord-1013-base/smali/com/discord/BuildConfig.smali	2019-12-21 21:31:17.266694183 +0300
---- to/smali/com/discord/BuildConfig.smali	2019-12-21 12:05:43.599037211 +0200
+--- com.discord-1013/smali/com/discord/BuildConfig.smali	2019-12-21 21:36:16.655104125 +0300
 ***************
 *** 18,32 ****
   
@@ -54,9 +54,9 @@ diff -crB from/smali/com/discord/BuildConfig.smali to/smali/com/discord/BuildCon
   
   .field public static final LOCAL_IP:Ljava/lang/String; = ""
   
-diff -crB from/smali/com/discord/stores/StoreGatewayConnection.smali to/smali/com/discord/stores/StoreGatewayConnection.smali
+diff -crB com.discord-1013-base/smali/com/discord/stores/StoreGatewayConnection.smali com.discord-1013/smali/com/discord/stores/StoreGatewayConnection.smali
-*** from/smali/com/discord/stores/StoreGatewayConnection.smali	2019-12-21 11:43:12.397174339 +0200
+*** com.discord-1013-base/smali/com/discord/stores/StoreGatewayConnection.smali	2019-12-21 21:31:17.436695173 +0300
---- to/smali/com/discord/stores/StoreGatewayConnection.smali	2019-12-21 12:05:43.599037211 +0200
+--- com.discord-1013/smali/com/discord/stores/StoreGatewayConnection.smali	2019-12-21 21:36:16.658437477 +0300
 ***************
 *** 1333,1339 ****
   
@@ -74,13 +74,10 @@ diff -crB from/smali/com/discord/stores/StoreGatewayConnection.smali to/smali/co
   
       invoke-direct {v9, v3, v2, v0}, Lcom/discord/gateway/rest/RestConfig;-><init>(Ljava/lang/String;Lcom/discord/restapi/RequiredHeadersInterceptor$HeadersProvider;Ljava/util/List;)V
   
-Only in to/smali/com/discord/utilities/analytics: AdjustConfig$AdjustLifecycleListener.smali.rej
+Only in com.discord-1013/smali/com/discord/stores: StoreGatewayConnection.smali.orig
-Only in to/smali/com/discord/utilities/analytics: AnalyticsTracker$AdjustEventTracker.smali.rej
+diff -crB com.discord-1013-base/smali/com/discord/utilities/icon/IconUtils.smali com.discord-1013/smali/com/discord/utilities/icon/IconUtils.smali
-Only in to/smali/com/discord/utilities/analytics: AnalyticSuperProperties.smali.rej
+*** com.discord-1013-base/smali/com/discord/utilities/icon/IconUtils.smali	2019-12-21 21:31:17.623362926 +0300
-Only in to/smali/com/discord/utilities/analytics: AnalyticsUtils$Tracker.smali.rej
+--- com.discord-1013/smali/com/discord/utilities/icon/IconUtils.smali	2019-12-21 21:36:37.391891539 +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-12-21 11:43:12.513842824 +0200
---- to/smali/com/discord/utilities/icon/IconUtils.smali	2019-12-21 12:07:09.089524116 +0200
 ***************
 *** 441,447 ****
       goto :goto_3
@@ -234,11 +231,11 @@ diff -crB from/smali/com/discord/utilities/icon/IconUtils.smali to/smali/com/dis
   
       invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
   
-Only in to/smali/com/discord/utilities/icon: IconUtils.smali.rej
+Only in com.discord-1013/smali/com/discord/utilities/icon: IconUtils.smali.orig
-Only in to/smali/com/discord/utilities/receiver: CampaignReceiver.smali.rej
+Only in com.discord-1013/smali/com/discord/utilities/icon: IconUtils.smali.rej
-diff -crB from/smali/com/discord/utilities/rest/RestAPI$Companion.smali to/smali/com/discord/utilities/rest/RestAPI$Companion.smali
+diff -crB com.discord-1013-base/smali/com/discord/utilities/rest/RestAPI$Companion.smali com.discord-1013/smali/com/discord/utilities/rest/RestAPI$Companion.smali
-*** from/smali/com/discord/utilities/rest/RestAPI$Companion.smali	2019-12-21 11:43:12.537176520 +0200
+*** com.discord-1013-base/smali/com/discord/utilities/rest/RestAPI$Companion.smali	2019-12-21 21:31:17.663363159 +0300
---- to/smali/com/discord/utilities/rest/RestAPI$Companion.smali	2019-12-21 12:05:43.599037211 +0200
+--- com.discord-1013/smali/com/discord/utilities/rest/RestAPI$Companion.smali	2019-12-21 21:36:16.661770830 +0300
 ***************
 *** 302,308 ****
       .line 9
@@ -256,3 +253,5 @@ diff -crB from/smali/com/discord/utilities/rest/RestAPI$Companion.smali to/smali
   
       invoke-direct {v1, v9, v6}, Lcom/discord/restapi/RestAPIBuilder;-><init>(Ljava/lang/String;Lx/n;)V
   
+Only in com.discord-1013/smali/com/discord/utilities/rest: RestAPI$Companion.smali.orig
+

patches/necessary/1013.patch

@@ -1,6 +1,6 @@
 diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
-*** from/AndroidManifest.xml	2019-12-21 11:42:04.852563912 +0200
+*** from/AndroidManifest.xml	2019-12-21 21:31:13.973341672 +0300
---- to/AndroidManifest.xml	2019-12-21 11:42:30.062810211 +0200
+--- to/AndroidManifest.xml	2019-12-21 21:31:38.383483810 +0300
 ***************
 *** 1,4 ****
 ! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="29" android:compileSdkVersionCodename="10" android:installLocation="auto" package="com.discord" platformBuildVersionCode="29" platformBuildVersionName="10">

patches/notrack/1013.patch

@@ -1,6 +1,6 @@
-diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
+diff -crB com.discord-1013-base/AndroidManifest.xml com.discord-1013/AndroidManifest.xml
-*** from/AndroidManifest.xml	2019-12-21 11:43:26.794043395 +0200
+*** com.discord-1013-base/AndroidManifest.xml	2019-12-21 21:31:39.126821471 +0300
---- to/AndroidManifest.xml	2019-12-21 12:00:49.316916969 +0200
+--- com.discord-1013/AndroidManifest.xml	2019-12-21 21:43:22.950919725 +0300
 ***************
 *** 121,128 ****
               <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"/>
@@ -20,9 +20,10 @@ diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
           <activity android:name="com.yalantis.ucrop.UCropActivity" android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
           <service android:directBootAware="true" android:exported="false" android:name="com.google.firebase.components.ComponentDiscoveryService">
               <meta-data android:name="com.google.firebase.components:com.google.firebase.dynamiclinks.internal.FirebaseDynamicLinkRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
-diff -crB from/res/values/strings.xml to/res/values/strings.xml
+Only in com.discord-1013: AndroidManifest.xml.orig
-*** from/res/values/strings.xml	2019-12-21 11:43:10.270473896 +0200
+diff -crB com.discord-1013-base/res/values/strings.xml com.discord-1013/res/values/strings.xml
---- to/res/values/strings.xml	2019-12-21 12:00:49.316916969 +0200
+*** com.discord-1013-base/res/values/strings.xml	2019-12-21 21:31:15.933353085 +0300
+--- com.discord-1013/res/values/strings.xml	2019-12-21 21:43:22.954253077 +0300
 ***************
 *** 1021,1027 ****
       <string name="cloud_sync_modal_error_header">Unable to sync cloud saves</string>
@@ -40,9 +41,10 @@ diff -crB from/res/values/strings.xml to/res/values/strings.xml
       <string name="coming_soon">Coming Soon</string>
       <string name="command_giphy_description">Search Animated GIFs on the Web</string>
       <string name="command_me_description">Displays text with emphasis.</string>
-diff -crB from/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali to/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali
+Only in com.discord-1013/res/values: strings.xml.orig
-*** from/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali	2019-12-21 11:43:12.467175429 +0200
+diff -crB com.discord-1013-base/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali com.discord-1013/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali
---- to/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali	2019-12-21 12:01:52.964128263 +0200
+*** com.discord-1013-base/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali	2019-12-21 21:31:17.526695697 +0300
+--- com.discord-1013/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycleListener.smali	2019-12-21 21:43:38.827678840 +0300
 ***************
 *** 42,135 ****
   .end method
@@ -154,10 +156,11 @@ diff -crB from/smali/com/discord/utilities/analytics/AdjustConfig$AdjustLifecycl
       return-void
   .end method
   
-Only in to/smali/com/discord/utilities/analytics: AdjustConfig$AdjustLifecycleListener.smali.rej
+Only in com.discord-1013/smali/com/discord/utilities/analytics: AdjustConfig$AdjustLifecycleListener.smali.orig
-diff -crB from/smali/com/discord/utilities/analytics/AdjustConfig.smali to/smali/com/discord/utilities/analytics/AdjustConfig.smali
+Only in com.discord-1013/smali/com/discord/utilities/analytics: AdjustConfig$AdjustLifecycleListener.smali.rej
-*** from/smali/com/discord/utilities/analytics/AdjustConfig.smali	2019-12-21 11:43:12.467175429 +0200
+diff -crB com.discord-1013-base/smali/com/discord/utilities/analytics/AdjustConfig.smali com.discord-1013/smali/com/discord/utilities/analytics/AdjustConfig.smali
---- to/smali/com/discord/utilities/analytics/AdjustConfig.smali	2019-12-21 12:00:49.316916969 +0200
+*** com.discord-1013-base/smali/com/discord/utilities/analytics/AdjustConfig.smali	2019-12-21 21:31:17.526695697 +0300
+--- com.discord-1013/smali/com/discord/utilities/analytics/AdjustConfig.smali	2019-12-21 21:43:22.957586430 +0300
 ***************
 *** 12,18 ****
   
@@ -175,9 +178,9 @@ diff -crB from/smali/com/discord/utilities/analytics/AdjustConfig.smali to/smali
   
   .field public static final ADJUST_ENVIRONMENT:Ljava/lang/String;
   
-diff -crB from/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali to/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali
+diff -crB com.discord-1013-base/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali com.discord-1013/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali
-*** from/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali	2019-12-21 11:43:12.467175429 +0200
+*** com.discord-1013-base/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali	2019-12-21 21:31:17.526695697 +0300
---- to/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali	2019-12-21 12:02:39.927825737 +0200
+--- com.discord-1013/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEventTracker.smali	2019-12-21 21:43:47.624396729 +0300
 ***************
 *** 15,23 ****
   
@@ -246,10 +249,11 @@ diff -crB from/smali/com/discord/utilities/analytics/AnalyticsTracker$AdjustEven
   
       return-void
   .end method
-Only in to/smali/com/discord/utilities/analytics: AnalyticsTracker$AdjustEventTracker.smali.rej
+Only in com.discord-1013/smali/com/discord/utilities/analytics: AnalyticsTracker$AdjustEventTracker.smali.orig
-diff -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
+Only in com.discord-1013/smali/com/discord/utilities/analytics: AnalyticsTracker$AdjustEventTracker.smali.rej
-*** from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali	2019-12-21 11:43:12.467175429 +0200
+diff -crB com.discord-1013-base/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali com.discord-1013/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
---- to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali	2019-12-21 12:00:49.316916969 +0200
+*** com.discord-1013-base/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali	2019-12-21 21:31:17.526695697 +0300
+--- com.discord-1013/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali	2019-12-21 21:44:01.097808503 +0300
 ***************
 *** 169,175 ****
   .method private final setBaselineProperties()V
@@ -268,12 +272,10 @@ diff -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.sma
       new-array v0, v0, [Lkotlin/Pair;
   
 ***************
-*** 235,317 ****
+*** 237,319 ****
   
-      invoke-direct {v3, v4, v2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+      aput-object v3, v0, v1
   
--     aput-object v3, v0, v1
-- 
 -     const/4 v1, 0x4
 - 
 -     .line 7
@@ -349,14 +351,442 @@ diff -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.sma
 - 
 -     invoke-direct {v3, v4, v2}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
 - 
-      aput-object v3, v0, v1
+-     aput-object v3, v0, v1
-  
+- 
       .line 14
---- 235,240 ----
+      invoke-static {v0}, Lt/q/l;->mapOf([Lkotlin/Pair;)Ljava/util/Map;
-Only in to/smali/com/discord/utilities/analytics: AnalyticSuperProperties.smali.rej
+  
-diff -crB from/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali to/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali
+--- 237,242 ----
-*** from/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali	2019-12-21 11:43:12.470508815 +0200
+***************
---- to/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali	2019-12-21 12:04:29.305246890 +0200
+*** 443,851 ****
+  .end method
+  
+  .method public final setAdvertiserId(Ljava/lang/String;)V
+!     .locals 1
+! 
+!     if-eqz p1, :cond_0
+! 
+!     const-string v0, "device_advertiser_id"
+! 
+!     .line 1
+!     invoke-static {v0, p1}, Ljava/util/Collections;->singletonMap(Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map;
+! 
+!     move-result-object p1
+! 
+!     const-string v0, "java.util.Collections.si\u2026(pair.first, pair.second)"
+! 
+!     invoke-static {p1, v0}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+! 
+!     .line 2
+!     invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->updateSuperProperties(Ljava/util/Map;)V
+  
+      return-void
+- 
+-     :cond_0
+-     const-string p1, "advertiserId"
+- 
+-     .line 3
+-     invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+- 
+-     const/4 p1, 0x0
+- 
+-     throw p1
+  .end method
+  
+  .method public final setCampaignProperties(Landroid/content/Intent;)V
+!     .locals 7
+! 
+!     if-eqz p1, :cond_9
+! 
+!     .line 1
+!     invoke-virtual {p1}, Landroid/content/Intent;->getExtras()Landroid/os/Bundle;
+! 
+!     move-result-object p1
+! 
+!     if-eqz p1, :cond_8
+! 
+!     const-string v0, "referrer"
+! 
+!     invoke-virtual {p1, v0}, Landroid/os/Bundle;->getString(Ljava/lang/String;)Ljava/lang/String;
+! 
+!     move-result-object p1
+! 
+!     if-eqz p1, :cond_8
+! 
+!     const-string v1, "intent.extras?.getString\u2026PERTY_REFERRER) ?: return"
+! 
+!     invoke-static {p1, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+! 
+!     const/4 v1, 0x1
+! 
+!     new-array v2, v1, [Lkotlin/Pair;
+! 
+!     .line 2
+!     new-instance v3, Lkotlin/Pair;
+! 
+!     invoke-direct {v3, v0, p1}, Lkotlin/Pair;-><init>(Ljava/lang/Object;Ljava/lang/Object;)V
+! 
+!     const/4 v0, 0x0
+! 
+!     aput-object v3, v2, v0
+! 
+!     .line 3
+!     invoke-static {v2}, Lt/q/l;->mutableMapOf([Lkotlin/Pair;)Ljava/util/Map;
+! 
+!     move-result-object v2
+! 
+!     const-string v3, "&"
+! 
+!     .line 4
+!     filled-new-array {v3}, [Ljava/lang/String;
+! 
+!     move-result-object v3
+! 
+!     const/4 v4, 0x6
+! 
+!     invoke-static {p1, v3, v0, v0, v4}, Lt/a0/u;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List;
+! 
+!     move-result-object p1
+! 
+!     .line 5
+!     new-instance v3, Ljava/util/ArrayList;
+! 
+!     const/16 v5, 0xa
+! 
+!     invoke-static {p1, v5}, Le/k/a/b/e/p/g;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
+! 
+!     move-result v5
+! 
+!     invoke-direct {v3, v5}, Ljava/util/ArrayList;-><init>(I)V
+! 
+!     .line 6
+!     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+! 
+!     move-result-object p1
+! 
+!     :goto_0
+!     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+! 
+!     move-result v5
+! 
+!     if-eqz v5, :cond_0
+! 
+!     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+! 
+!     move-result-object v5
+! 
+!     .line 7
+!     check-cast v5, Ljava/lang/String;
+! 
+!     const-string v6, "="
+! 
+!     .line 8
+!     filled-new-array {v6}, [Ljava/lang/String;
+! 
+!     move-result-object v6
+! 
+!     invoke-static {v5, v6, v0, v0, v4}, Lt/a0/u;->split$default(Ljava/lang/CharSequence;[Ljava/lang/String;ZII)Ljava/util/List;
+  
+-     move-result-object v5
+- 
+-     invoke-interface {v3, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+- 
+-     goto :goto_0
+- 
+-     .line 9
+-     :cond_0
+-     new-instance p1, Ljava/util/ArrayList;
+- 
+-     invoke-direct {p1}, Ljava/util/ArrayList;-><init>()V
+- 
+-     .line 10
+-     invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+- 
+-     move-result-object v3
+- 
+-     :cond_1
+-     :goto_1
+-     invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
+- 
+-     move-result v4
+- 
+-     if-eqz v4, :cond_3
+- 
+-     invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+- 
+-     move-result-object v4
+- 
+-     move-object v5, v4
+- 
+-     check-cast v5, Ljava/util/List;
+- 
+-     .line 11
+-     invoke-interface {v5}, Ljava/util/List;->size()I
+- 
+-     move-result v5
+- 
+-     const/4 v6, 0x2
+- 
+-     if-ne v5, v6, :cond_2
+- 
+-     const/4 v5, 0x1
+- 
+-     goto :goto_2
+- 
+-     :cond_2
+-     const/4 v5, 0x0
+- 
+-     :goto_2
+-     if-eqz v5, :cond_1
+- 
+-     invoke-interface {p1, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+- 
+-     goto :goto_1
+- 
+-     .line 12
+-     :cond_3
+-     new-instance v3, Ljava/util/ArrayList;
+- 
+-     invoke-direct {v3}, Ljava/util/ArrayList;-><init>()V
+- 
+-     .line 13
+-     invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+- 
+-     move-result-object p1
+- 
+-     :cond_4
+-     :goto_3
+-     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+- 
+-     move-result v4
+- 
+-     if-eqz v4, :cond_6
+- 
+-     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+- 
+-     move-result-object v4
+- 
+-     move-object v5, v4
+- 
+-     check-cast v5, Ljava/util/List;
+- 
+-     .line 14
+-     invoke-interface {v5, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+- 
+-     move-result-object v5
+- 
+-     check-cast v5, Ljava/lang/String;
+- 
+-     .line 15
+-     invoke-virtual {v5}, Ljava/lang/String;->hashCode()I
+- 
+-     move-result v6
+- 
+-     sparse-switch v6, :sswitch_data_0
+- 
+-     goto :goto_5
+- 
+-     :sswitch_0
+-     const-string v6, "utm_source"
+- 
+-     .line 16
+-     invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+- 
+-     move-result v5
+- 
+-     if-eqz v5, :cond_5
+- 
+-     goto :goto_4
+- 
+-     :sswitch_1
+-     const-string v6, "location"
+- 
+-     invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+- 
+-     move-result v5
+- 
+-     if-eqz v5, :cond_5
+- 
+-     goto :goto_4
+- 
+-     :sswitch_2
+-     const-string v6, "utm_medium"
+- 
+-     invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+- 
+-     move-result v5
+- 
+-     if-eqz v5, :cond_5
+- 
+-     goto :goto_4
+- 
+-     :sswitch_3
+-     const-string v6, "search_engine"
+- 
+-     invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+- 
+-     move-result v5
+- 
+-     if-eqz v5, :cond_5
+- 
+-     goto :goto_4
+- 
+-     :sswitch_4
+-     const-string v6, "mp_keyword"
+- 
+-     invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+- 
+-     move-result v5
+- 
+-     if-eqz v5, :cond_5
+- 
+-     goto :goto_4
+- 
+-     :sswitch_5
+-     const-string v6, "utm_term"
+- 
+-     invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+- 
+-     move-result v5
+- 
+-     if-eqz v5, :cond_5
+- 
+-     goto :goto_4
+- 
+-     :sswitch_6
+-     const-string v6, "utm_campaign"
+- 
+-     invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+- 
+-     move-result v5
+- 
+-     if-eqz v5, :cond_5
+- 
+-     goto :goto_4
+- 
+-     :sswitch_7
+-     const-string v6, "referring_domain"
+- 
+-     invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+- 
+-     move-result v5
+- 
+-     if-eqz v5, :cond_5
+- 
+-     goto :goto_4
+- 
+-     :sswitch_8
+-     const-string v6, "utm_content"
+- 
+-     invoke-virtual {v5, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+- 
+-     move-result v5
+- 
+-     if-eqz v5, :cond_5
+- 
+-     :goto_4
+-     const/4 v5, 0x1
+- 
+-     goto :goto_6
+- 
+-     :cond_5
+-     :goto_5
+-     const/4 v5, 0x0
+- 
+-     :goto_6
+-     if-eqz v5, :cond_4
+- 
+-     .line 17
+-     invoke-interface {v3, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
+- 
+-     goto :goto_3
+- 
+-     .line 18
+-     :cond_6
+-     invoke-interface {v3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+- 
+-     move-result-object p1
+- 
+-     :goto_7
+-     invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+- 
+-     move-result v3
+- 
+-     if-eqz v3, :cond_7
+- 
+-     invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+- 
+-     move-result-object v3
+- 
+-     .line 19
+-     check-cast v3, Ljava/util/List;
+- 
+-     .line 20
+-     invoke-interface {v3, v0}, Ljava/util/List;->get(I)Ljava/lang/Object;
+- 
+-     move-result-object v4
+- 
+-     check-cast v4, Ljava/lang/String;
+- 
+-     invoke-interface {v3, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
+- 
+-     move-result-object v3
+- 
+-     check-cast v3, Ljava/lang/String;
+- 
+-     invoke-interface {v2, v4, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+- 
+-     goto :goto_7
+- 
+-     .line 21
+-     :cond_7
+-     invoke-direct {p0, v2}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->updateSuperProperties(Ljava/util/Map;)V
+- 
+-     :cond_8
+      return-void
+- 
+-     :cond_9
+-     const-string p1, "intent"
+- 
+-     .line 22
+-     invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+- 
+-     const/4 p1, 0x0
+- 
+-     throw p1
+- 
+-     :sswitch_data_0
+-     .sparse-switch
+-         -0x5bc8ed18 -> :sswitch_8
+-         -0x40f32acd -> :sswitch_7
+-         -0x3db0f7f -> :sswitch_6
+-         0x31ad945d -> :sswitch_5
+-         0x3d3a7f4d -> :sswitch_4
+-         0x3f4764b9 -> :sswitch_3
+-         0x70a1a726 -> :sswitch_2
+-         0x714f9fb5 -> :sswitch_1
+-         0x7b737fcc -> :sswitch_0
+-     .end sparse-switch
+  .end method
+--- 366,378 ----
+  .end method
+  
+  .method public final setAdvertiserId(Ljava/lang/String;)V
+!     .locals 0
+  
+      return-void
+  .end method
+  
+  .method public final setCampaignProperties(Landroid/content/Intent;)V
+!     .locals 0
+  
+      return-void
+  .end method
+Only in com.discord-1013/smali/com/discord/utilities/analytics: AnalyticSuperProperties.smali.orig
+Only in com.discord-1013/smali/com/discord/utilities/analytics: AnalyticSuperProperties.smali.rej
+diff -crB com.discord-1013-base/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali com.discord-1013/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali
+*** com.discord-1013-base/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali	2019-12-21 21:31:17.573362635 +0300
+--- com.discord-1013/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smali	2019-12-21 21:44:27.827967640 +0300
 ***************
 *** 149,157 ****
   .method public static final synthetic access$drainEventsQueue(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;)V
@@ -773,10 +1203,11 @@ diff -crB from/smali/com/discord/utilities/analytics/AnalyticsUtils$Tracker.smal
   
       return-void
   .end method
-Only in to/smali/com/discord/utilities/analytics: AnalyticsUtils$Tracker.smali.rej
+Only in com.discord-1013/smali/com/discord/utilities/analytics: AnalyticsUtils$Tracker.smali.orig
-diff -crB from/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali to/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali
+Only in com.discord-1013/smali/com/discord/utilities/analytics: AnalyticsUtils$Tracker.smali.rej
-*** from/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali	2019-12-21 11:43:12.513842824 +0200
+diff -crB com.discord-1013-base/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali com.discord-1013/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali
---- to/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali	2019-12-21 12:00:49.316916969 +0200
+*** com.discord-1013-base/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali	2019-12-21 21:31:17.620029573 +0300
+--- com.discord-1013/smali/com/discord/utilities/integrations/SpotifyHelper$openPlayStoreForSpotify$1.smali	2019-12-21 21:43:22.957586430 +0300
 ***************
 *** 45,51 ****
   
@@ -794,9 +1225,9 @@ diff -crB from/smali/com/discord/utilities/integrations/SpotifyHelper$openPlaySt
   
       invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
   
-diff -crB from/smali/com/discord/utilities/receiver/CampaignReceiver.smali to/smali/com/discord/utilities/receiver/CampaignReceiver.smali
+diff -crB com.discord-1013-base/smali/com/discord/utilities/receiver/CampaignReceiver.smali com.discord-1013/smali/com/discord/utilities/receiver/CampaignReceiver.smali
-*** from/smali/com/discord/utilities/receiver/CampaignReceiver.smali	2019-12-21 11:43:12.533843136 +0200
+*** com.discord-1013-base/smali/com/discord/utilities/receiver/CampaignReceiver.smali	2019-12-21 21:31:17.650029748 +0300
---- to/smali/com/discord/utilities/receiver/CampaignReceiver.smali	2019-12-21 12:05:06.555480612 +0200
+--- com.discord-1013/smali/com/discord/utilities/receiver/CampaignReceiver.smali	2019-12-21 21:44:41.498055772 +0300
 ***************
 *** 16,62 ****
   
@@ -854,4 +1285,6 @@ diff -crB from/smali/com/discord/utilities/receiver/CampaignReceiver.smali to/sm
   
       return-void
   .end method
-Only in to/smali/com/discord/utilities/receiver: CampaignReceiver.smali.rej
+Only in com.discord-1013/smali/com/discord/utilities/receiver: CampaignReceiver.smali.orig
+Only in com.discord-1013/smali/com/discord/utilities/receiver: CampaignReceiver.smali.rej
+

patches/slashcommands/1013.patch

@@ -1,6 +1,9 @@
-diff -crB com.discord-1013-base/smali/com/discord/stores/StoreMessages.smali com.discord-1013/smali/com/discord/stores/StoreMessages.smali
+Only in com.discord-1006: build
-*** com.discord-1013-base/smali/com/discord/stores/StoreMessages.smali	2019-12-21 20:49:58.459280835 +0300
+Only in com.discord-1006: dist
---- com.discord-1013/smali/com/discord/stores/StoreMessages.smali	2019-12-21 20:54:46.217565221 +0300
+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
 ***************
 *** 592,597 ****
 --- 592,601 ----
@@ -2773,85 +2776,19 @@ diff -crB com.discord-1013-base/smali/com/discord/stores/StoreMessages.smali com
 +     return-object p0
 + .end method
 \ No newline at end of file
-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
+Only in com.discord-1006/smali/com/discord/stores: StoreMessages.smali.orig
-*** com.discord-1013-base/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali	2019-12-21 20:49:58.685948776 +0300
+Only in com.discord-1006/smali/com/discord/stores: StoreMessages.smali.rej
---- com.discord-1013/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1.smali	2019-12-21 20:59:52.242618939 +0300
+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
-*** 305,310 ****
+Only in com.discord-1006-base/smali/com: facebook
---- 305,340 ----
+Only in com.discord-1006/smali_classes2/com: crashlytics
-  
+Only in com.discord-1006/smali_classes2/com/facebook: animated
-      move-result-object v10
+Only in com.discord-1006/smali_classes2/com/facebook: cache
-  
+Only in com.discord-1006/smali_classes2/com/facebook: common
-+     # intercept edit here
+Only in com.discord-1006/smali_classes2/com/facebook: datasource
-+ 
+Only in com.discord-1006/smali_classes2/com/facebook: drawee
-+     const-string v15, "/ctc "
+Only in com.discord-1006/smali_classes2/com/facebook: fbcore
-+ 
+Only in com.discord-1006/smali_classes2/com/facebook: fresco
-+     invoke-virtual {v10, v15}, Ljava/lang/String;->startsWith(Ljava/lang/String;)Z
+Only in com.discord-1006/smali_classes2/com/facebook/imagepipeline: animated
-+ 
+Only in com.discord-1006/smali_classes2/com/facebook/imagepipeline: R.smali
-+     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
 

patches/squareavatars/1013.patch

@@ -1,6 +1,6 @@
 diff -crB from/res/values/styles.xml to/res/values/styles.xml
-*** from/res/values/styles.xml	2019-12-21 11:42:07.189240640 +0200
+*** from/res/values/styles.xml	2019-12-21 21:31:15.670018218 +0300
---- to/res/values/styles.xml	2019-12-21 11:42:34.576305410 +0200
+--- to/res/values/styles.xml	2019-12-21 21:31:43.176845054 +0300
 ***************
 *** 941,947 ****
           <item name="actualImageScaleType">fitCenter</item>

patches/supplemental/1013.patch

@@ -1,6 +1,6 @@
 diff -crB from/smali/com/discord/gateway/io/IncomingParser.smali to/smali/com/discord/gateway/io/IncomingParser.smali
-*** from/smali/com/discord/gateway/io/IncomingParser.smali	2019-12-21 11:42:08.662580179 +0200
+*** from/smali/com/discord/gateway/io/IncomingParser.smali	2019-12-21 21:31:17.293361004 +0300
---- to/smali/com/discord/gateway/io/IncomingParser.smali	2019-12-21 11:42:32.346227672 +0200
+--- to/smali/com/discord/gateway/io/IncomingParser.smali	2019-12-21 21:31:40.820164665 +0300
 ***************
 *** 782,787 ****
 --- 782,798 ----
@@ -22,8 +22,8 @@ diff -crB from/smali/com/discord/gateway/io/IncomingParser.smali to/smali/com/di
   
       invoke-direct {v0}, Lcom/discord/models/domain/ModelMessageDelete;-><init>()V
 diff -crB from/smali/com/discord/models/domain/ModelChannel.smali to/smali/com/discord/models/domain/ModelChannel.smali
-*** from/smali/com/discord/models/domain/ModelChannel.smali	2019-12-21 11:42:08.702580347 +0200
+*** from/smali/com/discord/models/domain/ModelChannel.smali	2019-12-21 21:31:17.313361121 +0300
---- to/smali/com/discord/models/domain/ModelChannel.smali	2019-12-21 11:42:32.346227672 +0200
+--- to/smali/com/discord/models/domain/ModelChannel.smali	2019-12-21 21:31:40.820164665 +0300
 ***************
 *** 2183,2188 ****
 --- 2183,2198 ----
@@ -44,8 +44,8 @@ diff -crB from/smali/com/discord/models/domain/ModelChannel.smali to/smali/com/d
       iget-object v0, p0, Lcom/discord/models/domain/ModelChannel;->permissionOverwrites:Ljava/util/Map;
   
 diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/discord/stores/StoreUserSettings.smali
-*** from/smali/com/discord/stores/StoreUserSettings.smali	2019-12-21 11:42:08.909247878 +0200
+*** from/smali/com/discord/stores/StoreUserSettings.smali	2019-12-21 21:31:17.523362344 +0300
---- to/smali/com/discord/stores/StoreUserSettings.smali	2019-12-21 11:42:32.346227672 +0200
+--- to/smali/com/discord/stores/StoreUserSettings.smali	2019-12-21 21:31:40.820164665 +0300
 ***************
 *** 370,375 ****
 --- 370,623 ----
@@ -304,8 +304,8 @@ diff -crB from/smali/com/discord/stores/StoreUserSettings.smali to/smali/com/dis
       .locals 1
   
 diff -crB from/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali to/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali
-*** from/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali	2019-12-21 11:42:08.999248255 +0200
+*** from/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali	2019-12-21 21:31:17.653363100 +0300
---- to/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali	2019-12-21 11:42:32.346227672 +0200
+--- to/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali	2019-12-21 21:31:40.820164665 +0300
 ***************
 *** 46,51 ****
 --- 46,85 ----
@@ -363,8 +363,8 @@ diff -crB from/smali/com/discord/utilities/rest/SendUtils$getPart$1$1.smali to/s
       sget-object p1, Lokhttp3/MultipartBody$Part;->c:Lokhttp3/MultipartBody$Part$a;
   
 diff -crB from/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali to/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali
-*** from/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali	2019-12-21 11:42:09.199249085 +0200
+*** from/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali	2019-12-21 21:31:17.790030563 +0300
---- to/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali	2019-12-21 11:42:32.346227672 +0200
+--- to/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.smali	2019-12-21 21:31:40.820164665 +0300
 ***************
 *** 59,64 ****
 --- 59,74 ----
@@ -385,8 +385,8 @@ diff -crB from/smali/com/discord/widgets/chat/input/WidgetChatInputEditText$1.sm
       invoke-static {p1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z
   
 diff -crB from/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali to/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali
-*** from/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali	2019-12-21 11:42:09.205915779 +0200
+*** from/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali	2019-12-21 21:31:17.793363916 +0300
---- to/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali	2019-12-21 11:42:32.346227672 +0200
+--- to/smali/com/discord/widgets/chat/input/WidgetChatInputSend.smali	2019-12-21 21:31:40.820164665 +0300
 ***************
 *** 60,65 ****
 --- 60,89 ----