87202 patches

This reverts commit c60d13a690.

BUILDING.md

@@ -2,7 +2,7 @@
 
 #### Toolchain setup
 
-- Get apktool (due to 2 bugs present in v2.3.4, you're strongly recommended to use v2.4.0 or higher, I compile latest from source).
+- Get apktool (use [this self-built version](//f001.backblazeb2.com/file/avepub/apktool-cli-all.jar) which is master + [this pr](https://github.com/iBotPeaches/Apktool/pull/2463)).
 - Get a keystore, see [here](https://stackoverflow.com/a/14994354/3286892), step 1.
 - Get apksigner, it's part of android build tools.
 - If you want Mutant Standard emoji patches, get 72x72 PNG copies of latest version of mutant standard emojis with codepoints. I have a zip [here](https://mutant.lavatech.top/72x72.zip).
@@ -21,9 +21,8 @@ CTCCI requires python3.6+, and also likely requires Linux (I haven't tried it on
 #### Initial setup
 
 - Follow the "Toolchain setup" steps above in case you haven't already.
-- Install dependencies (`python3 -m pip install -Ur requirements.txt`)
 - Copy `ctcci/ctcconfig.example.py` to `ctcci/ctcconfig.py` and configure contents to your local data and your personal preferences.
-- If you don't want to always automatically be required to use the latest discord version, set `LOCAL_STATE` to `True` and point `STATE_FILE` to a `state.json` file that looks like this: `{"android": {"com.discord": {"version": 909}}}`.
+- If you don't want to always automatically be required to use the latest discord version, edit the `$REPO_FOLDER/patchport-state.json` file.
 - Set up a local distok-style file storage for your APKs, and copy your APKs on it, and name them properly (the format is `$DISTOK_FOLDER/android/$PACKAGE_ID-$VERSION_NUMBER.apk`, example: `/home/ave/distok/android/com.discord-909.apk`).
 
 #### Environment Variables
@@ -61,11 +60,11 @@ To get the diff, run `diff -crB -x "dist" -x "res/raw" -x "build" CleanFolder Pa
 
 #### Porting patches
 
-You can use `patchport.py` to easily attempt to port patches. This is what I use to port between every single version.
+You can use `patchport.py` to easily attempt to port patches. This is what I use to port between every single version. Note that while CTCCI requires python3.6+, `patchport.py` requires python3.7+.
 
 It's not really intelligent and doesn't do much more than manually preparing necessary patch, checking if an existing patch can be applied to a given version, replacing relevant variables required for porting various patches and eliminating offsets caused by updates, but it saves a lot of time if used carefully.
 
-Example command: `python3 patchport.py /home/ave/workbench/ctc/com.discord-968`
+Example command: `python3.7 patchport.py /home/ave/workbench/ctc/com.discord-968`
 
 #### Figuring out which patch is causing your build to break
 

README.md

@@ -2,7 +2,11 @@
 
 Modular Client Mod for Discord's Android app.
 
-**Latest supported Discord Android version:** 49.13 (1340), released on 2020-11-20.
+**THIS IS A WORK IN PROGRESS BRANCH! THE PATCHES ARE INCOMPLETE!**
+
+For status updates and support on the project, join #cutthecord on https://libera.chat. WebIRC link: https://web.libera.chat/#cutthecord
+
+**Latest supported Discord Android version:** 78.4 - Alpha (78204), released on 2021-05-31.
 
 New patch development will be done for the latest supported version.
 

ctcci/.gitignore

@@ -1 +1,2 @@
-ctcconfig.py
+ctcconfig.py
+__pycache__

ctcci/ctcci.py

@@ -69,7 +69,7 @@ if DO_GITPULL:
 
 # Extract the APK if it's not already extracted to base cache
 if not os.path.exists(BASE_APK_PATH):
-    subprocess.run(f"{APKTOOL_BIN} d {INPUT_FILE} -o {BASE_APK_PATH} -f",
+    subprocess.run(f"{APKTOOL_BIN} d --no-dummy {INPUT_FILE} -o {BASE_APK_PATH} -f",
                    shell=True,
                    cwd=WORK_FOLDER)
 

old-patches/README.md

@@ -9,3 +9,5 @@ Here's why these patches are no longer maintained in this form:
 - compact: It's just a pain to maintain.
 - smalltime: It's just a pain to maintain.
 - customdefaultemoji: There doesn't seem to be default emojis anymore?
+- noprofilestrip: UI changes removed the profile strip.
+- nonearby: Didn't add much anyways.