From 88f97bc519cfa91b1521d51b0b570f82e36d917d Mon Sep 17 00:00:00 2001
From: Ave Ozkal <ave@ave.zone>
Date: Mon, 13 May 2019 11:45:31 +0300
Subject: [PATCH] Allow backing up and debugging

---
 patches/blobs/README.md    |  7 +++----
 patches/branding/896.patch | 30 +++++++++++++++++++++++++-----
 patches/branding/README.md |  4 +++-
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/patches/blobs/README.md b/patches/blobs/README.md
index d3397cf..1e7791d 100644
--- a/patches/blobs/README.md
+++ b/patches/blobs/README.md
@@ -1,9 +1,8 @@
-## DisTok CutTheCord: Blob Emoji Patch
+## DisTok CutTheCord: Blob Emoji Patch Instructions
 
-This patch replaces emojis with Blob Emojis.
+This patch is a simple file replacement, so it doesn't have patch files.
 
-You'll need to pack in the right images to the apk. See README.md at the root of the repo for more information.
+You'll just need to pack in the right images to the apk using the `emojireplace.py` script in this folder. See README.md at the root of the repo for information on obtaining the images.
 
 #### Bugs / Side effects
 - Not all emojis are replaced
-
diff --git a/patches/branding/896.patch b/patches/branding/896.patch
index 17f03f0..eca49bf 100644
--- a/patches/branding/896.patch
+++ b/patches/branding/896.patch
@@ -1,6 +1,6 @@
 diff -crB com.discord-896-base/AndroidManifest.xml com.discord-896/AndroidManifest.xml
 *** com.discord-896-base/AndroidManifest.xml	2019-05-12 12:15:23.870380580 +0300
---- com.discord-896/AndroidManifest.xml	2019-05-12 12:38:19.864296241 +0300
+--- com.discord-896/AndroidManifest.xml	2019-05-13 11:40:14.718435134 +0300
 ***************
 *** 1,4 ****
 ! <?xml version="1.0" encoding="utf-8" standalone="no"?><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:compileSdkVersion="28" android:compileSdkVersionCodename="9" android:installLocation="auto" package="com.discord" platformBuildVersionCode="896" platformBuildVersionName="8.9.6">
@@ -13,6 +13,23 @@ diff -crB com.discord-896-base/AndroidManifest.xml com.discord-896/AndroidManife
       <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
       <uses-feature android:name="android.hardware.faketouch" android:required="false"/>
 ***************
+*** 21,27 ****
+      <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-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+!     <application android:allowBackup="false" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
+          <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">
+              <intent-filter>
+--- 21,27 ----
+      <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-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+!     <application android:allowBackup="true" android:debuggable="true" android:appCategory="social" android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:icon="@mipmap/ic_logo" android:label="@string/discord" android:largeHeap="true" android:name="com.discord.app.App" android:supportsRtl="true" android:theme="@style/AppTheme.Dark" android:usesCleartextTraffic="@bool/use_cleartext_traffic">
+          <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">
+              <intent-filter>
+***************
 *** 96,102 ****
           </receiver>
           <service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.CampaignTrackingService"/>
@@ -64,7 +81,7 @@ diff -crB com.discord-896-base/AndroidManifest.xml com.discord-896/AndroidManife
           <service android:directBootAware="false" android:enabled="@bool/enable_system_job_service_default" android:exported="true" android:name="androidx.work.impl.background.systemjob.SystemJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
           <receiver android:directBootAware="false" android:enabled="true" android:exported="false" android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"/>
 ***************
-*** 182,189 ****
+*** 182,190 ****
                   <action android:name="androidx.work.impl.background.systemalarm.UpdateProxies"/>
               </intent-filter>
           </receiver>
@@ -73,7 +90,9 @@ diff -crB com.discord-896-base/AndroidManifest.xml com.discord-896/AndroidManife
           <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>
---- 182,189 ----
+! </manifest>
+\ No newline at end of file
+--- 182,190 ----
                   <action android:name="androidx.work.impl.background.systemalarm.UpdateProxies"/>
               </intent-filter>
           </receiver>
@@ -82,9 +101,10 @@ diff -crB com.discord-896-base/AndroidManifest.xml com.discord-896/AndroidManife
           <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>
 diff -crB com.discord-896-base/apktool.yml com.discord-896/apktool.yml
 *** com.discord-896-base/apktool.yml	2019-05-12 12:13:48.744567188 +0300
---- com.discord-896/apktool.yml	2019-05-12 12:37:07.104064259 +0300
+--- com.discord-896/apktool.yml	2019-05-13 11:38:54.714734040 +0300
 ***************
 *** 308,312 ****
     tag: null
@@ -100,7 +120,7 @@ diff -crB com.discord-896-base/apktool.yml com.discord-896/apktool.yml
 !   versionName: 8.9.6-cutthecord-CTCBUILD
 diff -crB com.discord-896-base/res/values/strings.xml com.discord-896/res/values/strings.xml
 *** com.discord-896-base/res/values/strings.xml	2019-05-12 12:13:45.461106806 +0300
---- com.discord-896/res/values/strings.xml	2019-05-12 12:37:07.107397603 +0300
+--- com.discord-896/res/values/strings.xml	2019-05-13 11:38:54.724734086 +0300
 ***************
 *** 1280,1286 ****
       <string name="disconnect_account_body">Disconnecting your account might remove you from servers you joined via this account.</string>
diff --git a/patches/branding/README.md b/patches/branding/README.md
index e5c8483..3fcb74f 100644
--- a/patches/branding/README.md
+++ b/patches/branding/README.md
@@ -1,6 +1,8 @@
 ## DisTok CutTheCord: Custom Branding Patch
 
-This patch renames Discord app to Cutthecord.
+This patch renames Discord app to CutTheCord.
+
+It also enables debuggability (`android:debuggable`) and backupability (`android:allowBackup`) of the application.
 
 You'll need to run "addpatch.py" with syntax of `python3 addpatch.py $in_patch_filename $app_name $branch_name` and use the `-custom.patch` version, or else it'll fail. You'll need to put a valid directory for storing hacky build counters to it.