From 458d5f4225ba9f75278e411f228a51a9e3f8319d Mon Sep 17 00:00:00 2001
From: Ave Ozkal <ave@ave.zone>
Date: Fri, 13 Dec 2019 12:52:29 +0300
Subject: [PATCH] Remove requestLegacyExternalStorage to make builds run

---
 patches/branding/1006.patch | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/patches/branding/1006.patch b/patches/branding/1006.patch
index 646c97e..d976429 100644
--- a/patches/branding/1006.patch
+++ b/patches/branding/1006.patch
@@ -1,6 +1,6 @@
 diff -crB com.discord-1006-base/AndroidManifest.xml com.discord-1006/AndroidManifest.xml
 *** com.discord-1006-base/AndroidManifest.xml	2019-12-13 11:13:00.644825664 +0300
---- com.discord-1006/AndroidManifest.xml	2019-12-13 11:36:54.065993910 +0300
+--- com.discord-1006/AndroidManifest.xml	2019-12-13 12:51:55.270389347 +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="1006" platformBuildVersionName="10.0.6">
@@ -37,7 +37,7 @@ diff -crB com.discord-1006-base/AndroidManifest.xml com.discord-1006/AndroidMani
       <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
       <uses-feature android:name="android.hardware.camera.front" android:required="false"/>
       <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
-!     <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">
@@ -119,7 +119,7 @@ diff -crB com.discord-1006-base/AndroidManifest.xml com.discord-1006/AndroidMani
 !         <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="true"/>
           <meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
       </application>
-  </manifest>
+! </manifest>
 \ No newline at end of file
 --- 198,206 ----
               </intent-filter>
@@ -130,13 +130,10 @@ diff -crB com.discord-1006-base/AndroidManifest.xml com.discord-1006/AndroidMani
 !         <meta-data android:name="firebase_crashlytics_ndk_enabled" android:value="false"/>
           <meta-data android:name="com.android.vending.derived.apk.id" android:value="1"/>
       </application>
-  </manifest>
-\ No newline at end of file
-Only in com.discord-1006: AndroidManifest.xml.orig
-Only in com.discord-1006: AndroidManifest.xml.rej
+! </manifest>
 diff -crB com.discord-1006-base/apktool.yml com.discord-1006/apktool.yml
 *** com.discord-1006-base/apktool.yml	2019-12-13 11:10:59.767472683 +0300
---- com.discord-1006/apktool.yml	2019-12-13 11:35:25.605520577 +0300
+--- com.discord-1006/apktool.yml	2019-12-13 12:51:42.946967805 +0300
 ***************
 *** 184,188 ****
     tag: null
@@ -150,10 +147,9 @@ diff -crB com.discord-1006-base/apktool.yml com.discord-1006/apktool.yml
   versionInfo:
 !   versionCode: '1006CTCBUILD'
 !   versionName: 10.0.6-cutthecord-CTCBUILD
-Only in com.discord-1006: apktool.yml.orig
 diff -crB com.discord-1006-base/res/values/strings.xml com.discord-1006/res/values/strings.xml
 *** com.discord-1006-base/res/values/strings.xml	2019-12-13 11:10:55.310779623 +0300
---- com.discord-1006/res/values/strings.xml	2019-12-13 11:35:25.608853928 +0300
+--- com.discord-1006/res/values/strings.xml	2019-12-13 12:51:42.953634519 +0300
 ***************
 *** 1325,1331 ****
       <string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
@@ -205,10 +201,9 @@ diff -crB com.discord-1006-base/res/values/strings.xml com.discord-1006/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-1006/res/values: strings.xml.orig
 diff -crB com.discord-1006-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali com.discord-1006/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali
 *** com.discord-1006-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali	2019-12-13 11:10:57.307458114 +0300
---- com.discord-1006/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali	2019-12-13 11:35:25.608853928 +0300
+--- com.discord-1006/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali	2019-12-13 12:51:42.953634519 +0300
 ***************
 *** 76,82 ****
       .line 3
@@ -226,5 +221,4 @@ diff -crB com.discord-1006-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-1006/smali/com/discord/utilities/captcha: CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali.orig