From 77c353fa421d7df0c20dff3e0e25fb03e362fc17 Mon Sep 17 00:00:00 2001
From: Ave Ozkal <ave@ave.zone>
Date: Mon, 28 Jan 2019 22:19:15 +0300
Subject: [PATCH] branding: Fix version codes (fuck apktool)

---
 README.md                  |  2 +-
 patches/branding/835.patch | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index dd1d81ef42..f10fbaba1d 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Feel free to ignore play protect, it's bullshit.
 
 #### Toolchain setup
 
-- Get apktool
+- Get apktool (due to [a bug](https://github.com/iBotPeaches/Apktool/issues/1909) present on v2.3.4, I recommend using [this build](https://elixi.re/i/cq4r2zxg.jar))
 - Get a keystore, see [here](https://stackoverflow.com/a/14994354/3286892), step 1.
 - If you want Mutant Standard emoji patches, get 72x72 copies of latest version of mutant standard emojis with codepoints. I have a zip [here](https://mutant.lavatech.top/72x72.zip).
 - Extract the emojis you got somewhere.
diff --git a/patches/branding/835.patch b/patches/branding/835.patch
index f0dafa5a64..ecb5662c13 100644
--- a/patches/branding/835.patch
+++ b/patches/branding/835.patch
@@ -35,6 +35,22 @@ diff -crB -x dist -x build com.discord-834-base/res/values/strings.xml com.disco
       <string name="notification_title_start_game">"Somebody Playin'"</string>
       <string name="notifications">Notifications</string>
       <string name="nsfw_accept">Continue</string>
+diff -crB -x dist -x build com.discord-835-base/apktool.yml com.discord-835/apktool.yml
+*** com.discord-835-base/apktool.yml    2019-01-28 21:28:06.589102865 +0300
+--- com.discord-835/apktool.yml 2019-01-28 22:09:54.479638386 +0300
+***************
+*** 345,349 ****
+    tag: null
+  version: 2.4.0-896569-SNAPSHOT
+  versionInfo:
+!   versionCode: '835'
+!   versionName: 8.3.5g
+--- 345,349 ----
+    tag: null
+  version: 2.4.0-896569-SNAPSHOT
+  versionInfo:
+!   versionCode: '835CTCBUILD'
+!   versionName: 8.3.5g-cutthecord-CTCBUILD
 diff -crB -x dist -x build com.discord-835-base/AndroidManifest.xml com.discord-835/AndroidManifest.xml
 *** com.discord-835-base/AndroidManifest.xml    2019-01-25 10:57:34.292581301 +0300
 --- com.discord-835/AndroidManifest.xml 2019-01-25 15:30:47.000000000 +0300