From 45dc42dfeee0e4485d6dd4262125214bf6f4b515 Mon Sep 17 00:00:00 2001
From: Ave Ozkal <ave@ave.zone>
Date: Sat, 5 Oct 2019 16:44:02 +0300
Subject: [PATCH] branding: Fix build issues

This might break compat with Android 10, but until Apktool supports this
field, there's not much I can do. Relevant issue: https://github.com/iBotPeaches/Apktool/issues/2167
---
 patches/branding/967.patch | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/patches/branding/967.patch b/patches/branding/967.patch
index 0be7a0714e..3e9f1ec317 100644
--- a/patches/branding/967.patch
+++ b/patches/branding/967.patch
@@ -1,6 +1,6 @@
 diff -crB com.discord-967-base/AndroidManifest.xml com.discord-967/AndroidManifest.xml
 *** com.discord-967-base/AndroidManifest.xml	2019-10-05 16:20:00.414666371 +0300
---- com.discord-967/AndroidManifest.xml	2019-10-05 16:20:50.501673118 +0300
+--- com.discord-967/AndroidManifest.xml	2019-10-05 16:42:07.709855390 +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="967" platformBuildVersionName="9.6.7">
@@ -35,7 +35,7 @@ diff -crB com.discord-967-base/AndroidManifest.xml com.discord-967/AndroidManife
       <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
       <uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
       <uses-feature android:name="android.hardware.camera.front" android:required="false"/>
-!     <application android:allowBackup="true" android:debuggable="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
+!     <application android:allowBackup="true" android:debuggable="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo_square" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:roundIcon="@mipmap/ic_logo_round" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
           <activity android:name="com.discord.samsung.SamsungConnectActivity" android:theme="@style/AppTheme.Translucent"/>
           <activity android:name="com.discord.app.AppActivity" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Dark" android:windowSoftInputMode="adjustResize|stateHidden"/>
           <activity android:exported="true" android:launchMode="singleTask" android:name="com.discord.app.AppActivity$Main" android:screenOrientation="fullUser" android:theme="@style/AppTheme.Loading" android:windowSoftInputMode="adjustResize|stateHidden">
@@ -126,11 +126,9 @@ diff -crB com.discord-967-base/AndroidManifest.xml com.discord-967/AndroidManife
           <meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
       </application>
 ! </manifest>
-Only in com.discord-967: AndroidManifest.xml.orig
-Only in com.discord-967: AndroidManifest.xml.rej
 diff -crB com.discord-967-base/apktool.yml com.discord-967/apktool.yml
 *** com.discord-967-base/apktool.yml	2019-10-05 16:19:01.894273804 +0300
---- com.discord-967/apktool.yml	2019-10-05 16:20:17.794782960 +0300
+--- com.discord-967/apktool.yml	2019-10-05 16:41:43.713038408 +0300
 ***************
 *** 181,185 ****
     tag: null
@@ -146,7 +144,7 @@ diff -crB com.discord-967-base/apktool.yml com.discord-967/apktool.yml
 !   versionName: 9.6.7-cutthecord-CTCBUILD
 diff -crB com.discord-967-base/res/values/strings.xml com.discord-967/res/values/strings.xml
 *** com.discord-967-base/res/values/strings.xml	2019-10-05 16:18:58.797586364 +0300
---- com.discord-967/res/values/strings.xml	2019-10-05 16:20:17.798116316 +0300
+--- com.discord-967/res/values/strings.xml	2019-10-05 16:41:43.719705116 +0300
 ***************
 *** 1310,1316 ****
       <string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
@@ -198,10 +196,9 @@ diff -crB com.discord-967-base/res/values/strings.xml com.discord-967/res/values
       <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-967/res/values: strings.xml.orig
 diff -crB com.discord-967-base/smali/com/discord/app/e.smali com.discord-967/smali/com/discord/app/e.smali
 *** com.discord-967-base/smali/com/discord/app/e.smali	2019-10-05 16:18:59.964260856 +0300
---- com.discord-967/smali/com/discord/app/e.smali	2019-10-05 16:20:17.798116316 +0300
+--- com.discord-967/smali/com/discord/app/e.smali	2019-10-05 16:41:43.719705116 +0300
 ***************
 *** 56,62 ****
       .line 17
@@ -221,7 +218,7 @@ diff -crB com.discord-967-base/smali/com/discord/app/e.smali com.discord-967/sma
       sput-object v0, Lcom/discord/app/e;->wz:Ljava/lang/String;
 diff -crB com.discord-967-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali com.discord-967/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
 *** com.discord-967-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali	2019-10-05 16:19:00.180928977 +0300
---- com.discord-967/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali	2019-10-05 16:20:17.798116316 +0300
+--- com.discord-967/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali	2019-10-05 16:41:43.719705116 +0300
 ***************
 *** 77,83 ****