From 8de59b609e7f098429f40ba61e05575ffb84c87f Mon Sep 17 00:00:00 2001
From: Ave Ozkal <ave@ave.zone>
Date: Sun, 17 May 2020 20:34:48 +0300
Subject: [PATCH] 1144: Fix branding

---
 patches/branding/1144.patch | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/patches/branding/1144.patch b/patches/branding/1144.patch
index 6a55bfa..f337064 100644
--- a/patches/branding/1144.patch
+++ b/patches/branding/1144.patch
@@ -1,6 +1,6 @@
 diff -crB com.discord-1144-base/AndroidManifest.xml com.discord-1144/AndroidManifest.xml
-*** com.discord-1144-base/AndroidManifest.xml	2020-05-17 16:19:46.145014903 +0300
---- com.discord-1144/AndroidManifest.xml	2020-05-17 16:27:21.361149739 +0300
+*** com.discord-1144-base/AndroidManifest.xml	2020-05-17 16:38:39.238000000 +0300
+--- com.discord-1144/AndroidManifest.xml	2020-05-17 20:33:59.619447468 +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="1144" platformBuildVersionName="22.4">
@@ -156,11 +156,25 @@ diff -crB com.discord-1144-base/AndroidManifest.xml com.discord-1144/AndroidMani
           <meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
       </application>
 ! </manifest>
-Only in com.discord-1144: apktool.yml.orig
-Only in com.discord-1144: apktool.yml.rej
+diff -crB com.discord-1144-base/apktool.yml com.discord-1144/apktool.yml
+*** com.discord-1144-base/apktool.yml	2020-05-17 16:38:30.388618915 +0300
+--- com.discord-1144/apktool.yml	2020-05-17 20:34:19.006262528 +0300
+***************
+*** 190,194 ****
+    tag: null
+  version: 2.4.2-83a459-SNAPSHOT
+  versionInfo:
+!   versionCode: '1144'
+!   versionName: '22.4'
+--- 190,194 ----
+    tag: null
+  version: 2.4.2-83a459-SNAPSHOT
+  versionInfo:
+!   versionCode: '1144CTCBUILD'
+!   versionName: '22.4-cutthecord-CTCBUILD'
 diff -crB com.discord-1144-base/res/values/strings.xml com.discord-1144/res/values/strings.xml
-*** com.discord-1144-base/res/values/strings.xml	2020-05-17 16:19:00.244732422 +0300
---- com.discord-1144/res/values/strings.xml	2020-05-17 16:27:21.364483093 +0300
+*** com.discord-1144-base/res/values/strings.xml	2020-05-17 16:38:24.801917694 +0300
+--- com.discord-1144/res/values/strings.xml	2020-05-17 20:33:59.626114186 +0300
 ***************
 *** 1390,1396 ****
       <string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
@@ -212,10 +226,9 @@ diff -crB com.discord-1144-base/res/values/strings.xml com.discord-1144/res/valu
       <string name="suppress_all_embeds">Remove all embeds</string>
       <string name="suppress_embed_body">This will remove all embeds on this message for everyone.</string>
       <string name="suppress_embed_confirm">Remove All Embeds</string>
-Only in com.discord-1144/res/values: strings.xml.orig
 diff -crB com.discord-1144-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali com.discord-1144/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
-*** com.discord-1144-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali	2020-05-17 16:19:02.214744545 +0300
---- com.discord-1144/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali	2020-05-17 16:27:52.821343351 +0300
+*** com.discord-1144-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali	2020-05-17 16:38:26.798596710 +0300
+--- com.discord-1144/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali	2020-05-17 20:33:59.629447545 +0300
 ***************
 *** 76,82 ****
       .line 3
@@ -233,6 +246,4 @@ diff -crB com.discord-1144-base/smali/com/discord/utilities/captcha/CaptchaHelpe
   
       .line 4
       invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
-Only in com.discord-1144/smali/com/discord/utilities/captcha: CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali.orig
-Only in com.discord-1144/smali/com/discord/utilities/captcha: CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali.rej