diff --git a/BUILDING.md b/BUILDING.md index c9f0cf0..edaba93 100644 --- a/BUILDING.md +++ b/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 diff --git a/README.md b/README.md index ce286b3..e232175 100644 --- a/README.md +++ b/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. diff --git a/ctcci/.gitignore b/ctcci/.gitignore index 88dab90..2246658 100644 --- a/ctcci/.gitignore +++ b/ctcci/.gitignore @@ -1 +1,2 @@ -ctcconfig.py \ No newline at end of file +ctcconfig.py +__pycache__ \ No newline at end of file diff --git a/ctcci/ctcci.py b/ctcci/ctcci.py index 2e76d15..82b4fee 100644 --- a/ctcci/ctcci.py +++ b/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) diff --git a/old-patches/README.md b/old-patches/README.md index bd29779..0723a0e 100644 --- a/old-patches/README.md +++ b/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. diff --git a/patches/nonearby/1006.patch b/old-patches/nonearby/1006.patch similarity index 100% rename from patches/nonearby/1006.patch rename to old-patches/nonearby/1006.patch diff --git a/patches/nonearby/1007.patch b/old-patches/nonearby/1007.patch similarity index 100% rename from patches/nonearby/1007.patch rename to old-patches/nonearby/1007.patch diff --git a/patches/nonearby/1011.patch b/old-patches/nonearby/1011.patch similarity index 100% rename from patches/nonearby/1011.patch rename to old-patches/nonearby/1011.patch diff --git a/patches/nonearby/1012.patch b/old-patches/nonearby/1012.patch similarity index 100% rename from patches/nonearby/1012.patch rename to old-patches/nonearby/1012.patch diff --git a/patches/nonearby/1013.patch b/old-patches/nonearby/1013.patch similarity index 100% rename from patches/nonearby/1013.patch rename to old-patches/nonearby/1013.patch diff --git a/patches/nonearby/1015.patch b/old-patches/nonearby/1015.patch similarity index 100% rename from patches/nonearby/1015.patch rename to old-patches/nonearby/1015.patch diff --git a/patches/nonearby/1016.patch b/old-patches/nonearby/1016.patch similarity index 100% rename from patches/nonearby/1016.patch rename to old-patches/nonearby/1016.patch diff --git a/patches/nonearby/1019.patch b/old-patches/nonearby/1019.patch similarity index 100% rename from patches/nonearby/1019.patch rename to old-patches/nonearby/1019.patch diff --git a/patches/nonearby/1020.patch b/old-patches/nonearby/1020.patch similarity index 100% rename from patches/nonearby/1020.patch rename to old-patches/nonearby/1020.patch diff --git a/patches/nonearby/1021.patch b/old-patches/nonearby/1021.patch similarity index 100% rename from patches/nonearby/1021.patch rename to old-patches/nonearby/1021.patch diff --git a/patches/nonearby/1022.patch b/old-patches/nonearby/1022.patch similarity index 100% rename from patches/nonearby/1022.patch rename to old-patches/nonearby/1022.patch diff --git a/patches/nonearby/1023.patch b/old-patches/nonearby/1023.patch similarity index 100% rename from patches/nonearby/1023.patch rename to old-patches/nonearby/1023.patch diff --git a/patches/nonearby/1024.patch b/old-patches/nonearby/1024.patch similarity index 100% rename from patches/nonearby/1024.patch rename to old-patches/nonearby/1024.patch diff --git a/patches/nonearby/1025.patch b/old-patches/nonearby/1025.patch similarity index 100% rename from patches/nonearby/1025.patch rename to old-patches/nonearby/1025.patch diff --git a/patches/nonearby/1026.patch b/old-patches/nonearby/1026.patch similarity index 100% rename from patches/nonearby/1026.patch rename to old-patches/nonearby/1026.patch diff --git a/patches/nonearby/1029.patch b/old-patches/nonearby/1029.patch similarity index 100% rename from patches/nonearby/1029.patch rename to old-patches/nonearby/1029.patch diff --git a/patches/nonearby/1031.patch b/old-patches/nonearby/1031.patch similarity index 100% rename from patches/nonearby/1031.patch rename to old-patches/nonearby/1031.patch diff --git a/patches/nonearby/1032.patch b/old-patches/nonearby/1032.patch similarity index 100% rename from patches/nonearby/1032.patch rename to old-patches/nonearby/1032.patch diff --git a/patches/nonearby/1033.patch b/old-patches/nonearby/1033.patch similarity index 100% rename from patches/nonearby/1033.patch rename to old-patches/nonearby/1033.patch diff --git a/patches/nonearby/1036.patch b/old-patches/nonearby/1036.patch similarity index 100% rename from patches/nonearby/1036.patch rename to old-patches/nonearby/1036.patch diff --git a/patches/nonearby/1037.patch b/old-patches/nonearby/1037.patch similarity index 100% rename from patches/nonearby/1037.patch rename to old-patches/nonearby/1037.patch diff --git a/patches/nonearby/1040.patch b/old-patches/nonearby/1040.patch similarity index 100% rename from patches/nonearby/1040.patch rename to old-patches/nonearby/1040.patch diff --git a/patches/nonearby/1041.patch b/old-patches/nonearby/1041.patch similarity index 100% rename from patches/nonearby/1041.patch rename to old-patches/nonearby/1041.patch diff --git a/patches/nonearby/1045.patch b/old-patches/nonearby/1045.patch similarity index 100% rename from patches/nonearby/1045.patch rename to old-patches/nonearby/1045.patch diff --git a/patches/nonearby/1046.patch b/old-patches/nonearby/1046.patch similarity index 100% rename from patches/nonearby/1046.patch rename to old-patches/nonearby/1046.patch diff --git a/patches/nonearby/1047.patch b/old-patches/nonearby/1047.patch similarity index 100% rename from patches/nonearby/1047.patch rename to old-patches/nonearby/1047.patch diff --git a/patches/nonearby/1049.patch b/old-patches/nonearby/1049.patch similarity index 100% rename from patches/nonearby/1049.patch rename to old-patches/nonearby/1049.patch diff --git a/patches/nonearby/1052.patch b/old-patches/nonearby/1052.patch similarity index 100% rename from patches/nonearby/1052.patch rename to old-patches/nonearby/1052.patch diff --git a/patches/nonearby/1053.patch b/old-patches/nonearby/1053.patch similarity index 100% rename from patches/nonearby/1053.patch rename to old-patches/nonearby/1053.patch diff --git a/patches/nonearby/1054.patch b/old-patches/nonearby/1054.patch similarity index 100% rename from patches/nonearby/1054.patch rename to old-patches/nonearby/1054.patch diff --git a/patches/nonearby/1056.patch b/old-patches/nonearby/1056.patch similarity index 100% rename from patches/nonearby/1056.patch rename to old-patches/nonearby/1056.patch diff --git a/patches/nonearby/1057.patch b/old-patches/nonearby/1057.patch similarity index 100% rename from patches/nonearby/1057.patch rename to old-patches/nonearby/1057.patch diff --git a/patches/nonearby/1062.patch b/old-patches/nonearby/1062.patch similarity index 100% rename from patches/nonearby/1062.patch rename to old-patches/nonearby/1062.patch diff --git a/patches/nonearby/1065.patch b/old-patches/nonearby/1065.patch similarity index 100% rename from patches/nonearby/1065.patch rename to old-patches/nonearby/1065.patch diff --git a/patches/nonearby/1066.patch b/old-patches/nonearby/1066.patch similarity index 100% rename from patches/nonearby/1066.patch rename to old-patches/nonearby/1066.patch diff --git a/patches/nonearby/1069.patch b/old-patches/nonearby/1069.patch similarity index 100% rename from patches/nonearby/1069.patch rename to old-patches/nonearby/1069.patch diff --git a/patches/nonearby/1073.patch b/old-patches/nonearby/1073.patch similarity index 100% rename from patches/nonearby/1073.patch rename to old-patches/nonearby/1073.patch diff --git a/patches/nonearby/1074.patch b/old-patches/nonearby/1074.patch similarity index 100% rename from patches/nonearby/1074.patch rename to old-patches/nonearby/1074.patch diff --git a/patches/nonearby/1078.patch b/old-patches/nonearby/1078.patch similarity index 100% rename from patches/nonearby/1078.patch rename to old-patches/nonearby/1078.patch diff --git a/patches/nonearby/1084.patch b/old-patches/nonearby/1084.patch similarity index 100% rename from patches/nonearby/1084.patch rename to old-patches/nonearby/1084.patch diff --git a/patches/nonearby/1085.patch b/old-patches/nonearby/1085.patch similarity index 100% rename from patches/nonearby/1085.patch rename to old-patches/nonearby/1085.patch diff --git a/patches/nonearby/1087.patch b/old-patches/nonearby/1087.patch similarity index 100% rename from patches/nonearby/1087.patch rename to old-patches/nonearby/1087.patch diff --git a/patches/nonearby/1091.patch b/old-patches/nonearby/1091.patch similarity index 100% rename from patches/nonearby/1091.patch rename to old-patches/nonearby/1091.patch diff --git a/patches/nonearby/1092.patch b/old-patches/nonearby/1092.patch similarity index 100% rename from patches/nonearby/1092.patch rename to old-patches/nonearby/1092.patch diff --git a/patches/nonearby/1100.patch b/old-patches/nonearby/1100.patch similarity index 100% rename from patches/nonearby/1100.patch rename to old-patches/nonearby/1100.patch diff --git a/patches/nonearby/1103.patch b/old-patches/nonearby/1103.patch similarity index 100% rename from patches/nonearby/1103.patch rename to old-patches/nonearby/1103.patch diff --git a/patches/nonearby/1104.patch b/old-patches/nonearby/1104.patch similarity index 100% rename from patches/nonearby/1104.patch rename to old-patches/nonearby/1104.patch diff --git a/patches/nonearby/1105.patch b/old-patches/nonearby/1105.patch similarity index 100% rename from patches/nonearby/1105.patch rename to old-patches/nonearby/1105.patch diff --git a/patches/nonearby/1107.patch b/old-patches/nonearby/1107.patch similarity index 100% rename from patches/nonearby/1107.patch rename to old-patches/nonearby/1107.patch diff --git a/patches/nonearby/1123.patch b/old-patches/nonearby/1123.patch similarity index 100% rename from patches/nonearby/1123.patch rename to old-patches/nonearby/1123.patch diff --git a/patches/nonearby/1132.patch b/old-patches/nonearby/1132.patch similarity index 100% rename from patches/nonearby/1132.patch rename to old-patches/nonearby/1132.patch diff --git a/patches/nonearby/1134.patch b/old-patches/nonearby/1134.patch similarity index 100% rename from patches/nonearby/1134.patch rename to old-patches/nonearby/1134.patch diff --git a/patches/nonearby/1144.patch b/old-patches/nonearby/1144.patch similarity index 100% rename from patches/nonearby/1144.patch rename to old-patches/nonearby/1144.patch diff --git a/patches/nonearby/1145.patch b/old-patches/nonearby/1145.patch similarity index 100% rename from patches/nonearby/1145.patch rename to old-patches/nonearby/1145.patch diff --git a/patches/nonearby/1146.patch b/old-patches/nonearby/1146.patch similarity index 100% rename from patches/nonearby/1146.patch rename to old-patches/nonearby/1146.patch diff --git a/patches/nonearby/1148.patch b/old-patches/nonearby/1148.patch similarity index 100% rename from patches/nonearby/1148.patch rename to old-patches/nonearby/1148.patch diff --git a/patches/nonearby/1150.patch b/old-patches/nonearby/1150.patch similarity index 100% rename from patches/nonearby/1150.patch rename to old-patches/nonearby/1150.patch diff --git a/patches/nonearby/1167.patch b/old-patches/nonearby/1167.patch similarity index 100% rename from patches/nonearby/1167.patch rename to old-patches/nonearby/1167.patch diff --git a/patches/nonearby/1169.patch b/old-patches/nonearby/1169.patch similarity index 100% rename from patches/nonearby/1169.patch rename to old-patches/nonearby/1169.patch diff --git a/patches/nonearby/1171.patch b/old-patches/nonearby/1171.patch similarity index 100% rename from patches/nonearby/1171.patch rename to old-patches/nonearby/1171.patch diff --git a/patches/nonearby/1180.patch b/old-patches/nonearby/1180.patch similarity index 100% rename from patches/nonearby/1180.patch rename to old-patches/nonearby/1180.patch diff --git a/patches/nonearby/1181.patch b/old-patches/nonearby/1181.patch similarity index 100% rename from patches/nonearby/1181.patch rename to old-patches/nonearby/1181.patch diff --git a/patches/nonearby/1192.patch b/old-patches/nonearby/1192.patch similarity index 100% rename from patches/nonearby/1192.patch rename to old-patches/nonearby/1192.patch diff --git a/patches/nonearby/1196.patch b/old-patches/nonearby/1196.patch similarity index 100% rename from patches/nonearby/1196.patch rename to old-patches/nonearby/1196.patch diff --git a/patches/nonearby/1200.patch b/old-patches/nonearby/1200.patch similarity index 100% rename from patches/nonearby/1200.patch rename to old-patches/nonearby/1200.patch diff --git a/patches/nonearby/1201.patch b/old-patches/nonearby/1201.patch similarity index 100% rename from patches/nonearby/1201.patch rename to old-patches/nonearby/1201.patch diff --git a/patches/nonearby/1208.patch b/old-patches/nonearby/1208.patch similarity index 100% rename from patches/nonearby/1208.patch rename to old-patches/nonearby/1208.patch diff --git a/patches/nonearby/1213.patch b/old-patches/nonearby/1213.patch similarity index 100% rename from patches/nonearby/1213.patch rename to old-patches/nonearby/1213.patch diff --git a/patches/nonearby/1216.patch b/old-patches/nonearby/1216.patch similarity index 100% rename from patches/nonearby/1216.patch rename to old-patches/nonearby/1216.patch diff --git a/patches/nonearby/1218.patch b/old-patches/nonearby/1218.patch similarity index 100% rename from patches/nonearby/1218.patch rename to old-patches/nonearby/1218.patch diff --git a/patches/nonearby/1223.patch b/old-patches/nonearby/1223.patch similarity index 100% rename from patches/nonearby/1223.patch rename to old-patches/nonearby/1223.patch diff --git a/patches/nonearby/1243.patch b/old-patches/nonearby/1243.patch similarity index 100% rename from patches/nonearby/1243.patch rename to old-patches/nonearby/1243.patch diff --git a/patches/nonearby/1246.patch b/old-patches/nonearby/1246.patch similarity index 100% rename from patches/nonearby/1246.patch rename to old-patches/nonearby/1246.patch diff --git a/patches/nonearby/1249.patch b/old-patches/nonearby/1249.patch similarity index 100% rename from patches/nonearby/1249.patch rename to old-patches/nonearby/1249.patch diff --git a/patches/nonearby/1251.patch b/old-patches/nonearby/1251.patch similarity index 100% rename from patches/nonearby/1251.patch rename to old-patches/nonearby/1251.patch diff --git a/patches/nonearby/1252.patch b/old-patches/nonearby/1252.patch similarity index 100% rename from patches/nonearby/1252.patch rename to old-patches/nonearby/1252.patch diff --git a/patches/nonearby/1259.patch b/old-patches/nonearby/1259.patch similarity index 100% rename from patches/nonearby/1259.patch rename to old-patches/nonearby/1259.patch diff --git a/patches/nonearby/1266.patch b/old-patches/nonearby/1266.patch similarity index 100% rename from patches/nonearby/1266.patch rename to old-patches/nonearby/1266.patch diff --git a/patches/nonearby/1270.patch b/old-patches/nonearby/1270.patch similarity index 100% rename from patches/nonearby/1270.patch rename to old-patches/nonearby/1270.patch diff --git a/patches/nonearby/1273.patch b/old-patches/nonearby/1273.patch similarity index 100% rename from patches/nonearby/1273.patch rename to old-patches/nonearby/1273.patch diff --git a/patches/nonearby/1279.patch b/old-patches/nonearby/1279.patch similarity index 100% rename from patches/nonearby/1279.patch rename to old-patches/nonearby/1279.patch diff --git a/patches/nonearby/1280.patch b/old-patches/nonearby/1280.patch similarity index 100% rename from patches/nonearby/1280.patch rename to old-patches/nonearby/1280.patch diff --git a/patches/nonearby/1281.patch b/old-patches/nonearby/1281.patch similarity index 100% rename from patches/nonearby/1281.patch rename to old-patches/nonearby/1281.patch diff --git a/patches/nonearby/1282.patch b/old-patches/nonearby/1282.patch similarity index 100% rename from patches/nonearby/1282.patch rename to old-patches/nonearby/1282.patch diff --git a/patches/nonearby/1284.patch b/old-patches/nonearby/1284.patch similarity index 100% rename from patches/nonearby/1284.patch rename to old-patches/nonearby/1284.patch diff --git a/patches/nonearby/1290.patch b/old-patches/nonearby/1290.patch similarity index 100% rename from patches/nonearby/1290.patch rename to old-patches/nonearby/1290.patch diff --git a/patches/nonearby/1294.patch b/old-patches/nonearby/1294.patch similarity index 100% rename from patches/nonearby/1294.patch rename to old-patches/nonearby/1294.patch diff --git a/patches/nonearby/1295.patch b/old-patches/nonearby/1295.patch similarity index 100% rename from patches/nonearby/1295.patch rename to old-patches/nonearby/1295.patch diff --git a/patches/nonearby/1298.patch b/old-patches/nonearby/1298.patch similarity index 100% rename from patches/nonearby/1298.patch rename to old-patches/nonearby/1298.patch diff --git a/patches/nonearby/1300.patch b/old-patches/nonearby/1300.patch similarity index 100% rename from patches/nonearby/1300.patch rename to old-patches/nonearby/1300.patch diff --git a/patches/nonearby/1301.patch b/old-patches/nonearby/1301.patch similarity index 100% rename from patches/nonearby/1301.patch rename to old-patches/nonearby/1301.patch diff --git a/patches/nonearby/1304.patch b/old-patches/nonearby/1304.patch similarity index 100% rename from patches/nonearby/1304.patch rename to old-patches/nonearby/1304.patch diff --git a/patches/nonearby/1306.patch b/old-patches/nonearby/1306.patch similarity index 100% rename from patches/nonearby/1306.patch rename to old-patches/nonearby/1306.patch diff --git a/patches/nonearby/1307.patch b/old-patches/nonearby/1307.patch similarity index 100% rename from patches/nonearby/1307.patch rename to old-patches/nonearby/1307.patch diff --git a/patches/nonearby/1310.patch b/old-patches/nonearby/1310.patch similarity index 100% rename from patches/nonearby/1310.patch rename to old-patches/nonearby/1310.patch diff --git a/patches/nonearby/1315.patch b/old-patches/nonearby/1315.patch similarity index 100% rename from patches/nonearby/1315.patch rename to old-patches/nonearby/1315.patch diff --git a/patches/nonearby/1318.patch b/old-patches/nonearby/1318.patch similarity index 100% rename from patches/nonearby/1318.patch rename to old-patches/nonearby/1318.patch diff --git a/patches/nonearby/1330.patch b/old-patches/nonearby/1330.patch similarity index 100% rename from patches/nonearby/1330.patch rename to old-patches/nonearby/1330.patch diff --git a/patches/nonearby/1334.patch b/old-patches/nonearby/1334.patch similarity index 100% rename from patches/nonearby/1334.patch rename to old-patches/nonearby/1334.patch diff --git a/patches/nonearby/1339.patch b/old-patches/nonearby/1339.patch similarity index 100% rename from patches/nonearby/1339.patch rename to old-patches/nonearby/1339.patch diff --git a/patches/nonearby/1340.patch b/old-patches/nonearby/1340.patch similarity index 100% rename from patches/nonearby/1340.patch rename to old-patches/nonearby/1340.patch diff --git a/old-patches/nonearby/1355.patch b/old-patches/nonearby/1355.patch new file mode 100644 index 0000000..53ae69a --- /dev/null +++ b/old-patches/nonearby/1355.patch @@ -0,0 +1,99 @@ +diff -crB from/smali/com/discord/widgets/friends/NearbyManager.smali to/smali/com/discord/widgets/friends/NearbyManager.smali +*** from/smali/com/discord/widgets/friends/NearbyManager.smali 2020-11-16 13:22:49.797198145 +0000 +--- to/smali/com/discord/widgets/friends/NearbyManager.smali 2020-11-16 13:33:15.674833097 +0000 +*************** +*** 463,517 **** + + # virtual methods + .method public final activateNearby()V +! .locals 9 + +- .line 1 +- iget-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->messagesClient:Lcom/google/android/gms/nearby/messages/MessagesClient; +- +- if-eqz v0, :cond_0 +- +- .line 2 +- iget-object v1, p0, Lcom/discord/widgets/friends/NearbyManager;->outboundMessage:Lcom/google/android/gms/nearby/messages/Message; +- +- if-eqz v1, :cond_0 +- +- .line 3 +- iget-object v2, p0, Lcom/discord/widgets/friends/NearbyManager;->messagePublishOptions:Lcom/google/android/gms/nearby/messages/PublishOptions; +- +- if-eqz v2, :cond_0 +- +- .line 4 +- iget-object v3, p0, Lcom/discord/widgets/friends/NearbyManager;->messageListener:Lcom/google/android/gms/nearby/messages/MessageListener; +- +- if-eqz v3, :cond_0 +- +- .line 5 +- iget-object v4, p0, Lcom/discord/widgets/friends/NearbyManager;->subscribeOptions:Lcom/google/android/gms/nearby/messages/SubscribeOptions; +- +- if-eqz v4, :cond_0 +- +- .line 6 +- iget-object v5, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyStateSubject:Lrx/subjects/BehaviorSubject; +- +- new-instance v6, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected; +- +- new-instance v7, Ljava/util/HashSet; +- +- iget-object v8, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyUserIds:Ljava/util/HashSet; +- +- invoke-direct {v7, v8}, Ljava/util/HashSet;->(Ljava/util/Collection;)V +- +- invoke-direct {v6, v7}, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected;->(Ljava/util/Set;)V +- +- invoke-virtual {v5, v6}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V +- +- .line 7 +- invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/nearby/messages/MessagesClient;->f(Lcom/google/android/gms/nearby/messages/Message;Lcom/google/android/gms/nearby/messages/PublishOptions;)Lcom/google/android/gms/tasks/Task; +- +- .line 8 +- invoke-virtual {v0, v3, v4}, Lcom/google/android/gms/nearby/messages/MessagesClient;->g(Lcom/google/android/gms/nearby/messages/MessageListener;Lcom/google/android/gms/nearby/messages/SubscribeOptions;)Lcom/google/android/gms/tasks/Task; +- +- :cond_0 + return-void + .end method + +--- 463,470 ---- + + # virtual methods + .method public final activateNearby()V +! .locals 0 + + return-void + .end method + +*************** +*** 599,618 **** + .end method + + .method public final initialize(J)V +! .locals 1 +! +! .line 1 +! invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; +! +! move-result-object v0 +! +! iput-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->meUserId:Ljava/lang/Long; +! +! .line 2 +! invoke-direct {p0, p1, p2}, Lcom/discord/widgets/friends/NearbyManager;->setupBroadcaster(J)V +! +! .line 3 +! invoke-direct {p0}, Lcom/discord/widgets/friends/NearbyManager;->setupListener()V + + return-void + .end method +--- 552,558 ---- + .end method + + .method public final initialize(J)V +! .locals 0 + + return-void + .end method diff --git a/old-patches/nonearby/1356.patch b/old-patches/nonearby/1356.patch new file mode 100644 index 0000000..53ae69a --- /dev/null +++ b/old-patches/nonearby/1356.patch @@ -0,0 +1,99 @@ +diff -crB from/smali/com/discord/widgets/friends/NearbyManager.smali to/smali/com/discord/widgets/friends/NearbyManager.smali +*** from/smali/com/discord/widgets/friends/NearbyManager.smali 2020-11-16 13:22:49.797198145 +0000 +--- to/smali/com/discord/widgets/friends/NearbyManager.smali 2020-11-16 13:33:15.674833097 +0000 +*************** +*** 463,517 **** + + # virtual methods + .method public final activateNearby()V +! .locals 9 + +- .line 1 +- iget-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->messagesClient:Lcom/google/android/gms/nearby/messages/MessagesClient; +- +- if-eqz v0, :cond_0 +- +- .line 2 +- iget-object v1, p0, Lcom/discord/widgets/friends/NearbyManager;->outboundMessage:Lcom/google/android/gms/nearby/messages/Message; +- +- if-eqz v1, :cond_0 +- +- .line 3 +- iget-object v2, p0, Lcom/discord/widgets/friends/NearbyManager;->messagePublishOptions:Lcom/google/android/gms/nearby/messages/PublishOptions; +- +- if-eqz v2, :cond_0 +- +- .line 4 +- iget-object v3, p0, Lcom/discord/widgets/friends/NearbyManager;->messageListener:Lcom/google/android/gms/nearby/messages/MessageListener; +- +- if-eqz v3, :cond_0 +- +- .line 5 +- iget-object v4, p0, Lcom/discord/widgets/friends/NearbyManager;->subscribeOptions:Lcom/google/android/gms/nearby/messages/SubscribeOptions; +- +- if-eqz v4, :cond_0 +- +- .line 6 +- iget-object v5, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyStateSubject:Lrx/subjects/BehaviorSubject; +- +- new-instance v6, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected; +- +- new-instance v7, Ljava/util/HashSet; +- +- iget-object v8, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyUserIds:Ljava/util/HashSet; +- +- invoke-direct {v7, v8}, Ljava/util/HashSet;->(Ljava/util/Collection;)V +- +- invoke-direct {v6, v7}, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected;->(Ljava/util/Set;)V +- +- invoke-virtual {v5, v6}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V +- +- .line 7 +- invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/nearby/messages/MessagesClient;->f(Lcom/google/android/gms/nearby/messages/Message;Lcom/google/android/gms/nearby/messages/PublishOptions;)Lcom/google/android/gms/tasks/Task; +- +- .line 8 +- invoke-virtual {v0, v3, v4}, Lcom/google/android/gms/nearby/messages/MessagesClient;->g(Lcom/google/android/gms/nearby/messages/MessageListener;Lcom/google/android/gms/nearby/messages/SubscribeOptions;)Lcom/google/android/gms/tasks/Task; +- +- :cond_0 + return-void + .end method + +--- 463,470 ---- + + # virtual methods + .method public final activateNearby()V +! .locals 0 + + return-void + .end method + +*************** +*** 599,618 **** + .end method + + .method public final initialize(J)V +! .locals 1 +! +! .line 1 +! invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; +! +! move-result-object v0 +! +! iput-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->meUserId:Ljava/lang/Long; +! +! .line 2 +! invoke-direct {p0, p1, p2}, Lcom/discord/widgets/friends/NearbyManager;->setupBroadcaster(J)V +! +! .line 3 +! invoke-direct {p0}, Lcom/discord/widgets/friends/NearbyManager;->setupListener()V + + return-void + .end method +--- 552,558 ---- + .end method + + .method public final initialize(J)V +! .locals 0 + + return-void + .end method diff --git a/old-patches/nonearby/1358.patch b/old-patches/nonearby/1358.patch new file mode 100644 index 0000000..53ae69a --- /dev/null +++ b/old-patches/nonearby/1358.patch @@ -0,0 +1,99 @@ +diff -crB from/smali/com/discord/widgets/friends/NearbyManager.smali to/smali/com/discord/widgets/friends/NearbyManager.smali +*** from/smali/com/discord/widgets/friends/NearbyManager.smali 2020-11-16 13:22:49.797198145 +0000 +--- to/smali/com/discord/widgets/friends/NearbyManager.smali 2020-11-16 13:33:15.674833097 +0000 +*************** +*** 463,517 **** + + # virtual methods + .method public final activateNearby()V +! .locals 9 + +- .line 1 +- iget-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->messagesClient:Lcom/google/android/gms/nearby/messages/MessagesClient; +- +- if-eqz v0, :cond_0 +- +- .line 2 +- iget-object v1, p0, Lcom/discord/widgets/friends/NearbyManager;->outboundMessage:Lcom/google/android/gms/nearby/messages/Message; +- +- if-eqz v1, :cond_0 +- +- .line 3 +- iget-object v2, p0, Lcom/discord/widgets/friends/NearbyManager;->messagePublishOptions:Lcom/google/android/gms/nearby/messages/PublishOptions; +- +- if-eqz v2, :cond_0 +- +- .line 4 +- iget-object v3, p0, Lcom/discord/widgets/friends/NearbyManager;->messageListener:Lcom/google/android/gms/nearby/messages/MessageListener; +- +- if-eqz v3, :cond_0 +- +- .line 5 +- iget-object v4, p0, Lcom/discord/widgets/friends/NearbyManager;->subscribeOptions:Lcom/google/android/gms/nearby/messages/SubscribeOptions; +- +- if-eqz v4, :cond_0 +- +- .line 6 +- iget-object v5, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyStateSubject:Lrx/subjects/BehaviorSubject; +- +- new-instance v6, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected; +- +- new-instance v7, Ljava/util/HashSet; +- +- iget-object v8, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyUserIds:Ljava/util/HashSet; +- +- invoke-direct {v7, v8}, Ljava/util/HashSet;->(Ljava/util/Collection;)V +- +- invoke-direct {v6, v7}, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected;->(Ljava/util/Set;)V +- +- invoke-virtual {v5, v6}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V +- +- .line 7 +- invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/nearby/messages/MessagesClient;->f(Lcom/google/android/gms/nearby/messages/Message;Lcom/google/android/gms/nearby/messages/PublishOptions;)Lcom/google/android/gms/tasks/Task; +- +- .line 8 +- invoke-virtual {v0, v3, v4}, Lcom/google/android/gms/nearby/messages/MessagesClient;->g(Lcom/google/android/gms/nearby/messages/MessageListener;Lcom/google/android/gms/nearby/messages/SubscribeOptions;)Lcom/google/android/gms/tasks/Task; +- +- :cond_0 + return-void + .end method + +--- 463,470 ---- + + # virtual methods + .method public final activateNearby()V +! .locals 0 + + return-void + .end method + +*************** +*** 599,618 **** + .end method + + .method public final initialize(J)V +! .locals 1 +! +! .line 1 +! invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; +! +! move-result-object v0 +! +! iput-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->meUserId:Ljava/lang/Long; +! +! .line 2 +! invoke-direct {p0, p1, p2}, Lcom/discord/widgets/friends/NearbyManager;->setupBroadcaster(J)V +! +! .line 3 +! invoke-direct {p0}, Lcom/discord/widgets/friends/NearbyManager;->setupListener()V + + return-void + .end method +--- 552,558 ---- + .end method + + .method public final initialize(J)V +! .locals 0 + + return-void + .end method diff --git a/old-patches/nonearby/1361.patch b/old-patches/nonearby/1361.patch new file mode 100644 index 0000000..53ae69a --- /dev/null +++ b/old-patches/nonearby/1361.patch @@ -0,0 +1,99 @@ +diff -crB from/smali/com/discord/widgets/friends/NearbyManager.smali to/smali/com/discord/widgets/friends/NearbyManager.smali +*** from/smali/com/discord/widgets/friends/NearbyManager.smali 2020-11-16 13:22:49.797198145 +0000 +--- to/smali/com/discord/widgets/friends/NearbyManager.smali 2020-11-16 13:33:15.674833097 +0000 +*************** +*** 463,517 **** + + # virtual methods + .method public final activateNearby()V +! .locals 9 + +- .line 1 +- iget-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->messagesClient:Lcom/google/android/gms/nearby/messages/MessagesClient; +- +- if-eqz v0, :cond_0 +- +- .line 2 +- iget-object v1, p0, Lcom/discord/widgets/friends/NearbyManager;->outboundMessage:Lcom/google/android/gms/nearby/messages/Message; +- +- if-eqz v1, :cond_0 +- +- .line 3 +- iget-object v2, p0, Lcom/discord/widgets/friends/NearbyManager;->messagePublishOptions:Lcom/google/android/gms/nearby/messages/PublishOptions; +- +- if-eqz v2, :cond_0 +- +- .line 4 +- iget-object v3, p0, Lcom/discord/widgets/friends/NearbyManager;->messageListener:Lcom/google/android/gms/nearby/messages/MessageListener; +- +- if-eqz v3, :cond_0 +- +- .line 5 +- iget-object v4, p0, Lcom/discord/widgets/friends/NearbyManager;->subscribeOptions:Lcom/google/android/gms/nearby/messages/SubscribeOptions; +- +- if-eqz v4, :cond_0 +- +- .line 6 +- iget-object v5, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyStateSubject:Lrx/subjects/BehaviorSubject; +- +- new-instance v6, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected; +- +- new-instance v7, Ljava/util/HashSet; +- +- iget-object v8, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyUserIds:Ljava/util/HashSet; +- +- invoke-direct {v7, v8}, Ljava/util/HashSet;->(Ljava/util/Collection;)V +- +- invoke-direct {v6, v7}, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected;->(Ljava/util/Set;)V +- +- invoke-virtual {v5, v6}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V +- +- .line 7 +- invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/nearby/messages/MessagesClient;->f(Lcom/google/android/gms/nearby/messages/Message;Lcom/google/android/gms/nearby/messages/PublishOptions;)Lcom/google/android/gms/tasks/Task; +- +- .line 8 +- invoke-virtual {v0, v3, v4}, Lcom/google/android/gms/nearby/messages/MessagesClient;->g(Lcom/google/android/gms/nearby/messages/MessageListener;Lcom/google/android/gms/nearby/messages/SubscribeOptions;)Lcom/google/android/gms/tasks/Task; +- +- :cond_0 + return-void + .end method + +--- 463,470 ---- + + # virtual methods + .method public final activateNearby()V +! .locals 0 + + return-void + .end method + +*************** +*** 599,618 **** + .end method + + .method public final initialize(J)V +! .locals 1 +! +! .line 1 +! invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; +! +! move-result-object v0 +! +! iput-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->meUserId:Ljava/lang/Long; +! +! .line 2 +! invoke-direct {p0, p1, p2}, Lcom/discord/widgets/friends/NearbyManager;->setupBroadcaster(J)V +! +! .line 3 +! invoke-direct {p0}, Lcom/discord/widgets/friends/NearbyManager;->setupListener()V + + return-void + .end method +--- 552,558 ---- + .end method + + .method public final initialize(J)V +! .locals 0 + + return-void + .end method diff --git a/old-patches/nonearby/1362.patch b/old-patches/nonearby/1362.patch new file mode 100644 index 0000000..53ae69a --- /dev/null +++ b/old-patches/nonearby/1362.patch @@ -0,0 +1,99 @@ +diff -crB from/smali/com/discord/widgets/friends/NearbyManager.smali to/smali/com/discord/widgets/friends/NearbyManager.smali +*** from/smali/com/discord/widgets/friends/NearbyManager.smali 2020-11-16 13:22:49.797198145 +0000 +--- to/smali/com/discord/widgets/friends/NearbyManager.smali 2020-11-16 13:33:15.674833097 +0000 +*************** +*** 463,517 **** + + # virtual methods + .method public final activateNearby()V +! .locals 9 + +- .line 1 +- iget-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->messagesClient:Lcom/google/android/gms/nearby/messages/MessagesClient; +- +- if-eqz v0, :cond_0 +- +- .line 2 +- iget-object v1, p0, Lcom/discord/widgets/friends/NearbyManager;->outboundMessage:Lcom/google/android/gms/nearby/messages/Message; +- +- if-eqz v1, :cond_0 +- +- .line 3 +- iget-object v2, p0, Lcom/discord/widgets/friends/NearbyManager;->messagePublishOptions:Lcom/google/android/gms/nearby/messages/PublishOptions; +- +- if-eqz v2, :cond_0 +- +- .line 4 +- iget-object v3, p0, Lcom/discord/widgets/friends/NearbyManager;->messageListener:Lcom/google/android/gms/nearby/messages/MessageListener; +- +- if-eqz v3, :cond_0 +- +- .line 5 +- iget-object v4, p0, Lcom/discord/widgets/friends/NearbyManager;->subscribeOptions:Lcom/google/android/gms/nearby/messages/SubscribeOptions; +- +- if-eqz v4, :cond_0 +- +- .line 6 +- iget-object v5, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyStateSubject:Lrx/subjects/BehaviorSubject; +- +- new-instance v6, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected; +- +- new-instance v7, Ljava/util/HashSet; +- +- iget-object v8, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyUserIds:Ljava/util/HashSet; +- +- invoke-direct {v7, v8}, Ljava/util/HashSet;->(Ljava/util/Collection;)V +- +- invoke-direct {v6, v7}, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected;->(Ljava/util/Set;)V +- +- invoke-virtual {v5, v6}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V +- +- .line 7 +- invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/nearby/messages/MessagesClient;->f(Lcom/google/android/gms/nearby/messages/Message;Lcom/google/android/gms/nearby/messages/PublishOptions;)Lcom/google/android/gms/tasks/Task; +- +- .line 8 +- invoke-virtual {v0, v3, v4}, Lcom/google/android/gms/nearby/messages/MessagesClient;->g(Lcom/google/android/gms/nearby/messages/MessageListener;Lcom/google/android/gms/nearby/messages/SubscribeOptions;)Lcom/google/android/gms/tasks/Task; +- +- :cond_0 + return-void + .end method + +--- 463,470 ---- + + # virtual methods + .method public final activateNearby()V +! .locals 0 + + return-void + .end method + +*************** +*** 599,618 **** + .end method + + .method public final initialize(J)V +! .locals 1 +! +! .line 1 +! invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; +! +! move-result-object v0 +! +! iput-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->meUserId:Ljava/lang/Long; +! +! .line 2 +! invoke-direct {p0, p1, p2}, Lcom/discord/widgets/friends/NearbyManager;->setupBroadcaster(J)V +! +! .line 3 +! invoke-direct {p0}, Lcom/discord/widgets/friends/NearbyManager;->setupListener()V + + return-void + .end method +--- 552,558 ---- + .end method + + .method public final initialize(J)V +! .locals 0 + + return-void + .end method diff --git a/old-patches/nonearby/1365.patch b/old-patches/nonearby/1365.patch new file mode 100644 index 0000000..53ae69a --- /dev/null +++ b/old-patches/nonearby/1365.patch @@ -0,0 +1,99 @@ +diff -crB from/smali/com/discord/widgets/friends/NearbyManager.smali to/smali/com/discord/widgets/friends/NearbyManager.smali +*** from/smali/com/discord/widgets/friends/NearbyManager.smali 2020-11-16 13:22:49.797198145 +0000 +--- to/smali/com/discord/widgets/friends/NearbyManager.smali 2020-11-16 13:33:15.674833097 +0000 +*************** +*** 463,517 **** + + # virtual methods + .method public final activateNearby()V +! .locals 9 + +- .line 1 +- iget-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->messagesClient:Lcom/google/android/gms/nearby/messages/MessagesClient; +- +- if-eqz v0, :cond_0 +- +- .line 2 +- iget-object v1, p0, Lcom/discord/widgets/friends/NearbyManager;->outboundMessage:Lcom/google/android/gms/nearby/messages/Message; +- +- if-eqz v1, :cond_0 +- +- .line 3 +- iget-object v2, p0, Lcom/discord/widgets/friends/NearbyManager;->messagePublishOptions:Lcom/google/android/gms/nearby/messages/PublishOptions; +- +- if-eqz v2, :cond_0 +- +- .line 4 +- iget-object v3, p0, Lcom/discord/widgets/friends/NearbyManager;->messageListener:Lcom/google/android/gms/nearby/messages/MessageListener; +- +- if-eqz v3, :cond_0 +- +- .line 5 +- iget-object v4, p0, Lcom/discord/widgets/friends/NearbyManager;->subscribeOptions:Lcom/google/android/gms/nearby/messages/SubscribeOptions; +- +- if-eqz v4, :cond_0 +- +- .line 6 +- iget-object v5, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyStateSubject:Lrx/subjects/BehaviorSubject; +- +- new-instance v6, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected; +- +- new-instance v7, Ljava/util/HashSet; +- +- iget-object v8, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyUserIds:Ljava/util/HashSet; +- +- invoke-direct {v7, v8}, Ljava/util/HashSet;->(Ljava/util/Collection;)V +- +- invoke-direct {v6, v7}, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected;->(Ljava/util/Set;)V +- +- invoke-virtual {v5, v6}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V +- +- .line 7 +- invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/nearby/messages/MessagesClient;->f(Lcom/google/android/gms/nearby/messages/Message;Lcom/google/android/gms/nearby/messages/PublishOptions;)Lcom/google/android/gms/tasks/Task; +- +- .line 8 +- invoke-virtual {v0, v3, v4}, Lcom/google/android/gms/nearby/messages/MessagesClient;->g(Lcom/google/android/gms/nearby/messages/MessageListener;Lcom/google/android/gms/nearby/messages/SubscribeOptions;)Lcom/google/android/gms/tasks/Task; +- +- :cond_0 + return-void + .end method + +--- 463,470 ---- + + # virtual methods + .method public final activateNearby()V +! .locals 0 + + return-void + .end method + +*************** +*** 599,618 **** + .end method + + .method public final initialize(J)V +! .locals 1 +! +! .line 1 +! invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; +! +! move-result-object v0 +! +! iput-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->meUserId:Ljava/lang/Long; +! +! .line 2 +! invoke-direct {p0, p1, p2}, Lcom/discord/widgets/friends/NearbyManager;->setupBroadcaster(J)V +! +! .line 3 +! invoke-direct {p0}, Lcom/discord/widgets/friends/NearbyManager;->setupListener()V + + return-void + .end method +--- 552,558 ---- + .end method + + .method public final initialize(J)V +! .locals 0 + + return-void + .end method diff --git a/old-patches/nonearby/1367.patch b/old-patches/nonearby/1367.patch new file mode 100644 index 0000000..53ae69a --- /dev/null +++ b/old-patches/nonearby/1367.patch @@ -0,0 +1,99 @@ +diff -crB from/smali/com/discord/widgets/friends/NearbyManager.smali to/smali/com/discord/widgets/friends/NearbyManager.smali +*** from/smali/com/discord/widgets/friends/NearbyManager.smali 2020-11-16 13:22:49.797198145 +0000 +--- to/smali/com/discord/widgets/friends/NearbyManager.smali 2020-11-16 13:33:15.674833097 +0000 +*************** +*** 463,517 **** + + # virtual methods + .method public final activateNearby()V +! .locals 9 + +- .line 1 +- iget-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->messagesClient:Lcom/google/android/gms/nearby/messages/MessagesClient; +- +- if-eqz v0, :cond_0 +- +- .line 2 +- iget-object v1, p0, Lcom/discord/widgets/friends/NearbyManager;->outboundMessage:Lcom/google/android/gms/nearby/messages/Message; +- +- if-eqz v1, :cond_0 +- +- .line 3 +- iget-object v2, p0, Lcom/discord/widgets/friends/NearbyManager;->messagePublishOptions:Lcom/google/android/gms/nearby/messages/PublishOptions; +- +- if-eqz v2, :cond_0 +- +- .line 4 +- iget-object v3, p0, Lcom/discord/widgets/friends/NearbyManager;->messageListener:Lcom/google/android/gms/nearby/messages/MessageListener; +- +- if-eqz v3, :cond_0 +- +- .line 5 +- iget-object v4, p0, Lcom/discord/widgets/friends/NearbyManager;->subscribeOptions:Lcom/google/android/gms/nearby/messages/SubscribeOptions; +- +- if-eqz v4, :cond_0 +- +- .line 6 +- iget-object v5, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyStateSubject:Lrx/subjects/BehaviorSubject; +- +- new-instance v6, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected; +- +- new-instance v7, Ljava/util/HashSet; +- +- iget-object v8, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyUserIds:Ljava/util/HashSet; +- +- invoke-direct {v7, v8}, Ljava/util/HashSet;->(Ljava/util/Collection;)V +- +- invoke-direct {v6, v7}, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected;->(Ljava/util/Set;)V +- +- invoke-virtual {v5, v6}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V +- +- .line 7 +- invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/nearby/messages/MessagesClient;->f(Lcom/google/android/gms/nearby/messages/Message;Lcom/google/android/gms/nearby/messages/PublishOptions;)Lcom/google/android/gms/tasks/Task; +- +- .line 8 +- invoke-virtual {v0, v3, v4}, Lcom/google/android/gms/nearby/messages/MessagesClient;->g(Lcom/google/android/gms/nearby/messages/MessageListener;Lcom/google/android/gms/nearby/messages/SubscribeOptions;)Lcom/google/android/gms/tasks/Task; +- +- :cond_0 + return-void + .end method + +--- 463,470 ---- + + # virtual methods + .method public final activateNearby()V +! .locals 0 + + return-void + .end method + +*************** +*** 599,618 **** + .end method + + .method public final initialize(J)V +! .locals 1 +! +! .line 1 +! invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; +! +! move-result-object v0 +! +! iput-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->meUserId:Ljava/lang/Long; +! +! .line 2 +! invoke-direct {p0, p1, p2}, Lcom/discord/widgets/friends/NearbyManager;->setupBroadcaster(J)V +! +! .line 3 +! invoke-direct {p0}, Lcom/discord/widgets/friends/NearbyManager;->setupListener()V + + return-void + .end method +--- 552,558 ---- + .end method + + .method public final initialize(J)V +! .locals 0 + + return-void + .end method diff --git a/old-patches/nonearby/1368.patch b/old-patches/nonearby/1368.patch new file mode 100644 index 0000000..53ae69a --- /dev/null +++ b/old-patches/nonearby/1368.patch @@ -0,0 +1,99 @@ +diff -crB from/smali/com/discord/widgets/friends/NearbyManager.smali to/smali/com/discord/widgets/friends/NearbyManager.smali +*** from/smali/com/discord/widgets/friends/NearbyManager.smali 2020-11-16 13:22:49.797198145 +0000 +--- to/smali/com/discord/widgets/friends/NearbyManager.smali 2020-11-16 13:33:15.674833097 +0000 +*************** +*** 463,517 **** + + # virtual methods + .method public final activateNearby()V +! .locals 9 + +- .line 1 +- iget-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->messagesClient:Lcom/google/android/gms/nearby/messages/MessagesClient; +- +- if-eqz v0, :cond_0 +- +- .line 2 +- iget-object v1, p0, Lcom/discord/widgets/friends/NearbyManager;->outboundMessage:Lcom/google/android/gms/nearby/messages/Message; +- +- if-eqz v1, :cond_0 +- +- .line 3 +- iget-object v2, p0, Lcom/discord/widgets/friends/NearbyManager;->messagePublishOptions:Lcom/google/android/gms/nearby/messages/PublishOptions; +- +- if-eqz v2, :cond_0 +- +- .line 4 +- iget-object v3, p0, Lcom/discord/widgets/friends/NearbyManager;->messageListener:Lcom/google/android/gms/nearby/messages/MessageListener; +- +- if-eqz v3, :cond_0 +- +- .line 5 +- iget-object v4, p0, Lcom/discord/widgets/friends/NearbyManager;->subscribeOptions:Lcom/google/android/gms/nearby/messages/SubscribeOptions; +- +- if-eqz v4, :cond_0 +- +- .line 6 +- iget-object v5, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyStateSubject:Lrx/subjects/BehaviorSubject; +- +- new-instance v6, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected; +- +- new-instance v7, Ljava/util/HashSet; +- +- iget-object v8, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyUserIds:Ljava/util/HashSet; +- +- invoke-direct {v7, v8}, Ljava/util/HashSet;->(Ljava/util/Collection;)V +- +- invoke-direct {v6, v7}, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected;->(Ljava/util/Set;)V +- +- invoke-virtual {v5, v6}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V +- +- .line 7 +- invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/nearby/messages/MessagesClient;->f(Lcom/google/android/gms/nearby/messages/Message;Lcom/google/android/gms/nearby/messages/PublishOptions;)Lcom/google/android/gms/tasks/Task; +- +- .line 8 +- invoke-virtual {v0, v3, v4}, Lcom/google/android/gms/nearby/messages/MessagesClient;->g(Lcom/google/android/gms/nearby/messages/MessageListener;Lcom/google/android/gms/nearby/messages/SubscribeOptions;)Lcom/google/android/gms/tasks/Task; +- +- :cond_0 + return-void + .end method + +--- 463,470 ---- + + # virtual methods + .method public final activateNearby()V +! .locals 0 + + return-void + .end method + +*************** +*** 599,618 **** + .end method + + .method public final initialize(J)V +! .locals 1 +! +! .line 1 +! invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; +! +! move-result-object v0 +! +! iput-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->meUserId:Ljava/lang/Long; +! +! .line 2 +! invoke-direct {p0, p1, p2}, Lcom/discord/widgets/friends/NearbyManager;->setupBroadcaster(J)V +! +! .line 3 +! invoke-direct {p0}, Lcom/discord/widgets/friends/NearbyManager;->setupListener()V + + return-void + .end method +--- 552,558 ---- + .end method + + .method public final initialize(J)V +! .locals 0 + + return-void + .end method diff --git a/old-patches/nonearby/1370.patch b/old-patches/nonearby/1370.patch new file mode 100644 index 0000000..53ae69a --- /dev/null +++ b/old-patches/nonearby/1370.patch @@ -0,0 +1,99 @@ +diff -crB from/smali/com/discord/widgets/friends/NearbyManager.smali to/smali/com/discord/widgets/friends/NearbyManager.smali +*** from/smali/com/discord/widgets/friends/NearbyManager.smali 2020-11-16 13:22:49.797198145 +0000 +--- to/smali/com/discord/widgets/friends/NearbyManager.smali 2020-11-16 13:33:15.674833097 +0000 +*************** +*** 463,517 **** + + # virtual methods + .method public final activateNearby()V +! .locals 9 + +- .line 1 +- iget-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->messagesClient:Lcom/google/android/gms/nearby/messages/MessagesClient; +- +- if-eqz v0, :cond_0 +- +- .line 2 +- iget-object v1, p0, Lcom/discord/widgets/friends/NearbyManager;->outboundMessage:Lcom/google/android/gms/nearby/messages/Message; +- +- if-eqz v1, :cond_0 +- +- .line 3 +- iget-object v2, p0, Lcom/discord/widgets/friends/NearbyManager;->messagePublishOptions:Lcom/google/android/gms/nearby/messages/PublishOptions; +- +- if-eqz v2, :cond_0 +- +- .line 4 +- iget-object v3, p0, Lcom/discord/widgets/friends/NearbyManager;->messageListener:Lcom/google/android/gms/nearby/messages/MessageListener; +- +- if-eqz v3, :cond_0 +- +- .line 5 +- iget-object v4, p0, Lcom/discord/widgets/friends/NearbyManager;->subscribeOptions:Lcom/google/android/gms/nearby/messages/SubscribeOptions; +- +- if-eqz v4, :cond_0 +- +- .line 6 +- iget-object v5, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyStateSubject:Lrx/subjects/BehaviorSubject; +- +- new-instance v6, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected; +- +- new-instance v7, Ljava/util/HashSet; +- +- iget-object v8, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyUserIds:Ljava/util/HashSet; +- +- invoke-direct {v7, v8}, Ljava/util/HashSet;->(Ljava/util/Collection;)V +- +- invoke-direct {v6, v7}, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected;->(Ljava/util/Set;)V +- +- invoke-virtual {v5, v6}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V +- +- .line 7 +- invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/nearby/messages/MessagesClient;->f(Lcom/google/android/gms/nearby/messages/Message;Lcom/google/android/gms/nearby/messages/PublishOptions;)Lcom/google/android/gms/tasks/Task; +- +- .line 8 +- invoke-virtual {v0, v3, v4}, Lcom/google/android/gms/nearby/messages/MessagesClient;->g(Lcom/google/android/gms/nearby/messages/MessageListener;Lcom/google/android/gms/nearby/messages/SubscribeOptions;)Lcom/google/android/gms/tasks/Task; +- +- :cond_0 + return-void + .end method + +--- 463,470 ---- + + # virtual methods + .method public final activateNearby()V +! .locals 0 + + return-void + .end method + +*************** +*** 599,618 **** + .end method + + .method public final initialize(J)V +! .locals 1 +! +! .line 1 +! invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; +! +! move-result-object v0 +! +! iput-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->meUserId:Ljava/lang/Long; +! +! .line 2 +! invoke-direct {p0, p1, p2}, Lcom/discord/widgets/friends/NearbyManager;->setupBroadcaster(J)V +! +! .line 3 +! invoke-direct {p0}, Lcom/discord/widgets/friends/NearbyManager;->setupListener()V + + return-void + .end method +--- 552,558 ---- + .end method + + .method public final initialize(J)V +! .locals 0 + + return-void + .end method diff --git a/old-patches/nonearby/1371.patch b/old-patches/nonearby/1371.patch new file mode 100644 index 0000000..53ae69a --- /dev/null +++ b/old-patches/nonearby/1371.patch @@ -0,0 +1,99 @@ +diff -crB from/smali/com/discord/widgets/friends/NearbyManager.smali to/smali/com/discord/widgets/friends/NearbyManager.smali +*** from/smali/com/discord/widgets/friends/NearbyManager.smali 2020-11-16 13:22:49.797198145 +0000 +--- to/smali/com/discord/widgets/friends/NearbyManager.smali 2020-11-16 13:33:15.674833097 +0000 +*************** +*** 463,517 **** + + # virtual methods + .method public final activateNearby()V +! .locals 9 + +- .line 1 +- iget-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->messagesClient:Lcom/google/android/gms/nearby/messages/MessagesClient; +- +- if-eqz v0, :cond_0 +- +- .line 2 +- iget-object v1, p0, Lcom/discord/widgets/friends/NearbyManager;->outboundMessage:Lcom/google/android/gms/nearby/messages/Message; +- +- if-eqz v1, :cond_0 +- +- .line 3 +- iget-object v2, p0, Lcom/discord/widgets/friends/NearbyManager;->messagePublishOptions:Lcom/google/android/gms/nearby/messages/PublishOptions; +- +- if-eqz v2, :cond_0 +- +- .line 4 +- iget-object v3, p0, Lcom/discord/widgets/friends/NearbyManager;->messageListener:Lcom/google/android/gms/nearby/messages/MessageListener; +- +- if-eqz v3, :cond_0 +- +- .line 5 +- iget-object v4, p0, Lcom/discord/widgets/friends/NearbyManager;->subscribeOptions:Lcom/google/android/gms/nearby/messages/SubscribeOptions; +- +- if-eqz v4, :cond_0 +- +- .line 6 +- iget-object v5, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyStateSubject:Lrx/subjects/BehaviorSubject; +- +- new-instance v6, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected; +- +- new-instance v7, Ljava/util/HashSet; +- +- iget-object v8, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyUserIds:Ljava/util/HashSet; +- +- invoke-direct {v7, v8}, Ljava/util/HashSet;->(Ljava/util/Collection;)V +- +- invoke-direct {v6, v7}, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected;->(Ljava/util/Set;)V +- +- invoke-virtual {v5, v6}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V +- +- .line 7 +- invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/nearby/messages/MessagesClient;->f(Lcom/google/android/gms/nearby/messages/Message;Lcom/google/android/gms/nearby/messages/PublishOptions;)Lcom/google/android/gms/tasks/Task; +- +- .line 8 +- invoke-virtual {v0, v3, v4}, Lcom/google/android/gms/nearby/messages/MessagesClient;->g(Lcom/google/android/gms/nearby/messages/MessageListener;Lcom/google/android/gms/nearby/messages/SubscribeOptions;)Lcom/google/android/gms/tasks/Task; +- +- :cond_0 + return-void + .end method + +--- 463,470 ---- + + # virtual methods + .method public final activateNearby()V +! .locals 0 + + return-void + .end method + +*************** +*** 599,618 **** + .end method + + .method public final initialize(J)V +! .locals 1 +! +! .line 1 +! invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; +! +! move-result-object v0 +! +! iput-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->meUserId:Ljava/lang/Long; +! +! .line 2 +! invoke-direct {p0, p1, p2}, Lcom/discord/widgets/friends/NearbyManager;->setupBroadcaster(J)V +! +! .line 3 +! invoke-direct {p0}, Lcom/discord/widgets/friends/NearbyManager;->setupListener()V + + return-void + .end method +--- 552,558 ---- + .end method + + .method public final initialize(J)V +! .locals 0 + + return-void + .end method diff --git a/old-patches/nonearby/78204.patch-failed b/old-patches/nonearby/78204.patch-failed new file mode 100644 index 0000000..53ae69a --- /dev/null +++ b/old-patches/nonearby/78204.patch-failed @@ -0,0 +1,99 @@ +diff -crB from/smali/com/discord/widgets/friends/NearbyManager.smali to/smali/com/discord/widgets/friends/NearbyManager.smali +*** from/smali/com/discord/widgets/friends/NearbyManager.smali 2020-11-16 13:22:49.797198145 +0000 +--- to/smali/com/discord/widgets/friends/NearbyManager.smali 2020-11-16 13:33:15.674833097 +0000 +*************** +*** 463,517 **** + + # virtual methods + .method public final activateNearby()V +! .locals 9 + +- .line 1 +- iget-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->messagesClient:Lcom/google/android/gms/nearby/messages/MessagesClient; +- +- if-eqz v0, :cond_0 +- +- .line 2 +- iget-object v1, p0, Lcom/discord/widgets/friends/NearbyManager;->outboundMessage:Lcom/google/android/gms/nearby/messages/Message; +- +- if-eqz v1, :cond_0 +- +- .line 3 +- iget-object v2, p0, Lcom/discord/widgets/friends/NearbyManager;->messagePublishOptions:Lcom/google/android/gms/nearby/messages/PublishOptions; +- +- if-eqz v2, :cond_0 +- +- .line 4 +- iget-object v3, p0, Lcom/discord/widgets/friends/NearbyManager;->messageListener:Lcom/google/android/gms/nearby/messages/MessageListener; +- +- if-eqz v3, :cond_0 +- +- .line 5 +- iget-object v4, p0, Lcom/discord/widgets/friends/NearbyManager;->subscribeOptions:Lcom/google/android/gms/nearby/messages/SubscribeOptions; +- +- if-eqz v4, :cond_0 +- +- .line 6 +- iget-object v5, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyStateSubject:Lrx/subjects/BehaviorSubject; +- +- new-instance v6, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected; +- +- new-instance v7, Ljava/util/HashSet; +- +- iget-object v8, p0, Lcom/discord/widgets/friends/NearbyManager;->nearbyUserIds:Ljava/util/HashSet; +- +- invoke-direct {v7, v8}, Ljava/util/HashSet;->(Ljava/util/Collection;)V +- +- invoke-direct {v6, v7}, Lcom/discord/widgets/friends/NearbyManager$NearbyState$Connected;->(Ljava/util/Set;)V +- +- invoke-virtual {v5, v6}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V +- +- .line 7 +- invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/nearby/messages/MessagesClient;->f(Lcom/google/android/gms/nearby/messages/Message;Lcom/google/android/gms/nearby/messages/PublishOptions;)Lcom/google/android/gms/tasks/Task; +- +- .line 8 +- invoke-virtual {v0, v3, v4}, Lcom/google/android/gms/nearby/messages/MessagesClient;->g(Lcom/google/android/gms/nearby/messages/MessageListener;Lcom/google/android/gms/nearby/messages/SubscribeOptions;)Lcom/google/android/gms/tasks/Task; +- +- :cond_0 + return-void + .end method + +--- 463,470 ---- + + # virtual methods + .method public final activateNearby()V +! .locals 0 + + return-void + .end method + +*************** +*** 599,618 **** + .end method + + .method public final initialize(J)V +! .locals 1 +! +! .line 1 +! invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; +! +! move-result-object v0 +! +! iput-object v0, p0, Lcom/discord/widgets/friends/NearbyManager;->meUserId:Ljava/lang/Long; +! +! .line 2 +! invoke-direct {p0, p1, p2}, Lcom/discord/widgets/friends/NearbyManager;->setupBroadcaster(J)V +! +! .line 3 +! invoke-direct {p0}, Lcom/discord/widgets/friends/NearbyManager;->setupListener()V + + return-void + .end method +--- 552,558 ---- + .end method + + .method public final initialize(J)V +! .locals 0 + + return-void + .end method diff --git a/patches/nonearby/832.patch b/old-patches/nonearby/832.patch similarity index 100% rename from patches/nonearby/832.patch rename to old-patches/nonearby/832.patch diff --git a/patches/nonearby/833.patch b/old-patches/nonearby/833.patch similarity index 100% rename from patches/nonearby/833.patch rename to old-patches/nonearby/833.patch diff --git a/patches/nonearby/834.patch b/old-patches/nonearby/834.patch similarity index 100% rename from patches/nonearby/834.patch rename to old-patches/nonearby/834.patch diff --git a/patches/nonearby/835.patch b/old-patches/nonearby/835.patch similarity index 100% rename from patches/nonearby/835.patch rename to old-patches/nonearby/835.patch diff --git a/patches/nonearby/836.patch b/old-patches/nonearby/836.patch similarity index 100% rename from patches/nonearby/836.patch rename to old-patches/nonearby/836.patch diff --git a/patches/nonearby/839.patch b/old-patches/nonearby/839.patch similarity index 100% rename from patches/nonearby/839.patch rename to old-patches/nonearby/839.patch diff --git a/patches/nonearby/841.patch b/old-patches/nonearby/841.patch similarity index 100% rename from patches/nonearby/841.patch rename to old-patches/nonearby/841.patch diff --git a/patches/nonearby/842.patch b/old-patches/nonearby/842.patch similarity index 100% rename from patches/nonearby/842.patch rename to old-patches/nonearby/842.patch diff --git a/patches/nonearby/843.patch b/old-patches/nonearby/843.patch similarity index 100% rename from patches/nonearby/843.patch rename to old-patches/nonearby/843.patch diff --git a/patches/nonearby/844.patch b/old-patches/nonearby/844.patch similarity index 100% rename from patches/nonearby/844.patch rename to old-patches/nonearby/844.patch diff --git a/patches/nonearby/845.patch b/old-patches/nonearby/845.patch similarity index 100% rename from patches/nonearby/845.patch rename to old-patches/nonearby/845.patch diff --git a/patches/nonearby/848.patch b/old-patches/nonearby/848.patch similarity index 100% rename from patches/nonearby/848.patch rename to old-patches/nonearby/848.patch diff --git a/patches/nonearby/850.patch b/old-patches/nonearby/850.patch similarity index 100% rename from patches/nonearby/850.patch rename to old-patches/nonearby/850.patch diff --git a/patches/nonearby/851.patch b/old-patches/nonearby/851.patch similarity index 100% rename from patches/nonearby/851.patch rename to old-patches/nonearby/851.patch diff --git a/patches/nonearby/853.patch b/old-patches/nonearby/853.patch similarity index 100% rename from patches/nonearby/853.patch rename to old-patches/nonearby/853.patch diff --git a/patches/nonearby/854.patch b/old-patches/nonearby/854.patch similarity index 100% rename from patches/nonearby/854.patch rename to old-patches/nonearby/854.patch diff --git a/patches/nonearby/855.patch b/old-patches/nonearby/855.patch similarity index 100% rename from patches/nonearby/855.patch rename to old-patches/nonearby/855.patch diff --git a/patches/nonearby/856.patch b/old-patches/nonearby/856.patch similarity index 100% rename from patches/nonearby/856.patch rename to old-patches/nonearby/856.patch diff --git a/patches/nonearby/876.patch b/old-patches/nonearby/876.patch similarity index 100% rename from patches/nonearby/876.patch rename to old-patches/nonearby/876.patch diff --git a/patches/nonearby/884.patch b/old-patches/nonearby/884.patch similarity index 100% rename from patches/nonearby/884.patch rename to old-patches/nonearby/884.patch diff --git a/patches/nonearby/888.patch b/old-patches/nonearby/888.patch similarity index 100% rename from patches/nonearby/888.patch rename to old-patches/nonearby/888.patch diff --git a/patches/nonearby/896.patch b/old-patches/nonearby/896.patch similarity index 100% rename from patches/nonearby/896.patch rename to old-patches/nonearby/896.patch diff --git a/patches/nonearby/897.patch b/old-patches/nonearby/897.patch similarity index 100% rename from patches/nonearby/897.patch rename to old-patches/nonearby/897.patch diff --git a/patches/nonearby/898.patch b/old-patches/nonearby/898.patch similarity index 100% rename from patches/nonearby/898.patch rename to old-patches/nonearby/898.patch diff --git a/patches/nonearby/899.patch b/old-patches/nonearby/899.patch similarity index 100% rename from patches/nonearby/899.patch rename to old-patches/nonearby/899.patch diff --git a/patches/nonearby/900.patch b/old-patches/nonearby/900.patch similarity index 100% rename from patches/nonearby/900.patch rename to old-patches/nonearby/900.patch diff --git a/patches/nonearby/901.patch b/old-patches/nonearby/901.patch similarity index 100% rename from patches/nonearby/901.patch rename to old-patches/nonearby/901.patch diff --git a/patches/nonearby/902.patch b/old-patches/nonearby/902.patch similarity index 100% rename from patches/nonearby/902.patch rename to old-patches/nonearby/902.patch diff --git a/patches/nonearby/903.patch b/old-patches/nonearby/903.patch similarity index 100% rename from patches/nonearby/903.patch rename to old-patches/nonearby/903.patch diff --git a/patches/nonearby/904.patch b/old-patches/nonearby/904.patch similarity index 100% rename from patches/nonearby/904.patch rename to old-patches/nonearby/904.patch diff --git a/patches/nonearby/906.patch b/old-patches/nonearby/906.patch similarity index 100% rename from patches/nonearby/906.patch rename to old-patches/nonearby/906.patch diff --git a/patches/nonearby/909.patch b/old-patches/nonearby/909.patch similarity index 100% rename from patches/nonearby/909.patch rename to old-patches/nonearby/909.patch diff --git a/patches/nonearby/910.patch b/old-patches/nonearby/910.patch similarity index 100% rename from patches/nonearby/910.patch rename to old-patches/nonearby/910.patch diff --git a/patches/nonearby/938.patch b/old-patches/nonearby/938.patch similarity index 100% rename from patches/nonearby/938.patch rename to old-patches/nonearby/938.patch diff --git a/patches/nonearby/939.patch b/old-patches/nonearby/939.patch similarity index 100% rename from patches/nonearby/939.patch rename to old-patches/nonearby/939.patch diff --git a/patches/nonearby/940.patch b/old-patches/nonearby/940.patch similarity index 100% rename from patches/nonearby/940.patch rename to old-patches/nonearby/940.patch diff --git a/patches/nonearby/942.patch b/old-patches/nonearby/942.patch similarity index 100% rename from patches/nonearby/942.patch rename to old-patches/nonearby/942.patch diff --git a/patches/nonearby/943.patch b/old-patches/nonearby/943.patch similarity index 100% rename from patches/nonearby/943.patch rename to old-patches/nonearby/943.patch diff --git a/patches/nonearby/945.patch b/old-patches/nonearby/945.patch similarity index 100% rename from patches/nonearby/945.patch rename to old-patches/nonearby/945.patch diff --git a/patches/nonearby/946.patch b/old-patches/nonearby/946.patch similarity index 100% rename from patches/nonearby/946.patch rename to old-patches/nonearby/946.patch diff --git a/patches/nonearby/947.patch b/old-patches/nonearby/947.patch similarity index 100% rename from patches/nonearby/947.patch rename to old-patches/nonearby/947.patch diff --git a/patches/nonearby/948.patch b/old-patches/nonearby/948.patch similarity index 100% rename from patches/nonearby/948.patch rename to old-patches/nonearby/948.patch diff --git a/patches/nonearby/963.patch b/old-patches/nonearby/963.patch similarity index 100% rename from patches/nonearby/963.patch rename to old-patches/nonearby/963.patch diff --git a/patches/nonearby/964.patch b/old-patches/nonearby/964.patch similarity index 100% rename from patches/nonearby/964.patch rename to old-patches/nonearby/964.patch diff --git a/patches/nonearby/965.patch b/old-patches/nonearby/965.patch similarity index 100% rename from patches/nonearby/965.patch rename to old-patches/nonearby/965.patch diff --git a/patches/nonearby/966.patch b/old-patches/nonearby/966.patch similarity index 100% rename from patches/nonearby/966.patch rename to old-patches/nonearby/966.patch diff --git a/patches/nonearby/967.patch b/old-patches/nonearby/967.patch similarity index 100% rename from patches/nonearby/967.patch rename to old-patches/nonearby/967.patch diff --git a/patches/nonearby/968.patch b/old-patches/nonearby/968.patch similarity index 100% rename from patches/nonearby/968.patch rename to old-patches/nonearby/968.patch diff --git a/patches/nonearby/970.patch b/old-patches/nonearby/970.patch similarity index 100% rename from patches/nonearby/970.patch rename to old-patches/nonearby/970.patch diff --git a/patches/nonearby/980.patch b/old-patches/nonearby/980.patch similarity index 100% rename from patches/nonearby/980.patch rename to old-patches/nonearby/980.patch diff --git a/patches/nonearby/984.patch b/old-patches/nonearby/984.patch similarity index 100% rename from patches/nonearby/984.patch rename to old-patches/nonearby/984.patch diff --git a/patches/nonearby/986.patch b/old-patches/nonearby/986.patch similarity index 100% rename from patches/nonearby/986.patch rename to old-patches/nonearby/986.patch diff --git a/patches/nonearby/991.patch b/old-patches/nonearby/991.patch similarity index 100% rename from patches/nonearby/991.patch rename to old-patches/nonearby/991.patch diff --git a/patches/nonearby/992.patch b/old-patches/nonearby/992.patch similarity index 100% rename from patches/nonearby/992.patch rename to old-patches/nonearby/992.patch diff --git a/patches/nonearby/993.patch b/old-patches/nonearby/993.patch similarity index 100% rename from patches/nonearby/993.patch rename to old-patches/nonearby/993.patch diff --git a/patches/nonearby/994.patch b/old-patches/nonearby/994.patch similarity index 100% rename from patches/nonearby/994.patch rename to old-patches/nonearby/994.patch diff --git a/patches/nonearby/996.patch b/old-patches/nonearby/996.patch similarity index 100% rename from patches/nonearby/996.patch rename to old-patches/nonearby/996.patch diff --git a/patches/nonearby/README.md b/old-patches/nonearby/README.md similarity index 76% rename from patches/nonearby/README.md rename to old-patches/nonearby/README.md index b187b88..207ac8b 100644 --- a/patches/nonearby/README.md +++ b/old-patches/nonearby/README.md @@ -85,13 +85,13 @@ This patch nulls a bunch of nearby friends features for privacy. - 11.0 - 11.4 - 11.5 -- 12.0-alpha1 - 11.7 +- 12.0-alpha1 - 12.1 - 12.2 - 12.3 -- 13-alpha1 - 12.5 +- 13-alpha1 - 14-alpha2 - 14-alpha3 - 14.0 @@ -100,68 +100,24 @@ This patch nulls a bunch of nearby friends features for privacy. - 16 - 17.0 - 18.0-alpha1 -- 18.0-alpha9 - 18.0-alpha11 - 18.0-alpha12 +- 18.0-alpha9 - 19.0 - 20-alpha1 - 21-alpha2 -- 22-alpha1 - 21.3 -- 22-alpha3-alpha1 -- 16 -- 17.0 -- 18.0-alpha1 -- 18.0-alpha9 -- 18.0-alpha11 -- 18.0-alpha12 -- 19.0 -- 20-alpha1 -- 21-alpha2 - 22-alpha1 -- 21.3 -- 22-alpha3-alpha4 -- 16 -- 17.0 -- 18.0-alpha1 -- 18.0-alpha9 -- 18.0-alpha11 -- 18.0-alpha12 -- 19.0 -- 20-alpha1 -- 21-alpha2 -- 22-alpha1 -- 21.3 -- 22-alpha3-alpha6 -- 16 -- 17.0 -- 18.0-alpha1 -- 18.0-alpha9 -- 18.0-alpha11 -- 18.0-alpha12 -- 19.0 -- 20-alpha1 -- 21-alpha2 -- 22-alpha1 -- 21.3 -- 22-alpha3-alpha7 -- 16 -- 17.0 -- 18.0-alpha1 -- 18.0-alpha9 -- 18.0-alpha11 -- 18.0-alpha12 -- 19.0 -- 20-alpha1 -- 21-alpha2 -- 22-alpha1 -- 21.3 - 22-alpha3 +- 22-alpha3-alpha1 +- 22-alpha3-alpha4 +- 22-alpha3-alpha6 +- 22-alpha3-alpha7 - 22.4 - 22.5 - 23.0 -- 24-alpha2 - 24 +- 24-alpha2 - 28-alpha2 - 28.1 - 29-alpha1 @@ -200,9 +156,19 @@ This patch nulls a bunch of nearby friends features for privacy. - 48.1 - 48.2 - 49.1 -- 49.2 -- 49.8 - 49.10 - 49.12 - 49.13 +- 49.2 +- 49.8 +- 52.3 +- 53.0 +- 53.1 +- 53.3 +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha diff --git a/patches/noprofilestrip/1006.patch b/old-patches/noprofilestrip/1006.patch similarity index 100% rename from patches/noprofilestrip/1006.patch rename to old-patches/noprofilestrip/1006.patch diff --git a/patches/noprofilestrip/1007.patch b/old-patches/noprofilestrip/1007.patch similarity index 100% rename from patches/noprofilestrip/1007.patch rename to old-patches/noprofilestrip/1007.patch diff --git a/patches/noprofilestrip/1011.patch b/old-patches/noprofilestrip/1011.patch similarity index 100% rename from patches/noprofilestrip/1011.patch rename to old-patches/noprofilestrip/1011.patch diff --git a/patches/noprofilestrip/1012.patch b/old-patches/noprofilestrip/1012.patch similarity index 100% rename from patches/noprofilestrip/1012.patch rename to old-patches/noprofilestrip/1012.patch diff --git a/patches/noprofilestrip/1013.patch b/old-patches/noprofilestrip/1013.patch similarity index 100% rename from patches/noprofilestrip/1013.patch rename to old-patches/noprofilestrip/1013.patch diff --git a/patches/noprofilestrip/1015.patch b/old-patches/noprofilestrip/1015.patch similarity index 100% rename from patches/noprofilestrip/1015.patch rename to old-patches/noprofilestrip/1015.patch diff --git a/patches/noprofilestrip/1016.patch b/old-patches/noprofilestrip/1016.patch similarity index 100% rename from patches/noprofilestrip/1016.patch rename to old-patches/noprofilestrip/1016.patch diff --git a/patches/noprofilestrip/1019.patch b/old-patches/noprofilestrip/1019.patch similarity index 100% rename from patches/noprofilestrip/1019.patch rename to old-patches/noprofilestrip/1019.patch diff --git a/patches/noprofilestrip/1020.patch b/old-patches/noprofilestrip/1020.patch similarity index 100% rename from patches/noprofilestrip/1020.patch rename to old-patches/noprofilestrip/1020.patch diff --git a/patches/noprofilestrip/1021.patch b/old-patches/noprofilestrip/1021.patch similarity index 100% rename from patches/noprofilestrip/1021.patch rename to old-patches/noprofilestrip/1021.patch diff --git a/patches/noprofilestrip/1022.patch b/old-patches/noprofilestrip/1022.patch similarity index 100% rename from patches/noprofilestrip/1022.patch rename to old-patches/noprofilestrip/1022.patch diff --git a/patches/noprofilestrip/1023.patch b/old-patches/noprofilestrip/1023.patch similarity index 100% rename from patches/noprofilestrip/1023.patch rename to old-patches/noprofilestrip/1023.patch diff --git a/patches/noprofilestrip/1024.patch b/old-patches/noprofilestrip/1024.patch similarity index 100% rename from patches/noprofilestrip/1024.patch rename to old-patches/noprofilestrip/1024.patch diff --git a/patches/noprofilestrip/1025.patch b/old-patches/noprofilestrip/1025.patch similarity index 100% rename from patches/noprofilestrip/1025.patch rename to old-patches/noprofilestrip/1025.patch diff --git a/patches/noprofilestrip/1026.patch b/old-patches/noprofilestrip/1026.patch similarity index 100% rename from patches/noprofilestrip/1026.patch rename to old-patches/noprofilestrip/1026.patch diff --git a/patches/noprofilestrip/1029.patch b/old-patches/noprofilestrip/1029.patch similarity index 100% rename from patches/noprofilestrip/1029.patch rename to old-patches/noprofilestrip/1029.patch diff --git a/patches/noprofilestrip/1031.patch b/old-patches/noprofilestrip/1031.patch similarity index 100% rename from patches/noprofilestrip/1031.patch rename to old-patches/noprofilestrip/1031.patch diff --git a/patches/noprofilestrip/1032.patch b/old-patches/noprofilestrip/1032.patch similarity index 100% rename from patches/noprofilestrip/1032.patch rename to old-patches/noprofilestrip/1032.patch diff --git a/patches/noprofilestrip/1033.patch b/old-patches/noprofilestrip/1033.patch similarity index 100% rename from patches/noprofilestrip/1033.patch rename to old-patches/noprofilestrip/1033.patch diff --git a/patches/noprofilestrip/1036.patch b/old-patches/noprofilestrip/1036.patch similarity index 100% rename from patches/noprofilestrip/1036.patch rename to old-patches/noprofilestrip/1036.patch diff --git a/patches/noprofilestrip/1037.patch b/old-patches/noprofilestrip/1037.patch similarity index 100% rename from patches/noprofilestrip/1037.patch rename to old-patches/noprofilestrip/1037.patch diff --git a/patches/noprofilestrip/1040.patch b/old-patches/noprofilestrip/1040.patch similarity index 100% rename from patches/noprofilestrip/1040.patch rename to old-patches/noprofilestrip/1040.patch diff --git a/patches/noprofilestrip/1041.patch b/old-patches/noprofilestrip/1041.patch similarity index 100% rename from patches/noprofilestrip/1041.patch rename to old-patches/noprofilestrip/1041.patch diff --git a/patches/noprofilestrip/1045.patch b/old-patches/noprofilestrip/1045.patch similarity index 100% rename from patches/noprofilestrip/1045.patch rename to old-patches/noprofilestrip/1045.patch diff --git a/patches/noprofilestrip/1046.patch b/old-patches/noprofilestrip/1046.patch similarity index 100% rename from patches/noprofilestrip/1046.patch rename to old-patches/noprofilestrip/1046.patch diff --git a/patches/noprofilestrip/1047.patch b/old-patches/noprofilestrip/1047.patch similarity index 100% rename from patches/noprofilestrip/1047.patch rename to old-patches/noprofilestrip/1047.patch diff --git a/patches/noprofilestrip/1049.patch b/old-patches/noprofilestrip/1049.patch similarity index 100% rename from patches/noprofilestrip/1049.patch rename to old-patches/noprofilestrip/1049.patch diff --git a/patches/noprofilestrip/1052.patch b/old-patches/noprofilestrip/1052.patch similarity index 100% rename from patches/noprofilestrip/1052.patch rename to old-patches/noprofilestrip/1052.patch diff --git a/patches/noprofilestrip/1053.patch b/old-patches/noprofilestrip/1053.patch similarity index 100% rename from patches/noprofilestrip/1053.patch rename to old-patches/noprofilestrip/1053.patch diff --git a/patches/noprofilestrip/1054.patch b/old-patches/noprofilestrip/1054.patch similarity index 100% rename from patches/noprofilestrip/1054.patch rename to old-patches/noprofilestrip/1054.patch diff --git a/patches/noprofilestrip/1056.patch b/old-patches/noprofilestrip/1056.patch similarity index 100% rename from patches/noprofilestrip/1056.patch rename to old-patches/noprofilestrip/1056.patch diff --git a/patches/noprofilestrip/1057.patch b/old-patches/noprofilestrip/1057.patch similarity index 100% rename from patches/noprofilestrip/1057.patch rename to old-patches/noprofilestrip/1057.patch diff --git a/patches/noprofilestrip/1062.patch b/old-patches/noprofilestrip/1062.patch similarity index 100% rename from patches/noprofilestrip/1062.patch rename to old-patches/noprofilestrip/1062.patch diff --git a/patches/noprofilestrip/1065.patch b/old-patches/noprofilestrip/1065.patch similarity index 100% rename from patches/noprofilestrip/1065.patch rename to old-patches/noprofilestrip/1065.patch diff --git a/patches/noprofilestrip/1066.patch b/old-patches/noprofilestrip/1066.patch similarity index 100% rename from patches/noprofilestrip/1066.patch rename to old-patches/noprofilestrip/1066.patch diff --git a/patches/noprofilestrip/1069.patch b/old-patches/noprofilestrip/1069.patch similarity index 100% rename from patches/noprofilestrip/1069.patch rename to old-patches/noprofilestrip/1069.patch diff --git a/patches/noprofilestrip/1073.patch b/old-patches/noprofilestrip/1073.patch similarity index 100% rename from patches/noprofilestrip/1073.patch rename to old-patches/noprofilestrip/1073.patch diff --git a/patches/noprofilestrip/1074.patch b/old-patches/noprofilestrip/1074.patch similarity index 100% rename from patches/noprofilestrip/1074.patch rename to old-patches/noprofilestrip/1074.patch diff --git a/patches/noprofilestrip/1078.patch b/old-patches/noprofilestrip/1078.patch similarity index 100% rename from patches/noprofilestrip/1078.patch rename to old-patches/noprofilestrip/1078.patch diff --git a/patches/noprofilestrip/1084.patch b/old-patches/noprofilestrip/1084.patch similarity index 100% rename from patches/noprofilestrip/1084.patch rename to old-patches/noprofilestrip/1084.patch diff --git a/patches/noprofilestrip/1085.patch b/old-patches/noprofilestrip/1085.patch similarity index 100% rename from patches/noprofilestrip/1085.patch rename to old-patches/noprofilestrip/1085.patch diff --git a/patches/noprofilestrip/1087.patch b/old-patches/noprofilestrip/1087.patch similarity index 100% rename from patches/noprofilestrip/1087.patch rename to old-patches/noprofilestrip/1087.patch diff --git a/patches/noprofilestrip/1091.patch b/old-patches/noprofilestrip/1091.patch similarity index 100% rename from patches/noprofilestrip/1091.patch rename to old-patches/noprofilestrip/1091.patch diff --git a/patches/noprofilestrip/1092.patch b/old-patches/noprofilestrip/1092.patch similarity index 100% rename from patches/noprofilestrip/1092.patch rename to old-patches/noprofilestrip/1092.patch diff --git a/patches/noprofilestrip/1100.patch b/old-patches/noprofilestrip/1100.patch similarity index 100% rename from patches/noprofilestrip/1100.patch rename to old-patches/noprofilestrip/1100.patch diff --git a/patches/noprofilestrip/1103.patch b/old-patches/noprofilestrip/1103.patch similarity index 100% rename from patches/noprofilestrip/1103.patch rename to old-patches/noprofilestrip/1103.patch diff --git a/patches/noprofilestrip/1104.patch b/old-patches/noprofilestrip/1104.patch similarity index 100% rename from patches/noprofilestrip/1104.patch rename to old-patches/noprofilestrip/1104.patch diff --git a/patches/noprofilestrip/1105.patch b/old-patches/noprofilestrip/1105.patch similarity index 100% rename from patches/noprofilestrip/1105.patch rename to old-patches/noprofilestrip/1105.patch diff --git a/patches/noprofilestrip/1107.patch b/old-patches/noprofilestrip/1107.patch similarity index 100% rename from patches/noprofilestrip/1107.patch rename to old-patches/noprofilestrip/1107.patch diff --git a/patches/noprofilestrip/1123.patch b/old-patches/noprofilestrip/1123.patch similarity index 100% rename from patches/noprofilestrip/1123.patch rename to old-patches/noprofilestrip/1123.patch diff --git a/patches/noprofilestrip/1132.patch b/old-patches/noprofilestrip/1132.patch similarity index 100% rename from patches/noprofilestrip/1132.patch rename to old-patches/noprofilestrip/1132.patch diff --git a/patches/noprofilestrip/1134.patch b/old-patches/noprofilestrip/1134.patch similarity index 100% rename from patches/noprofilestrip/1134.patch rename to old-patches/noprofilestrip/1134.patch diff --git a/patches/noprofilestrip/1144.patch b/old-patches/noprofilestrip/1144.patch similarity index 100% rename from patches/noprofilestrip/1144.patch rename to old-patches/noprofilestrip/1144.patch diff --git a/patches/noprofilestrip/1145.patch b/old-patches/noprofilestrip/1145.patch similarity index 100% rename from patches/noprofilestrip/1145.patch rename to old-patches/noprofilestrip/1145.patch diff --git a/patches/noprofilestrip/1146.patch b/old-patches/noprofilestrip/1146.patch similarity index 100% rename from patches/noprofilestrip/1146.patch rename to old-patches/noprofilestrip/1146.patch diff --git a/patches/noprofilestrip/1148.patch b/old-patches/noprofilestrip/1148.patch similarity index 100% rename from patches/noprofilestrip/1148.patch rename to old-patches/noprofilestrip/1148.patch diff --git a/patches/noprofilestrip/1150.patch b/old-patches/noprofilestrip/1150.patch similarity index 100% rename from patches/noprofilestrip/1150.patch rename to old-patches/noprofilestrip/1150.patch diff --git a/patches/noprofilestrip/1167.patch b/old-patches/noprofilestrip/1167.patch similarity index 100% rename from patches/noprofilestrip/1167.patch rename to old-patches/noprofilestrip/1167.patch diff --git a/patches/noprofilestrip/1169.patch b/old-patches/noprofilestrip/1169.patch similarity index 100% rename from patches/noprofilestrip/1169.patch rename to old-patches/noprofilestrip/1169.patch diff --git a/patches/noprofilestrip/1171.patch b/old-patches/noprofilestrip/1171.patch similarity index 100% rename from patches/noprofilestrip/1171.patch rename to old-patches/noprofilestrip/1171.patch diff --git a/patches/noprofilestrip/1180.patch b/old-patches/noprofilestrip/1180.patch similarity index 100% rename from patches/noprofilestrip/1180.patch rename to old-patches/noprofilestrip/1180.patch diff --git a/patches/noprofilestrip/1181.patch b/old-patches/noprofilestrip/1181.patch similarity index 100% rename from patches/noprofilestrip/1181.patch rename to old-patches/noprofilestrip/1181.patch diff --git a/patches/noprofilestrip/1192.patch b/old-patches/noprofilestrip/1192.patch similarity index 100% rename from patches/noprofilestrip/1192.patch rename to old-patches/noprofilestrip/1192.patch diff --git a/patches/noprofilestrip/1196.patch b/old-patches/noprofilestrip/1196.patch similarity index 100% rename from patches/noprofilestrip/1196.patch rename to old-patches/noprofilestrip/1196.patch diff --git a/patches/noprofilestrip/1200.patch b/old-patches/noprofilestrip/1200.patch similarity index 100% rename from patches/noprofilestrip/1200.patch rename to old-patches/noprofilestrip/1200.patch diff --git a/patches/noprofilestrip/1201.patch b/old-patches/noprofilestrip/1201.patch similarity index 100% rename from patches/noprofilestrip/1201.patch rename to old-patches/noprofilestrip/1201.patch diff --git a/patches/noprofilestrip/1208.patch b/old-patches/noprofilestrip/1208.patch similarity index 100% rename from patches/noprofilestrip/1208.patch rename to old-patches/noprofilestrip/1208.patch diff --git a/patches/noprofilestrip/1213.patch b/old-patches/noprofilestrip/1213.patch similarity index 100% rename from patches/noprofilestrip/1213.patch rename to old-patches/noprofilestrip/1213.patch diff --git a/patches/noprofilestrip/1216.patch b/old-patches/noprofilestrip/1216.patch similarity index 100% rename from patches/noprofilestrip/1216.patch rename to old-patches/noprofilestrip/1216.patch diff --git a/patches/noprofilestrip/1218.patch b/old-patches/noprofilestrip/1218.patch similarity index 100% rename from patches/noprofilestrip/1218.patch rename to old-patches/noprofilestrip/1218.patch diff --git a/patches/noprofilestrip/1223.patch b/old-patches/noprofilestrip/1223.patch similarity index 100% rename from patches/noprofilestrip/1223.patch rename to old-patches/noprofilestrip/1223.patch diff --git a/patches/noprofilestrip/1243.patch b/old-patches/noprofilestrip/1243.patch similarity index 100% rename from patches/noprofilestrip/1243.patch rename to old-patches/noprofilestrip/1243.patch diff --git a/patches/noprofilestrip/1246.patch b/old-patches/noprofilestrip/1246.patch similarity index 100% rename from patches/noprofilestrip/1246.patch rename to old-patches/noprofilestrip/1246.patch diff --git a/patches/noprofilestrip/1249.patch b/old-patches/noprofilestrip/1249.patch similarity index 100% rename from patches/noprofilestrip/1249.patch rename to old-patches/noprofilestrip/1249.patch diff --git a/patches/noprofilestrip/1251.patch b/old-patches/noprofilestrip/1251.patch similarity index 100% rename from patches/noprofilestrip/1251.patch rename to old-patches/noprofilestrip/1251.patch diff --git a/patches/noprofilestrip/1252.patch b/old-patches/noprofilestrip/1252.patch similarity index 100% rename from patches/noprofilestrip/1252.patch rename to old-patches/noprofilestrip/1252.patch diff --git a/patches/noprofilestrip/1259.patch b/old-patches/noprofilestrip/1259.patch similarity index 100% rename from patches/noprofilestrip/1259.patch rename to old-patches/noprofilestrip/1259.patch diff --git a/patches/noprofilestrip/1266.patch b/old-patches/noprofilestrip/1266.patch similarity index 100% rename from patches/noprofilestrip/1266.patch rename to old-patches/noprofilestrip/1266.patch diff --git a/patches/noprofilestrip/1270.patch b/old-patches/noprofilestrip/1270.patch similarity index 100% rename from patches/noprofilestrip/1270.patch rename to old-patches/noprofilestrip/1270.patch diff --git a/patches/noprofilestrip/1273.patch b/old-patches/noprofilestrip/1273.patch similarity index 100% rename from patches/noprofilestrip/1273.patch rename to old-patches/noprofilestrip/1273.patch diff --git a/patches/noprofilestrip/1279.patch b/old-patches/noprofilestrip/1279.patch similarity index 100% rename from patches/noprofilestrip/1279.patch rename to old-patches/noprofilestrip/1279.patch diff --git a/patches/noprofilestrip/1280.patch b/old-patches/noprofilestrip/1280.patch similarity index 100% rename from patches/noprofilestrip/1280.patch rename to old-patches/noprofilestrip/1280.patch diff --git a/patches/noprofilestrip/1281.patch b/old-patches/noprofilestrip/1281.patch similarity index 100% rename from patches/noprofilestrip/1281.patch rename to old-patches/noprofilestrip/1281.patch diff --git a/patches/noprofilestrip/1282.patch b/old-patches/noprofilestrip/1282.patch similarity index 100% rename from patches/noprofilestrip/1282.patch rename to old-patches/noprofilestrip/1282.patch diff --git a/patches/noprofilestrip/1284.patch b/old-patches/noprofilestrip/1284.patch similarity index 100% rename from patches/noprofilestrip/1284.patch rename to old-patches/noprofilestrip/1284.patch diff --git a/patches/noprofilestrip/1290.patch b/old-patches/noprofilestrip/1290.patch similarity index 100% rename from patches/noprofilestrip/1290.patch rename to old-patches/noprofilestrip/1290.patch diff --git a/patches/noprofilestrip/1294.patch b/old-patches/noprofilestrip/1294.patch similarity index 100% rename from patches/noprofilestrip/1294.patch rename to old-patches/noprofilestrip/1294.patch diff --git a/patches/noprofilestrip/1295.patch b/old-patches/noprofilestrip/1295.patch similarity index 100% rename from patches/noprofilestrip/1295.patch rename to old-patches/noprofilestrip/1295.patch diff --git a/patches/noprofilestrip/1298.patch b/old-patches/noprofilestrip/1298.patch similarity index 100% rename from patches/noprofilestrip/1298.patch rename to old-patches/noprofilestrip/1298.patch diff --git a/patches/noprofilestrip/1300.patch b/old-patches/noprofilestrip/1300.patch similarity index 100% rename from patches/noprofilestrip/1300.patch rename to old-patches/noprofilestrip/1300.patch diff --git a/patches/noprofilestrip/1301.patch b/old-patches/noprofilestrip/1301.patch similarity index 100% rename from patches/noprofilestrip/1301.patch rename to old-patches/noprofilestrip/1301.patch diff --git a/patches/noprofilestrip/1304.patch b/old-patches/noprofilestrip/1304.patch similarity index 100% rename from patches/noprofilestrip/1304.patch rename to old-patches/noprofilestrip/1304.patch diff --git a/patches/noprofilestrip/1306.patch b/old-patches/noprofilestrip/1306.patch similarity index 100% rename from patches/noprofilestrip/1306.patch rename to old-patches/noprofilestrip/1306.patch diff --git a/patches/noprofilestrip/1307.patch b/old-patches/noprofilestrip/1307.patch similarity index 100% rename from patches/noprofilestrip/1307.patch rename to old-patches/noprofilestrip/1307.patch diff --git a/patches/noprofilestrip/1310.patch b/old-patches/noprofilestrip/1310.patch similarity index 100% rename from patches/noprofilestrip/1310.patch rename to old-patches/noprofilestrip/1310.patch diff --git a/patches/noprofilestrip/1315.patch b/old-patches/noprofilestrip/1315.patch similarity index 100% rename from patches/noprofilestrip/1315.patch rename to old-patches/noprofilestrip/1315.patch diff --git a/patches/noprofilestrip/1318.patch b/old-patches/noprofilestrip/1318.patch similarity index 100% rename from patches/noprofilestrip/1318.patch rename to old-patches/noprofilestrip/1318.patch diff --git a/patches/noprofilestrip/1330.patch b/old-patches/noprofilestrip/1330.patch similarity index 100% rename from patches/noprofilestrip/1330.patch rename to old-patches/noprofilestrip/1330.patch diff --git a/patches/noprofilestrip/1334.patch b/old-patches/noprofilestrip/1334.patch similarity index 100% rename from patches/noprofilestrip/1334.patch rename to old-patches/noprofilestrip/1334.patch diff --git a/patches/noprofilestrip/1339.patch b/old-patches/noprofilestrip/1339.patch similarity index 100% rename from patches/noprofilestrip/1339.patch rename to old-patches/noprofilestrip/1339.patch diff --git a/patches/noprofilestrip/1340.patch b/old-patches/noprofilestrip/1340.patch similarity index 100% rename from patches/noprofilestrip/1340.patch rename to old-patches/noprofilestrip/1340.patch diff --git a/old-patches/noprofilestrip/1355.patch b/old-patches/noprofilestrip/1355.patch new file mode 100644 index 0000000..e708952 --- /dev/null +++ b/old-patches/noprofilestrip/1355.patch @@ -0,0 +1,49 @@ +diff -crB from/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali to/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali +*** from/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2020-02-06 22:11:47.992098274 +0000 +--- to/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2020-02-06 22:12:00.994092850 +0000 +*************** +*** 430,442 **** + + move-result-object v2 + +! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; +! +! move-result-object v4 +! +! invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String; +! +! move-result-object v4 + + invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +--- 430,436 ---- + + move-result-object v2 + +! const-string v4, "" + + invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +*************** +*** 445,457 **** + + move-result-object v2 + +! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; +! +! move-result-object p1 +! +! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getDiscriminatorWithPadding()Ljava/lang/String; +! +! move-result-object p1 + + invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +--- 439,445 ---- + + move-result-object v2 + +! const-string p1, "" + + invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + diff --git a/old-patches/noprofilestrip/1356.patch b/old-patches/noprofilestrip/1356.patch new file mode 100644 index 0000000..e708952 --- /dev/null +++ b/old-patches/noprofilestrip/1356.patch @@ -0,0 +1,49 @@ +diff -crB from/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali to/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali +*** from/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2020-02-06 22:11:47.992098274 +0000 +--- to/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2020-02-06 22:12:00.994092850 +0000 +*************** +*** 430,442 **** + + move-result-object v2 + +! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; +! +! move-result-object v4 +! +! invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String; +! +! move-result-object v4 + + invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +--- 430,436 ---- + + move-result-object v2 + +! const-string v4, "" + + invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +*************** +*** 445,457 **** + + move-result-object v2 + +! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; +! +! move-result-object p1 +! +! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getDiscriminatorWithPadding()Ljava/lang/String; +! +! move-result-object p1 + + invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +--- 439,445 ---- + + move-result-object v2 + +! const-string p1, "" + + invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + diff --git a/old-patches/noprofilestrip/1358.patch b/old-patches/noprofilestrip/1358.patch new file mode 100644 index 0000000..e708952 --- /dev/null +++ b/old-patches/noprofilestrip/1358.patch @@ -0,0 +1,49 @@ +diff -crB from/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali to/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali +*** from/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2020-02-06 22:11:47.992098274 +0000 +--- to/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2020-02-06 22:12:00.994092850 +0000 +*************** +*** 430,442 **** + + move-result-object v2 + +! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; +! +! move-result-object v4 +! +! invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String; +! +! move-result-object v4 + + invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +--- 430,436 ---- + + move-result-object v2 + +! const-string v4, "" + + invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +*************** +*** 445,457 **** + + move-result-object v2 + +! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; +! +! move-result-object p1 +! +! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getDiscriminatorWithPadding()Ljava/lang/String; +! +! move-result-object p1 + + invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +--- 439,445 ---- + + move-result-object v2 + +! const-string p1, "" + + invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + diff --git a/old-patches/noprofilestrip/1361.patch b/old-patches/noprofilestrip/1361.patch new file mode 100644 index 0000000..e708952 --- /dev/null +++ b/old-patches/noprofilestrip/1361.patch @@ -0,0 +1,49 @@ +diff -crB from/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali to/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali +*** from/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2020-02-06 22:11:47.992098274 +0000 +--- to/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2020-02-06 22:12:00.994092850 +0000 +*************** +*** 430,442 **** + + move-result-object v2 + +! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; +! +! move-result-object v4 +! +! invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String; +! +! move-result-object v4 + + invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +--- 430,436 ---- + + move-result-object v2 + +! const-string v4, "" + + invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +*************** +*** 445,457 **** + + move-result-object v2 + +! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; +! +! move-result-object p1 +! +! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getDiscriminatorWithPadding()Ljava/lang/String; +! +! move-result-object p1 + + invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +--- 439,445 ---- + + move-result-object v2 + +! const-string p1, "" + + invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + diff --git a/old-patches/noprofilestrip/1362.patch b/old-patches/noprofilestrip/1362.patch new file mode 100644 index 0000000..e708952 --- /dev/null +++ b/old-patches/noprofilestrip/1362.patch @@ -0,0 +1,49 @@ +diff -crB from/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali to/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali +*** from/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2020-02-06 22:11:47.992098274 +0000 +--- to/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2020-02-06 22:12:00.994092850 +0000 +*************** +*** 430,442 **** + + move-result-object v2 + +! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; +! +! move-result-object v4 +! +! invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String; +! +! move-result-object v4 + + invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +--- 430,436 ---- + + move-result-object v2 + +! const-string v4, "" + + invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +*************** +*** 445,457 **** + + move-result-object v2 + +! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; +! +! move-result-object p1 +! +! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getDiscriminatorWithPadding()Ljava/lang/String; +! +! move-result-object p1 + + invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +--- 439,445 ---- + + move-result-object v2 + +! const-string p1, "" + + invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + diff --git a/old-patches/noprofilestrip/1365.patch b/old-patches/noprofilestrip/1365.patch new file mode 100644 index 0000000..e708952 --- /dev/null +++ b/old-patches/noprofilestrip/1365.patch @@ -0,0 +1,49 @@ +diff -crB from/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali to/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali +*** from/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2020-02-06 22:11:47.992098274 +0000 +--- to/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2020-02-06 22:12:00.994092850 +0000 +*************** +*** 430,442 **** + + move-result-object v2 + +! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; +! +! move-result-object v4 +! +! invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String; +! +! move-result-object v4 + + invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +--- 430,436 ---- + + move-result-object v2 + +! const-string v4, "" + + invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +*************** +*** 445,457 **** + + move-result-object v2 + +! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; +! +! move-result-object p1 +! +! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getDiscriminatorWithPadding()Ljava/lang/String; +! +! move-result-object p1 + + invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +--- 439,445 ---- + + move-result-object v2 + +! const-string p1, "" + + invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + diff --git a/old-patches/noprofilestrip/1367.patch b/old-patches/noprofilestrip/1367.patch new file mode 100644 index 0000000..e708952 --- /dev/null +++ b/old-patches/noprofilestrip/1367.patch @@ -0,0 +1,49 @@ +diff -crB from/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali to/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali +*** from/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2020-02-06 22:11:47.992098274 +0000 +--- to/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2020-02-06 22:12:00.994092850 +0000 +*************** +*** 430,442 **** + + move-result-object v2 + +! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; +! +! move-result-object v4 +! +! invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String; +! +! move-result-object v4 + + invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +--- 430,436 ---- + + move-result-object v2 + +! const-string v4, "" + + invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +*************** +*** 445,457 **** + + move-result-object v2 + +! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; +! +! move-result-object p1 +! +! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getDiscriminatorWithPadding()Ljava/lang/String; +! +! move-result-object p1 + + invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +--- 439,445 ---- + + move-result-object v2 + +! const-string p1, "" + + invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + diff --git a/old-patches/noprofilestrip/1368.patch b/old-patches/noprofilestrip/1368.patch new file mode 100644 index 0000000..e708952 --- /dev/null +++ b/old-patches/noprofilestrip/1368.patch @@ -0,0 +1,49 @@ +diff -crB from/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali to/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali +*** from/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2020-02-06 22:11:47.992098274 +0000 +--- to/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2020-02-06 22:12:00.994092850 +0000 +*************** +*** 430,442 **** + + move-result-object v2 + +! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; +! +! move-result-object v4 +! +! invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String; +! +! move-result-object v4 + + invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +--- 430,436 ---- + + move-result-object v2 + +! const-string v4, "" + + invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +*************** +*** 445,457 **** + + move-result-object v2 + +! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; +! +! move-result-object p1 +! +! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getDiscriminatorWithPadding()Ljava/lang/String; +! +! move-result-object p1 + + invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +--- 439,445 ---- + + move-result-object v2 + +! const-string p1, "" + + invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + diff --git a/old-patches/noprofilestrip/1370.patch b/old-patches/noprofilestrip/1370.patch new file mode 100644 index 0000000..e708952 --- /dev/null +++ b/old-patches/noprofilestrip/1370.patch @@ -0,0 +1,49 @@ +diff -crB from/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali to/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali +*** from/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2020-02-06 22:11:47.992098274 +0000 +--- to/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2020-02-06 22:12:00.994092850 +0000 +*************** +*** 430,442 **** + + move-result-object v2 + +! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; +! +! move-result-object v4 +! +! invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String; +! +! move-result-object v4 + + invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +--- 430,436 ---- + + move-result-object v2 + +! const-string v4, "" + + invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +*************** +*** 445,457 **** + + move-result-object v2 + +! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; +! +! move-result-object p1 +! +! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getDiscriminatorWithPadding()Ljava/lang/String; +! +! move-result-object p1 + + invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +--- 439,445 ---- + + move-result-object v2 + +! const-string p1, "" + + invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + diff --git a/old-patches/noprofilestrip/1371.patch b/old-patches/noprofilestrip/1371.patch new file mode 100644 index 0000000..e708952 --- /dev/null +++ b/old-patches/noprofilestrip/1371.patch @@ -0,0 +1,49 @@ +diff -crB from/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali to/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali +*** from/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2020-02-06 22:11:47.992098274 +0000 +--- to/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2020-02-06 22:12:00.994092850 +0000 +*************** +*** 430,442 **** + + move-result-object v2 + +! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; +! +! move-result-object v4 +! +! invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String; +! +! move-result-object v4 + + invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +--- 430,436 ---- + + move-result-object v2 + +! const-string v4, "" + + invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +*************** +*** 445,457 **** + + move-result-object v2 + +! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; +! +! move-result-object p1 +! +! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getDiscriminatorWithPadding()Ljava/lang/String; +! +! move-result-object p1 + + invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +--- 439,445 ---- + + move-result-object v2 + +! const-string p1, "" + + invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + diff --git a/old-patches/noprofilestrip/78204.patch-failed b/old-patches/noprofilestrip/78204.patch-failed new file mode 100644 index 0000000..e708952 --- /dev/null +++ b/old-patches/noprofilestrip/78204.patch-failed @@ -0,0 +1,49 @@ +diff -crB from/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali to/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali +*** from/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2020-02-06 22:11:47.992098274 +0000 +--- to/smali_classes2/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2020-02-06 22:12:00.994092850 +0000 +*************** +*** 430,442 **** + + move-result-object v2 + +! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; +! +! move-result-object v4 +! +! invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String; +! +! move-result-object v4 + + invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +--- 430,436 ---- + + move-result-object v2 + +! const-string v4, "" + + invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +*************** +*** 445,457 **** + + move-result-object v2 + +! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; +! +! move-result-object p1 +! +! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getDiscriminatorWithPadding()Ljava/lang/String; +! +! move-result-object p1 + + invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + +--- 439,445 ---- + + move-result-object v2 + +! const-string p1, "" + + invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + diff --git a/patches/noprofilestrip/842.patch b/old-patches/noprofilestrip/842.patch similarity index 100% rename from patches/noprofilestrip/842.patch rename to old-patches/noprofilestrip/842.patch diff --git a/patches/noprofilestrip/843.patch b/old-patches/noprofilestrip/843.patch similarity index 100% rename from patches/noprofilestrip/843.patch rename to old-patches/noprofilestrip/843.patch diff --git a/patches/noprofilestrip/844.patch b/old-patches/noprofilestrip/844.patch similarity index 100% rename from patches/noprofilestrip/844.patch rename to old-patches/noprofilestrip/844.patch diff --git a/patches/noprofilestrip/845.patch b/old-patches/noprofilestrip/845.patch similarity index 100% rename from patches/noprofilestrip/845.patch rename to old-patches/noprofilestrip/845.patch diff --git a/patches/noprofilestrip/848.patch b/old-patches/noprofilestrip/848.patch similarity index 100% rename from patches/noprofilestrip/848.patch rename to old-patches/noprofilestrip/848.patch diff --git a/patches/noprofilestrip/850.patch b/old-patches/noprofilestrip/850.patch similarity index 100% rename from patches/noprofilestrip/850.patch rename to old-patches/noprofilestrip/850.patch diff --git a/patches/noprofilestrip/851.patch b/old-patches/noprofilestrip/851.patch similarity index 100% rename from patches/noprofilestrip/851.patch rename to old-patches/noprofilestrip/851.patch diff --git a/patches/noprofilestrip/853.patch b/old-patches/noprofilestrip/853.patch similarity index 100% rename from patches/noprofilestrip/853.patch rename to old-patches/noprofilestrip/853.patch diff --git a/patches/noprofilestrip/854.patch b/old-patches/noprofilestrip/854.patch similarity index 100% rename from patches/noprofilestrip/854.patch rename to old-patches/noprofilestrip/854.patch diff --git a/patches/noprofilestrip/855.patch b/old-patches/noprofilestrip/855.patch similarity index 100% rename from patches/noprofilestrip/855.patch rename to old-patches/noprofilestrip/855.patch diff --git a/patches/noprofilestrip/856.patch b/old-patches/noprofilestrip/856.patch similarity index 100% rename from patches/noprofilestrip/856.patch rename to old-patches/noprofilestrip/856.patch diff --git a/patches/noprofilestrip/876.patch b/old-patches/noprofilestrip/876.patch similarity index 100% rename from patches/noprofilestrip/876.patch rename to old-patches/noprofilestrip/876.patch diff --git a/patches/noprofilestrip/884.patch b/old-patches/noprofilestrip/884.patch similarity index 100% rename from patches/noprofilestrip/884.patch rename to old-patches/noprofilestrip/884.patch diff --git a/patches/noprofilestrip/888.patch b/old-patches/noprofilestrip/888.patch similarity index 100% rename from patches/noprofilestrip/888.patch rename to old-patches/noprofilestrip/888.patch diff --git a/patches/noprofilestrip/896.patch b/old-patches/noprofilestrip/896.patch similarity index 100% rename from patches/noprofilestrip/896.patch rename to old-patches/noprofilestrip/896.patch diff --git a/patches/noprofilestrip/897.patch b/old-patches/noprofilestrip/897.patch similarity index 100% rename from patches/noprofilestrip/897.patch rename to old-patches/noprofilestrip/897.patch diff --git a/patches/noprofilestrip/898.patch b/old-patches/noprofilestrip/898.patch similarity index 100% rename from patches/noprofilestrip/898.patch rename to old-patches/noprofilestrip/898.patch diff --git a/patches/noprofilestrip/899.patch b/old-patches/noprofilestrip/899.patch similarity index 100% rename from patches/noprofilestrip/899.patch rename to old-patches/noprofilestrip/899.patch diff --git a/patches/noprofilestrip/900.patch b/old-patches/noprofilestrip/900.patch similarity index 100% rename from patches/noprofilestrip/900.patch rename to old-patches/noprofilestrip/900.patch diff --git a/patches/noprofilestrip/901.patch b/old-patches/noprofilestrip/901.patch similarity index 100% rename from patches/noprofilestrip/901.patch rename to old-patches/noprofilestrip/901.patch diff --git a/patches/noprofilestrip/902.patch b/old-patches/noprofilestrip/902.patch similarity index 100% rename from patches/noprofilestrip/902.patch rename to old-patches/noprofilestrip/902.patch diff --git a/patches/noprofilestrip/903.patch b/old-patches/noprofilestrip/903.patch similarity index 100% rename from patches/noprofilestrip/903.patch rename to old-patches/noprofilestrip/903.patch diff --git a/patches/noprofilestrip/904.patch b/old-patches/noprofilestrip/904.patch similarity index 100% rename from patches/noprofilestrip/904.patch rename to old-patches/noprofilestrip/904.patch diff --git a/patches/noprofilestrip/906.patch b/old-patches/noprofilestrip/906.patch similarity index 100% rename from patches/noprofilestrip/906.patch rename to old-patches/noprofilestrip/906.patch diff --git a/patches/noprofilestrip/909.patch b/old-patches/noprofilestrip/909.patch similarity index 100% rename from patches/noprofilestrip/909.patch rename to old-patches/noprofilestrip/909.patch diff --git a/patches/noprofilestrip/910.patch b/old-patches/noprofilestrip/910.patch similarity index 100% rename from patches/noprofilestrip/910.patch rename to old-patches/noprofilestrip/910.patch diff --git a/patches/noprofilestrip/938.patch b/old-patches/noprofilestrip/938.patch similarity index 100% rename from patches/noprofilestrip/938.patch rename to old-patches/noprofilestrip/938.patch diff --git a/patches/noprofilestrip/939.patch b/old-patches/noprofilestrip/939.patch similarity index 100% rename from patches/noprofilestrip/939.patch rename to old-patches/noprofilestrip/939.patch diff --git a/patches/noprofilestrip/940.patch b/old-patches/noprofilestrip/940.patch similarity index 100% rename from patches/noprofilestrip/940.patch rename to old-patches/noprofilestrip/940.patch diff --git a/patches/noprofilestrip/942.patch b/old-patches/noprofilestrip/942.patch similarity index 100% rename from patches/noprofilestrip/942.patch rename to old-patches/noprofilestrip/942.patch diff --git a/patches/noprofilestrip/943.patch b/old-patches/noprofilestrip/943.patch similarity index 100% rename from patches/noprofilestrip/943.patch rename to old-patches/noprofilestrip/943.patch diff --git a/patches/noprofilestrip/945.patch b/old-patches/noprofilestrip/945.patch similarity index 100% rename from patches/noprofilestrip/945.patch rename to old-patches/noprofilestrip/945.patch diff --git a/patches/noprofilestrip/946.patch b/old-patches/noprofilestrip/946.patch similarity index 100% rename from patches/noprofilestrip/946.patch rename to old-patches/noprofilestrip/946.patch diff --git a/patches/noprofilestrip/947.patch b/old-patches/noprofilestrip/947.patch similarity index 100% rename from patches/noprofilestrip/947.patch rename to old-patches/noprofilestrip/947.patch diff --git a/patches/noprofilestrip/948.patch b/old-patches/noprofilestrip/948.patch similarity index 100% rename from patches/noprofilestrip/948.patch rename to old-patches/noprofilestrip/948.patch diff --git a/patches/noprofilestrip/964.patch b/old-patches/noprofilestrip/964.patch similarity index 100% rename from patches/noprofilestrip/964.patch rename to old-patches/noprofilestrip/964.patch diff --git a/patches/noprofilestrip/965.patch b/old-patches/noprofilestrip/965.patch similarity index 100% rename from patches/noprofilestrip/965.patch rename to old-patches/noprofilestrip/965.patch diff --git a/patches/noprofilestrip/966.patch b/old-patches/noprofilestrip/966.patch similarity index 100% rename from patches/noprofilestrip/966.patch rename to old-patches/noprofilestrip/966.patch diff --git a/patches/noprofilestrip/967.patch b/old-patches/noprofilestrip/967.patch similarity index 100% rename from patches/noprofilestrip/967.patch rename to old-patches/noprofilestrip/967.patch diff --git a/patches/noprofilestrip/968.patch b/old-patches/noprofilestrip/968.patch similarity index 100% rename from patches/noprofilestrip/968.patch rename to old-patches/noprofilestrip/968.patch diff --git a/patches/noprofilestrip/970.patch b/old-patches/noprofilestrip/970.patch similarity index 100% rename from patches/noprofilestrip/970.patch rename to old-patches/noprofilestrip/970.patch diff --git a/patches/noprofilestrip/980.patch b/old-patches/noprofilestrip/980.patch similarity index 100% rename from patches/noprofilestrip/980.patch rename to old-patches/noprofilestrip/980.patch diff --git a/patches/noprofilestrip/984.patch b/old-patches/noprofilestrip/984.patch similarity index 100% rename from patches/noprofilestrip/984.patch rename to old-patches/noprofilestrip/984.patch diff --git a/patches/noprofilestrip/986.patch b/old-patches/noprofilestrip/986.patch similarity index 100% rename from patches/noprofilestrip/986.patch rename to old-patches/noprofilestrip/986.patch diff --git a/patches/noprofilestrip/991.patch b/old-patches/noprofilestrip/991.patch similarity index 100% rename from patches/noprofilestrip/991.patch rename to old-patches/noprofilestrip/991.patch diff --git a/patches/noprofilestrip/992.patch b/old-patches/noprofilestrip/992.patch similarity index 100% rename from patches/noprofilestrip/992.patch rename to old-patches/noprofilestrip/992.patch diff --git a/patches/noprofilestrip/993.patch b/old-patches/noprofilestrip/993.patch similarity index 100% rename from patches/noprofilestrip/993.patch rename to old-patches/noprofilestrip/993.patch diff --git a/patches/noprofilestrip/994.patch b/old-patches/noprofilestrip/994.patch similarity index 100% rename from patches/noprofilestrip/994.patch rename to old-patches/noprofilestrip/994.patch diff --git a/patches/noprofilestrip/996.patch b/old-patches/noprofilestrip/996.patch similarity index 100% rename from patches/noprofilestrip/996.patch rename to old-patches/noprofilestrip/996.patch diff --git a/old-patches/noprofilestrip/README.md b/old-patches/noprofilestrip/README.md new file mode 100644 index 0000000..718b41b --- /dev/null +++ b/old-patches/noprofilestrip/README.md @@ -0,0 +1,480 @@ +## DisTok CutTheCord: No Profile Strip Patch + +This patch removes the "profile strip" from the left side menu, helping remove PII from screenshots: + +![](https://x3.pm/i/99b1vutg.png) + +#### Available and tested on: +- 8.4.2g +- 8.4.3g +- 8.4.4g +- 8.4.5g +- 8.4.8 +- 8.5.0 +- 8.5.1 +- 8.5.3 +- 8.5.4 +- 8.5.5 +- 8.5.6 +- 8.7.6 +- 8.8.4 +- 8.8.8 +- 8.9.6 +- 8.9.7 +- 8.9.8 +- 8.9.9 +- 9.0.0 +- 9.0.1 +- 9.0.2 +- 9.0.3 +- 9.0.4 +- 9.0.6 +- 9.0.9 +- 9.1.0 +- 9.3.8-SAO-Heathcliff +- 9.3.9 +- 9.4.0 +- 9.4.2-SA +- 9.4.3-SA +- 9.4.5 +- 9.4.6 +- 9.4.7 +- 9.4.8 +- 9.6.4 +- 9.6.5 +- 9.6.6 +- 9.6.7 +- 9.6.8 +- 9.7.0 +- 9.8.0 +- 9.8.4 +- 9.8.6 +- 9.9.1 +- 9.9.2 +- 9.9.3 +- 9.9.4 +- 9.9.6 +- 10.0.6 +- 10.0.7 +- 10.1.1 +- 10.1.2 +- 10.1.3 +- 10.1.5 +- 10.1.6 +- 10.1.9 +- 10.2.0 +- 10.2.1 +- 10.2.2 +- 10.2.3 +- 10.2.4 +- 10.2.5 +- 10.2.6 +- 10.2.9 +- 10.3.1 +- 10.3.2 +- 10.3.3 +- 10.4.0 +- 10.4.1 +- 10.5.1 +- 11.0 +- 11.4 +- 11.5 +- 12.0-alpha1 +- 11.7 +- 12.1 +- 12.2 +- 12.3 +- 13-alpha1 +- 12.5 +- 14-alpha2 +- 14-alpha3 +- 14.0 +- 15-alpha3 +- 15.0 +- 16 +- 17.0 +- 18.0-alpha1 +- 18.0-alpha9 +- 18.0-alpha11 +- 18.0-alpha12 +- 19.0 +- 20-alpha1 +- 21-alpha2 +- 22-alpha1 +- 21.3 +- 22-alpha3-alpha1 +- 16 +- 17.0 +- 18.0-alpha1 +- 18.0-alpha9 +- 18.0-alpha11 +- 18.0-alpha12 +- 19.0 +- 20-alpha1 +- 21-alpha2 +- 22-alpha1 +- 21.3 +- 22-alpha3-alpha4 +- 16 +- 17.0 +- 18.0-alpha1 +- 18.0-alpha9 +- 18.0-alpha11 +- 18.0-alpha12 +- 19.0 +- 20-alpha1 +- 21-alpha2 +- 22-alpha1 +- 21.3 +- 22-alpha3-alpha6 +- 16 +- 17.0 +- 18.0-alpha1 +- 18.0-alpha9 +- 18.0-alpha11 +- 18.0-alpha12 +- 19.0 +- 20-alpha1 +- 21-alpha2 +- 22-alpha1 +- 21.3 +- 22-alpha3-alpha7 +- 16 +- 17.0 +- 18.0-alpha1 +- 18.0-alpha9 +- 18.0-alpha11 +- 18.0-alpha12 +- 19.0 +- 20-alpha1 +- 21-alpha2 +- 22-alpha1 +- 21.3 +- 22-alpha3 +- 22.4 +- 22.5 +- 23.0 +- 24-alpha2 +- 24 +- 28-alpha2 +- 28.1 +- 29-alpha1 +- 30.0 +- 30.1 +- 31-alpha1 +- 31-alpha2 +- 32-alpha2 +- 32.0 +- 33.1 +- 34.0 +- 34.2 +- 34.3 +- 35.0-alpha1 +- 36.3 +- 36.5 +- 38.0 +- 38.1 +- 40.04 +- 41.02 +- 41.05 +- 41.06 +- 41.10 +- 41.11 +- 42.0 +- 42.1 +- 42.3 +- 44-alpha2 +- 44-alpha4 +- 44.5 +- 44.6 +- 45.2 +- 46.0 +- 46.3 +- 48.0 +- 48.1 +- 48.2 +- 49.1 +- 49.2 +- 49.8 +- 49.10 +- 49.12 +- 49.13 +- 52.3 +- 53.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha +- 53.6 +- 53.8 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha + diff --git a/patches/README.md b/patches/README.md index 7a2422d..35b46ba 100644 --- a/patches/README.md +++ b/patches/README.md @@ -7,6 +7,7 @@ The patches with **bold** names are the ones I'm most proud of. --- - betterdmheader: Replaces call button on dm header with a search button. +- betterrotation: This patch changes rotation settings to disallow upside down rotation. - **bettertm**: Replaces the :tm: and :registered: emojis with rendered unicode variants, making them look much better. Before bettertm: @@ -59,7 +60,6 @@ Video demonstration: https://www.youtube.com/watch?v=NMRPsAgqtWQ - noemojibutton: Hides the emoji button. - nocamerabutton: Hides the camera button next to album button, and prevents the expand behavior while kb is open. - nonearby: Intentionally breaks "add nearby people" feature. -- noprofilestrip: Hides your username and discriminator from the "profile strip" on the left bar. Useful to potentially avoid bans. ![An image of noprofilestrip](https://wildcard.elixi.re/t/szqcunmxi.png) diff --git a/patches/betterdmheader/1355.patch b/patches/betterdmheader/1355.patch new file mode 100644 index 0000000..20e2a16 --- /dev/null +++ b/patches/betterdmheader/1355.patch @@ -0,0 +1,66 @@ +diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml +*** from/res/menu/menu_chat_toolbar.xml 2020-11-19 15:23:40.599202252 +0000 +--- to/res/menu/menu_chat_toolbar.xml 2020-11-19 15:25:53.054799873 +0000 +*************** +*** 1,11 **** + + +! + + + +! +! + +! +\ No newline at end of file +--- 1,11 ---- + + +! + + + +! +! + +! +diff -crB from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali +*** from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:23:43.685245089 +0000 +--- to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:26:07.886953277 +0000 +*************** +*** 119,125 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 119,125 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +*************** +*** 140,146 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 140,146 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; diff --git a/patches/betterdmheader/1356.patch b/patches/betterdmheader/1356.patch new file mode 100644 index 0000000..20e2a16 --- /dev/null +++ b/patches/betterdmheader/1356.patch @@ -0,0 +1,66 @@ +diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml +*** from/res/menu/menu_chat_toolbar.xml 2020-11-19 15:23:40.599202252 +0000 +--- to/res/menu/menu_chat_toolbar.xml 2020-11-19 15:25:53.054799873 +0000 +*************** +*** 1,11 **** + + +! + + + +! +! + +! +\ No newline at end of file +--- 1,11 ---- + + +! + + + +! +! + +! +diff -crB from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali +*** from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:23:43.685245089 +0000 +--- to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:26:07.886953277 +0000 +*************** +*** 119,125 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 119,125 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +*************** +*** 140,146 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 140,146 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; diff --git a/patches/betterdmheader/1358.patch b/patches/betterdmheader/1358.patch new file mode 100644 index 0000000..20e2a16 --- /dev/null +++ b/patches/betterdmheader/1358.patch @@ -0,0 +1,66 @@ +diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml +*** from/res/menu/menu_chat_toolbar.xml 2020-11-19 15:23:40.599202252 +0000 +--- to/res/menu/menu_chat_toolbar.xml 2020-11-19 15:25:53.054799873 +0000 +*************** +*** 1,11 **** + + +! + + + +! +! + +! +\ No newline at end of file +--- 1,11 ---- + + +! + + + +! +! + +! +diff -crB from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali +*** from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:23:43.685245089 +0000 +--- to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:26:07.886953277 +0000 +*************** +*** 119,125 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 119,125 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +*************** +*** 140,146 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 140,146 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; diff --git a/patches/betterdmheader/1361.patch b/patches/betterdmheader/1361.patch new file mode 100644 index 0000000..20e2a16 --- /dev/null +++ b/patches/betterdmheader/1361.patch @@ -0,0 +1,66 @@ +diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml +*** from/res/menu/menu_chat_toolbar.xml 2020-11-19 15:23:40.599202252 +0000 +--- to/res/menu/menu_chat_toolbar.xml 2020-11-19 15:25:53.054799873 +0000 +*************** +*** 1,11 **** + + +! + + + +! +! + +! +\ No newline at end of file +--- 1,11 ---- + + +! + + + +! +! + +! +diff -crB from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali +*** from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:23:43.685245089 +0000 +--- to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:26:07.886953277 +0000 +*************** +*** 119,125 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 119,125 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +*************** +*** 140,146 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 140,146 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; diff --git a/patches/betterdmheader/1362.patch b/patches/betterdmheader/1362.patch new file mode 100644 index 0000000..20e2a16 --- /dev/null +++ b/patches/betterdmheader/1362.patch @@ -0,0 +1,66 @@ +diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml +*** from/res/menu/menu_chat_toolbar.xml 2020-11-19 15:23:40.599202252 +0000 +--- to/res/menu/menu_chat_toolbar.xml 2020-11-19 15:25:53.054799873 +0000 +*************** +*** 1,11 **** + + +! + + + +! +! + +! +\ No newline at end of file +--- 1,11 ---- + + +! + + + +! +! + +! +diff -crB from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali +*** from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:23:43.685245089 +0000 +--- to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:26:07.886953277 +0000 +*************** +*** 119,125 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 119,125 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +*************** +*** 140,146 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 140,146 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; diff --git a/patches/betterdmheader/1365.patch b/patches/betterdmheader/1365.patch new file mode 100644 index 0000000..20e2a16 --- /dev/null +++ b/patches/betterdmheader/1365.patch @@ -0,0 +1,66 @@ +diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml +*** from/res/menu/menu_chat_toolbar.xml 2020-11-19 15:23:40.599202252 +0000 +--- to/res/menu/menu_chat_toolbar.xml 2020-11-19 15:25:53.054799873 +0000 +*************** +*** 1,11 **** + + +! + + + +! +! + +! +\ No newline at end of file +--- 1,11 ---- + + +! + + + +! +! + +! +diff -crB from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali +*** from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:23:43.685245089 +0000 +--- to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:26:07.886953277 +0000 +*************** +*** 119,125 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 119,125 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +*************** +*** 140,146 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 140,146 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; diff --git a/patches/betterdmheader/1367.patch b/patches/betterdmheader/1367.patch new file mode 100644 index 0000000..20e2a16 --- /dev/null +++ b/patches/betterdmheader/1367.patch @@ -0,0 +1,66 @@ +diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml +*** from/res/menu/menu_chat_toolbar.xml 2020-11-19 15:23:40.599202252 +0000 +--- to/res/menu/menu_chat_toolbar.xml 2020-11-19 15:25:53.054799873 +0000 +*************** +*** 1,11 **** + + +! + + + +! +! + +! +\ No newline at end of file +--- 1,11 ---- + + +! + + + +! +! + +! +diff -crB from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali +*** from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:23:43.685245089 +0000 +--- to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:26:07.886953277 +0000 +*************** +*** 119,125 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 119,125 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +*************** +*** 140,146 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 140,146 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; diff --git a/patches/betterdmheader/1368.patch b/patches/betterdmheader/1368.patch new file mode 100644 index 0000000..20e2a16 --- /dev/null +++ b/patches/betterdmheader/1368.patch @@ -0,0 +1,66 @@ +diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml +*** from/res/menu/menu_chat_toolbar.xml 2020-11-19 15:23:40.599202252 +0000 +--- to/res/menu/menu_chat_toolbar.xml 2020-11-19 15:25:53.054799873 +0000 +*************** +*** 1,11 **** + + +! + + + +! +! + +! +\ No newline at end of file +--- 1,11 ---- + + +! + + + +! +! + +! +diff -crB from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali +*** from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:23:43.685245089 +0000 +--- to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:26:07.886953277 +0000 +*************** +*** 119,125 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 119,125 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +*************** +*** 140,146 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 140,146 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; diff --git a/patches/betterdmheader/1370.patch b/patches/betterdmheader/1370.patch new file mode 100644 index 0000000..20e2a16 --- /dev/null +++ b/patches/betterdmheader/1370.patch @@ -0,0 +1,66 @@ +diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml +*** from/res/menu/menu_chat_toolbar.xml 2020-11-19 15:23:40.599202252 +0000 +--- to/res/menu/menu_chat_toolbar.xml 2020-11-19 15:25:53.054799873 +0000 +*************** +*** 1,11 **** + + +! + + + +! +! + +! +\ No newline at end of file +--- 1,11 ---- + + +! + + + +! +! + +! +diff -crB from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali +*** from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:23:43.685245089 +0000 +--- to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:26:07.886953277 +0000 +*************** +*** 119,125 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 119,125 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +*************** +*** 140,146 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 140,146 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; diff --git a/patches/betterdmheader/1371.patch b/patches/betterdmheader/1371.patch new file mode 100644 index 0000000..20e2a16 --- /dev/null +++ b/patches/betterdmheader/1371.patch @@ -0,0 +1,66 @@ +diff -crB from/res/menu/menu_chat_toolbar.xml to/res/menu/menu_chat_toolbar.xml +*** from/res/menu/menu_chat_toolbar.xml 2020-11-19 15:23:40.599202252 +0000 +--- to/res/menu/menu_chat_toolbar.xml 2020-11-19 15:25:53.054799873 +0000 +*************** +*** 1,11 **** + + +! + + + +! +! + +! +\ No newline at end of file +--- 1,11 ---- + + +! + + + +! +! + +! +diff -crB from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali +*** from/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:23:43.685245089 +0000 +--- to/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2020-11-19 15:26:07.886953277 +0000 +*************** +*** 119,125 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 119,125 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 5 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +*************** +*** 140,146 **** + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 140,146 ---- + + invoke-static {v3, v4}, Ly/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v7}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; diff --git a/patches/betterdmheader/README.md b/patches/betterdmheader/README.md index 86f44ca..e07f8cb 100644 --- a/patches/betterdmheader/README.md +++ b/patches/betterdmheader/README.md @@ -34,9 +34,16 @@ This patch replaces the call button on DM headers with search button. The call b - 48.1 - 48.2 - 49.1 -- 49.2 -- 49.8 - 49.10 - 49.12 - 49.13 - +- 49.2 +- 49.8 +- 52.3 +- 53.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha diff --git a/patches/sanerotation/1340.patch b/patches/betterrotation/1340.patch similarity index 100% rename from patches/sanerotation/1340.patch rename to patches/betterrotation/1340.patch diff --git a/patches/betterrotation/1355.patch b/patches/betterrotation/1355.patch new file mode 100644 index 0000000..94bb3fb --- /dev/null +++ b/patches/betterrotation/1355.patch @@ -0,0 +1,22 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-08 18:13:28.198490900 +0000 +--- to/AndroidManifest.xml 2020-12-08 18:10:38.788471600 +0000 +*************** +*** 30,37 **** + + + +! +! + + + +--- 30,37 ---- + + + +! +! + + + diff --git a/patches/betterrotation/1356.patch b/patches/betterrotation/1356.patch new file mode 100644 index 0000000..94bb3fb --- /dev/null +++ b/patches/betterrotation/1356.patch @@ -0,0 +1,22 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-08 18:13:28.198490900 +0000 +--- to/AndroidManifest.xml 2020-12-08 18:10:38.788471600 +0000 +*************** +*** 30,37 **** + + + +! +! + + + +--- 30,37 ---- + + + +! +! + + + diff --git a/patches/betterrotation/1358.patch b/patches/betterrotation/1358.patch new file mode 100644 index 0000000..94bb3fb --- /dev/null +++ b/patches/betterrotation/1358.patch @@ -0,0 +1,22 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-08 18:13:28.198490900 +0000 +--- to/AndroidManifest.xml 2020-12-08 18:10:38.788471600 +0000 +*************** +*** 30,37 **** + + + +! +! + + + +--- 30,37 ---- + + + +! +! + + + diff --git a/patches/betterrotation/1361.patch b/patches/betterrotation/1361.patch new file mode 100644 index 0000000..94bb3fb --- /dev/null +++ b/patches/betterrotation/1361.patch @@ -0,0 +1,22 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-08 18:13:28.198490900 +0000 +--- to/AndroidManifest.xml 2020-12-08 18:10:38.788471600 +0000 +*************** +*** 30,37 **** + + + +! +! + + + +--- 30,37 ---- + + + +! +! + + + diff --git a/patches/betterrotation/1362.patch b/patches/betterrotation/1362.patch new file mode 100644 index 0000000..94bb3fb --- /dev/null +++ b/patches/betterrotation/1362.patch @@ -0,0 +1,22 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-08 18:13:28.198490900 +0000 +--- to/AndroidManifest.xml 2020-12-08 18:10:38.788471600 +0000 +*************** +*** 30,37 **** + + + +! +! + + + +--- 30,37 ---- + + + +! +! + + + diff --git a/patches/betterrotation/1365.patch b/patches/betterrotation/1365.patch new file mode 100644 index 0000000..94bb3fb --- /dev/null +++ b/patches/betterrotation/1365.patch @@ -0,0 +1,22 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-08 18:13:28.198490900 +0000 +--- to/AndroidManifest.xml 2020-12-08 18:10:38.788471600 +0000 +*************** +*** 30,37 **** + + + +! +! + + + +--- 30,37 ---- + + + +! +! + + + diff --git a/patches/betterrotation/1367.patch b/patches/betterrotation/1367.patch new file mode 100644 index 0000000..94bb3fb --- /dev/null +++ b/patches/betterrotation/1367.patch @@ -0,0 +1,22 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-08 18:13:28.198490900 +0000 +--- to/AndroidManifest.xml 2020-12-08 18:10:38.788471600 +0000 +*************** +*** 30,37 **** + + + +! +! + + + +--- 30,37 ---- + + + +! +! + + + diff --git a/patches/betterrotation/1368.patch b/patches/betterrotation/1368.patch new file mode 100644 index 0000000..94bb3fb --- /dev/null +++ b/patches/betterrotation/1368.patch @@ -0,0 +1,22 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-08 18:13:28.198490900 +0000 +--- to/AndroidManifest.xml 2020-12-08 18:10:38.788471600 +0000 +*************** +*** 30,37 **** + + + +! +! + + + +--- 30,37 ---- + + + +! +! + + + diff --git a/patches/betterrotation/1370.patch b/patches/betterrotation/1370.patch new file mode 100644 index 0000000..94bb3fb --- /dev/null +++ b/patches/betterrotation/1370.patch @@ -0,0 +1,22 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-08 18:13:28.198490900 +0000 +--- to/AndroidManifest.xml 2020-12-08 18:10:38.788471600 +0000 +*************** +*** 30,37 **** + + + +! +! + + + +--- 30,37 ---- + + + +! +! + + + diff --git a/patches/betterrotation/1371.patch b/patches/betterrotation/1371.patch new file mode 100644 index 0000000..94bb3fb --- /dev/null +++ b/patches/betterrotation/1371.patch @@ -0,0 +1,22 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-08 18:13:28.198490900 +0000 +--- to/AndroidManifest.xml 2020-12-08 18:10:38.788471600 +0000 +*************** +*** 30,37 **** + + + +! +! + + + +--- 30,37 ---- + + + +! +! + + + diff --git a/patches/betterrotation/78204.patch b/patches/betterrotation/78204.patch new file mode 100644 index 0000000..5f51f51 --- /dev/null +++ b/patches/betterrotation/78204.patch @@ -0,0 +1,22 @@ +diff -crB fromAndroidManifest.xml to/AndroidManifest.xml +*** fromAndroidManifest.xml 2021-05-31 15:40:24.000000000 +0300 +--- to/AndroidManifest.xml 2021-05-31 15:40:24.000000000 +0300 +*************** +*** 37,44 **** + + + +! +! + + + +--- 37,44 ---- + + + +! +! + + + diff --git a/patches/betterrotation/87202.patch b/patches/betterrotation/87202.patch new file mode 100644 index 0000000..5f51f51 --- /dev/null +++ b/patches/betterrotation/87202.patch @@ -0,0 +1,22 @@ +diff -crB fromAndroidManifest.xml to/AndroidManifest.xml +*** fromAndroidManifest.xml 2021-05-31 15:40:24.000000000 +0300 +--- to/AndroidManifest.xml 2021-05-31 15:40:24.000000000 +0300 +*************** +*** 37,44 **** + + + +! +! + + + +--- 37,44 ---- + + + +! +! + + + diff --git a/patches/betterrotation/README.md b/patches/betterrotation/README.md new file mode 100644 index 0000000..2ed0017 --- /dev/null +++ b/patches/betterrotation/README.md @@ -0,0 +1,17 @@ +## DisTok CutTheCord: Better Rotation + +This patch changes rotation settings to disallow upside down rotation. + +Contributed by [clienthax](https://gitdab.com/clienthax). + +#### Available and tested on: +- 49.13 +- 52.3 +- 53.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha + diff --git a/patches/bettertmlight/bettertm.sh b/patches/bettertmlight/bettertm.sh deleted file mode 120000 index 504e2d9..0000000 --- a/patches/bettertmlight/bettertm.sh +++ /dev/null @@ -1 +0,0 @@ -../bettertm/bettertm.sh \ No newline at end of file diff --git a/patches/bettertmlight/bettertm.sh b/patches/bettertmlight/bettertm.sh new file mode 100644 index 0000000..756d8ac --- /dev/null +++ b/patches/bettertmlight/bettertm.sh @@ -0,0 +1,3 @@ +#!/bin/bash +\cp "$1/emoji_2122_fe0f.png" res/raw/emoji_2122_fe0f.png +\cp "$1/emoji_ae_fe0f.png" res/raw/emoji_ae_fe0f.png diff --git a/patches/branding/1355.patch b/patches/branding/1355.patch new file mode 100644 index 0000000..660ffc6 --- /dev/null +++ b/patches/branding/1355.patch @@ -0,0 +1,239 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-10 18:00:04.432500279 +0000 +--- to/AndroidManifest.xml 2020-12-10 18:20:17.734330277 +0000 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 21,34 **** + + + +! + + + + + + +! + + + +--- 21,34 ---- + + + +! + + + + + + +! + + + +*************** +*** 132,138 **** + + + +! + + + +--- 132,138 ---- + + + +! + + + +*************** +*** 156,162 **** + + + +! + + + +--- 156,162 ---- + + + +! + + + +*************** +*** 165,171 **** + + + +! + + + +--- 165,171 ---- + + + +! + + + +*************** +*** 204,212 **** + + + +! + +! + + + +--- 204,212 ---- + + + +! + +! + + + +*************** +*** 261,264 **** + + + +! +\ No newline at end of file +--- 261,264 ---- + + + +! +diff -crB from/apktool.yml to/apktool.yml +*** from/apktool.yml 2020-12-10 17:59:10.661881796 +0000 +--- to/apktool.yml 2020-12-10 18:20:17.734330277 +0000 +*************** +*** 82,86 **** + tag: null + version: 2.4.2-f3136b-SNAPSHOT + versionInfo: +! versionCode: '1355' +! versionName: '52.3' +--- 82,86 ---- + tag: null + version: 2.4.2-f3136b-SNAPSHOT + versionInfo: +! versionCode: '1355CTCBUILD' +! versionName: '52.3-cutthecord-CTCBUILD' +diff -crB from/res/values/strings.xml to/res/values/strings.xml +*** from/res/values/strings.xml 2020-12-10 17:59:06.181830223 +0000 +--- to/res/values/strings.xml 2020-12-10 18:20:17.734330277 +0000 +*************** +*** 1638,1644 **** + Disconnect %1$s + Disconnect from Voice + User has been disconnected from voice. +! Discord + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +--- 1638,1644 ---- + Disconnect %1$s + Disconnect from Voice + User has been disconnected from voice. +! CTCNAME + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +*************** +*** 4586,4592 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Notifications + Notifications, muted +--- 4586,4592 ---- + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! CTCNAME + "Somebody Playin'" + Notifications + Notifications, muted +*************** +*** 6179,6185 **** + Subscriptions + Suggestions + %1$s, %2$s +! Support + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +--- 6179,6185 ---- + Subscriptions + Suggestions + %1$s, %2$s +! CutTheCord Repo + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali +*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-12-10 17:59:08.273854306 +0000 +--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-12-10 18:20:17.734330277 +0000 +*************** +*** 78,84 **** + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://discord.com/app" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +--- 78,84 ---- + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali +*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-12-10 17:59:09.323866394 +0000 +--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-12-10 18:20:17.734330277 +0000 +*************** +*** 63,69 **** + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://support.discord.com" + + const/4 v3, 0x0 + +--- 63,69 ---- + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://gitdab.com/distok/cutthecord" + + const/4 v3, 0x0 + diff --git a/patches/branding/1356.patch b/patches/branding/1356.patch new file mode 100644 index 0000000..3e0c8bb --- /dev/null +++ b/patches/branding/1356.patch @@ -0,0 +1,239 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-13 04:52:28.739956117 +0000 +--- to/AndroidManifest.xml 2020-12-13 04:54:05.662206425 +0000 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 21,34 **** + + + +! + + + + + + +! + + + +--- 21,34 ---- + + + +! + + + + + + +! + + + +*************** +*** 132,138 **** + + + +! + + + +--- 132,138 ---- + + + +! + + + +*************** +*** 156,162 **** + + + +! + + + +--- 156,162 ---- + + + +! + + + +*************** +*** 165,171 **** + + + +! + + + +--- 165,171 ---- + + + +! + + + +*************** +*** 204,212 **** + + + +! + +! + + + +--- 204,212 ---- + + + +! + +! + + + +*************** +*** 261,264 **** + + + +! +\ No newline at end of file +--- 261,264 ---- + + + +! +diff -crB from/apktool.yml to/apktool.yml +*** from/apktool.yml 2020-12-13 04:52:14.199873942 +0000 +--- to/apktool.yml 2020-12-13 04:54:05.662206425 +0000 +*************** +*** 82,86 **** + tag: null + version: 2.4.2-f3136b-SNAPSHOT + versionInfo: +! versionCode: '1356' +! versionName: '53.0' +--- 82,86 ---- + tag: null + version: 2.4.2-f3136b-SNAPSHOT + versionInfo: +! versionCode: '1356CTCBUILD' +! versionName: '53.0-cutthecord-CTCBUILD' +diff -crB from/res/values/strings.xml to/res/values/strings.xml +*** from/res/values/strings.xml 2020-12-13 04:52:10.608696354 +0000 +--- to/res/values/strings.xml 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 1650,1656 **** + Disconnect %1$s + Disconnect from Voice + User has been disconnected from voice. +! Discord + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +--- 1650,1656 ---- + Disconnect %1$s + Disconnect from Voice + User has been disconnected from voice. +! CTCNAME + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +*************** +*** 4619,4625 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Notifications + Notifications, muted +--- 4619,4625 ---- + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! CTCNAME + "Somebody Playin'" + Notifications + Notifications, muted +*************** +*** 6224,6230 **** + Subscriptions + Suggestions + %1$s, %2$s +! Support + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +--- 6224,6230 ---- + Subscriptions + Suggestions + %1$s, %2$s +! CutTheCord Repo + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali +*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-12-13 04:52:12.150319258 +0000 +--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 78,84 **** + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://discord.com/app" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +--- 78,84 ---- + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali +*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-12-13 04:52:13.002126047 +0000 +--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 63,69 **** + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://support.discord.com" + + const/4 v3, 0x0 + +--- 63,69 ---- + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://gitdab.com/distok/cutthecord" + + const/4 v3, 0x0 + diff --git a/patches/branding/1358.patch b/patches/branding/1358.patch new file mode 100644 index 0000000..8b96c72 --- /dev/null +++ b/patches/branding/1358.patch @@ -0,0 +1,239 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-13 04:52:28.739956117 +0000 +--- to/AndroidManifest.xml 2020-12-13 04:54:05.662206425 +0000 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 21,34 **** + + + +! + + + + + + +! + + + +--- 21,34 ---- + + + +! + + + + + + +! + + + +*************** +*** 132,138 **** + + + +! + + + +--- 132,138 ---- + + + +! + + + +*************** +*** 156,162 **** + + + +! + + + +--- 156,162 ---- + + + +! + + + +*************** +*** 165,171 **** + + + +! + + + +--- 165,171 ---- + + + +! + + + +*************** +*** 204,212 **** + + + +! + +! + + + +--- 204,212 ---- + + + +! + +! + + + +*************** +*** 261,264 **** + + + +! +\ No newline at end of file +--- 261,264 ---- + + + +! +diff -crB from/apktool.yml to/apktool.yml +*** from/apktool.yml 2020-12-13 04:52:14.199873942 +0000 +--- to/apktool.yml 2020-12-13 04:54:05.662206425 +0000 +*************** +*** 82,86 **** + tag: null + version: 2.4.2-f3136b-SNAPSHOT + versionInfo: +! versionCode: '1358' +! versionName: '53.1' +--- 82,86 ---- + tag: null + version: 2.4.2-f3136b-SNAPSHOT + versionInfo: +! versionCode: '1358CTCBUILD' +! versionName: '53.1-cutthecord-CTCBUILD' +diff -crB from/res/values/strings.xml to/res/values/strings.xml +*** from/res/values/strings.xml 2020-12-13 04:52:10.608696354 +0000 +--- to/res/values/strings.xml 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 1650,1656 **** + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! Discord + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +--- 1650,1656 ---- + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! CTCNAME + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +*************** +*** 4619,4625 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Notifications + Notifications, muted +--- 4619,4625 ---- + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! CTCNAME + "Somebody Playin'" + Notifications + Notifications, muted +*************** +*** 6284,6290 **** + Subscriptions + Suggestions + %1$s, %2$s +! Support + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +--- 6284,6290 ---- + Subscriptions + Suggestions + %1$s, %2$s +! CutTheCord Repo + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali +*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-12-13 04:52:12.150319258 +0000 +--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 78,84 **** + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://discord.com/app" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +--- 78,84 ---- + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali +*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-12-13 04:52:13.002126047 +0000 +--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 63,69 **** + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://support.discord.com" + + const/4 v3, 0x0 + +--- 63,69 ---- + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://gitdab.com/distok/cutthecord" + + const/4 v3, 0x0 + diff --git a/patches/branding/1361.patch b/patches/branding/1361.patch new file mode 100644 index 0000000..21675e5 --- /dev/null +++ b/patches/branding/1361.patch @@ -0,0 +1,239 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-13 04:52:28.739956117 +0000 +--- to/AndroidManifest.xml 2020-12-13 04:54:05.662206425 +0000 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 21,34 **** + + + +! + + + + + + +! + + + +--- 21,34 ---- + + + +! + + + + + + +! + + + +*************** +*** 132,138 **** + + + +! + + + +--- 132,138 ---- + + + +! + + + +*************** +*** 156,162 **** + + + +! + + + +--- 156,162 ---- + + + +! + + + +*************** +*** 165,171 **** + + + +! + + + +--- 165,171 ---- + + + +! + + + +*************** +*** 204,212 **** + + + +! + +! + + + +--- 204,212 ---- + + + +! + +! + + + +*************** +*** 261,264 **** + + + +! +\ No newline at end of file +--- 261,264 ---- + + + +! +diff -crB from/apktool.yml to/apktool.yml +*** from/apktool.yml 2020-12-13 04:52:14.199873942 +0000 +--- to/apktool.yml 2020-12-13 04:54:05.662206425 +0000 +*************** +*** 82,86 **** + tag: null + version: 2.4.2-f3136b-SNAPSHOT + versionInfo: +! versionCode: '1361' +! versionName: '53.3' +--- 82,86 ---- + tag: null + version: 2.4.2-f3136b-SNAPSHOT + versionInfo: +! versionCode: '1361CTCBUILD' +! versionName: '53.3-cutthecord-CTCBUILD' +diff -crB from/res/values/strings.xml to/res/values/strings.xml +*** from/res/values/strings.xml 2020-12-13 04:52:10.608696354 +0000 +--- to/res/values/strings.xml 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 1650,1656 **** + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! Discord + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +--- 1650,1656 ---- + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! CTCNAME + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +*************** +*** 4619,4625 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Notifications + Notifications, muted +--- 4619,4625 ---- + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! CTCNAME + "Somebody Playin'" + Notifications + Notifications, muted +*************** +*** 6284,6290 **** + Subscriptions + Suggestions + %1$s, %2$s +! Support + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +--- 6284,6290 ---- + Subscriptions + Suggestions + %1$s, %2$s +! CutTheCord Repo + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali +*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-12-13 04:52:12.150319258 +0000 +--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 78,84 **** + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://discord.com/app" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +--- 78,84 ---- + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali +*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-12-13 04:52:13.002126047 +0000 +--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 63,69 **** + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://support.discord.com" + + const/4 v3, 0x0 + +--- 63,69 ---- + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://gitdab.com/distok/cutthecord" + + const/4 v3, 0x0 + diff --git a/patches/branding/1362.patch b/patches/branding/1362.patch new file mode 100644 index 0000000..00a8e73 --- /dev/null +++ b/patches/branding/1362.patch @@ -0,0 +1,239 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-13 04:52:28.739956117 +0000 +--- to/AndroidManifest.xml 2020-12-13 04:54:05.662206425 +0000 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 21,34 **** + + + +! + + + + + + +! + + + +--- 21,34 ---- + + + +! + + + + + + +! + + + +*************** +*** 132,138 **** + + + +! + + + +--- 132,138 ---- + + + +! + + + +*************** +*** 156,162 **** + + + +! + + + +--- 156,162 ---- + + + +! + + + +*************** +*** 165,171 **** + + + +! + + + +--- 165,171 ---- + + + +! + + + +*************** +*** 204,212 **** + + + +! + +! + + + +--- 204,212 ---- + + + +! + +! + + + +*************** +*** 261,264 **** + + + +! +\ No newline at end of file +--- 261,264 ---- + + + +! +diff -crB from/apktool.yml to/apktool.yml +*** from/apktool.yml 2020-12-13 04:52:14.199873942 +0000 +--- to/apktool.yml 2020-12-13 04:54:05.662206425 +0000 +*************** +*** 82,86 **** + tag: null + version: 2.4.2-f3136b-SNAPSHOT + versionInfo: +! versionCode: '1362' +! versionName: '54.0' +--- 82,86 ---- + tag: null + version: 2.4.2-f3136b-SNAPSHOT + versionInfo: +! versionCode: '1362CTCBUILD' +! versionName: '54.0-cutthecord-CTCBUILD' +diff -crB from/res/values/strings.xml to/res/values/strings.xml +*** from/res/values/strings.xml 2020-12-13 04:52:10.608696354 +0000 +--- to/res/values/strings.xml 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 1650,1656 **** + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! Discord + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +--- 1650,1656 ---- + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! CTCNAME + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +*************** +*** 4619,4625 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Notifications + Notifications, muted +--- 4619,4625 ---- + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! CTCNAME + "Somebody Playin'" + Notifications + Notifications, muted +*************** +*** 6284,6290 **** + Subscriptions + Suggestions + %1$s, %2$s +! Support + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +--- 6284,6290 ---- + Subscriptions + Suggestions + %1$s, %2$s +! CutTheCord Repo + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali +*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-12-13 04:52:12.150319258 +0000 +--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 78,84 **** + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://discord.com/app" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +--- 78,84 ---- + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali +*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-12-13 04:52:13.002126047 +0000 +--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 63,69 **** + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://support.discord.com" + + const/4 v3, 0x0 + +--- 63,69 ---- + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://gitdab.com/distok/cutthecord" + + const/4 v3, 0x0 + diff --git a/patches/branding/1365.patch b/patches/branding/1365.patch new file mode 100644 index 0000000..899aa17 --- /dev/null +++ b/patches/branding/1365.patch @@ -0,0 +1,239 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-13 04:52:28.739956117 +0000 +--- to/AndroidManifest.xml 2020-12-13 04:54:05.662206425 +0000 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 21,34 **** + + + +! + + + + + + +! + + + +--- 21,34 ---- + + + +! + + + + + + +! + + + +*************** +*** 132,138 **** + + + +! + + + +--- 132,138 ---- + + + +! + + + +*************** +*** 156,162 **** + + + +! + + + +--- 156,162 ---- + + + +! + + + +*************** +*** 165,171 **** + + + +! + + + +--- 165,171 ---- + + + +! + + + +*************** +*** 204,212 **** + + + +! + +! + + + +--- 204,212 ---- + + + +! + +! + + + +*************** +*** 261,264 **** + + + +! +\ No newline at end of file +--- 261,264 ---- + + + +! +diff -crB from/apktool.yml to/apktool.yml +*** from/apktool.yml 2020-12-13 04:52:14.199873942 +0000 +--- to/apktool.yml 2020-12-13 04:54:05.662206425 +0000 +*************** +*** 82,86 **** + tag: null + version: 2.4.2-f3136b-SNAPSHOT + versionInfo: +! versionCode: '1365' +! versionName: '53.6' +--- 82,86 ---- + tag: null + version: 2.4.2-f3136b-SNAPSHOT + versionInfo: +! versionCode: '1365CTCBUILD' +! versionName: '53.6-cutthecord-CTCBUILD' +diff -crB from/res/values/strings.xml to/res/values/strings.xml +*** from/res/values/strings.xml 2020-12-13 04:52:10.608696354 +0000 +--- to/res/values/strings.xml 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 1650,1656 **** + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! Discord + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +--- 1650,1656 ---- + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! CTCNAME + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +*************** +*** 4619,4625 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Notifications + Notifications, muted +--- 4619,4625 ---- + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! CTCNAME + "Somebody Playin'" + Notifications + Notifications, muted +*************** +*** 6284,6290 **** + Subscriptions + Suggestions + %1$s, %2$s +! Support + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +--- 6284,6290 ---- + Subscriptions + Suggestions + %1$s, %2$s +! CutTheCord Repo + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali +*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-12-13 04:52:12.150319258 +0000 +--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 78,84 **** + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://discord.com/app" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +--- 78,84 ---- + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali +*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-12-13 04:52:13.002126047 +0000 +--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 63,69 **** + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://support.discord.com" + + const/4 v3, 0x0 + +--- 63,69 ---- + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://gitdab.com/distok/cutthecord" + + const/4 v3, 0x0 + diff --git a/patches/branding/1367.patch b/patches/branding/1367.patch new file mode 100644 index 0000000..ab46d7f --- /dev/null +++ b/patches/branding/1367.patch @@ -0,0 +1,239 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2020-12-13 04:52:28.739956117 +0000 +--- to/AndroidManifest.xml 2020-12-13 04:54:05.662206425 +0000 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 21,34 **** + + + +! + + + + + + +! + + + +--- 21,34 ---- + + + +! + + + + + + +! + + + +*************** +*** 132,138 **** + + + +! + + + +--- 132,138 ---- + + + +! + + + +*************** +*** 156,162 **** + + + +! + + + +--- 156,162 ---- + + + +! + + + +*************** +*** 165,171 **** + + + +! + + + +--- 165,171 ---- + + + +! + + + +*************** +*** 204,212 **** + + + +! + +! + + + +--- 204,212 ---- + + + +! + +! + + + +*************** +*** 261,264 **** + + + +! +\ No newline at end of file +--- 261,264 ---- + + + +! +diff -crB from/apktool.yml to/apktool.yml +*** from/apktool.yml 2020-12-13 04:52:14.199873942 +0000 +--- to/apktool.yml 2020-12-13 04:54:05.662206425 +0000 +*************** +*** 82,86 **** + tag: null + version: 2.4.2-f3136b-SNAPSHOT + versionInfo: +! versionCode: '1367' +! versionName: '53.8' +--- 82,86 ---- + tag: null + version: 2.4.2-f3136b-SNAPSHOT + versionInfo: +! versionCode: '1367CTCBUILD' +! versionName: '53.8-cutthecord-CTCBUILD' +diff -crB from/res/values/strings.xml to/res/values/strings.xml +*** from/res/values/strings.xml 2020-12-13 04:52:10.608696354 +0000 +--- to/res/values/strings.xml 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 1650,1656 **** + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! Discord + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +--- 1650,1656 ---- + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! CTCNAME + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +*************** +*** 4619,4625 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Notifications + Notifications, muted +--- 4619,4625 ---- + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! CTCNAME + "Somebody Playin'" + Notifications + Notifications, muted +*************** +*** 6284,6290 **** + Subscriptions + Suggestions + %1$s, %2$s +! Support + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +--- 6284,6290 ---- + Subscriptions + Suggestions + %1$s, %2$s +! CutTheCord Repo + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali +*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-12-13 04:52:12.150319258 +0000 +--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 78,84 **** + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://discord.com/app" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +--- 78,84 ---- + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali +*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-12-13 04:52:13.002126047 +0000 +--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2020-12-13 04:54:05.664206907 +0000 +*************** +*** 63,69 **** + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://support.discord.com" + + const/4 v3, 0x0 + +--- 63,69 ---- + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://gitdab.com/distok/cutthecord" + + const/4 v3, 0x0 + diff --git a/patches/branding/1368.patch b/patches/branding/1368.patch new file mode 100644 index 0000000..c4b5538 --- /dev/null +++ b/patches/branding/1368.patch @@ -0,0 +1,239 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2021-01-05 01:57:20.951907000 -0500 +--- to/AndroidManifest.xml 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 21,34 **** + + + +! + + + + + + +! + + + +--- 21,34 ---- + + + +! + + + + + + +! + + + +*************** +*** 132,138 **** + + + +! + + + +--- 132,138 ---- + + + +! + + + +*************** +*** 156,162 **** + + + +! + + + +--- 156,162 ---- + + + +! + + + +*************** +*** 165,171 **** + + + +! + + + +--- 165,171 ---- + + + +! + + + +*************** +*** 204,212 **** + + + +! + +! + + + +--- 204,212 ---- + + + +! + +! + + + +*************** +*** 261,264 **** + + + +! +\ No newline at end of file +--- 261,264 ---- + + + +! +diff -crB from/apktool.yml to/apktool.yml +*** from/apktool.yml 2021-01-05 00:52:08.987558100 -0500 +--- to/apktool.yml 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 82,86 **** + tag: null + version: 2.5.1-e25c0f-SNAPSHOT + versionInfo: +! versionCode: '1368' +! versionName: '54.0' +--- 82,86 ---- + tag: null + version: 2.5.1-e25c0f-SNAPSHOT + versionInfo: +! versionCode: '1368CTCBUILD' +! versionName: '54.0-cutthecord-CTCBUILD' +diff -crB from/res/values/strings.xml to/res/values/strings.xml +*** from/res/values/strings.xml 2021-01-05 00:48:45.334596200 -0500 +--- to/res/values/strings.xml 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 1626,1632 **** + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! Discord + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +--- 1626,1632 ---- + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! CTCNAME + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +*************** +*** 4637,4643 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Notifications + Notifications, muted +--- 4637,4643 ---- + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! CTCNAME + "Somebody Playin'" + Notifications + Notifications, muted +*************** +*** 6394,6400 **** + Subscriptions + Suggestions + %1$s, %2$s +! Support + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +--- 6394,6400 ---- + Subscriptions + Suggestions + %1$s, %2$s +! CutTheCord Repo + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali +*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2021-01-05 00:49:39.819431100 -0500 +--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 78,84 **** + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://discord.com/app" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +--- 78,84 ---- + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali +*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2021-01-05 00:50:28.766751400 -0500 +--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 63,69 **** + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://support.discord.com" + + const/4 v3, 0x0 + +--- 63,69 ---- + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://gitdab.com/distok/cutthecord" + + const/4 v3, 0x0 + diff --git a/patches/branding/1370.patch b/patches/branding/1370.patch new file mode 100644 index 0000000..75036e0 --- /dev/null +++ b/patches/branding/1370.patch @@ -0,0 +1,239 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2021-01-05 01:57:20.951907000 -0500 +--- to/AndroidManifest.xml 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 21,34 **** + + + +! + + + + + + +! + + + +--- 21,34 ---- + + + +! + + + + + + +! + + + +*************** +*** 132,138 **** + + + +! + + + +--- 132,138 ---- + + + +! + + + +*************** +*** 156,162 **** + + + +! + + + +--- 156,162 ---- + + + +! + + + +*************** +*** 165,171 **** + + + +! + + + +--- 165,171 ---- + + + +! + + + +*************** +*** 204,212 **** + + + +! + +! + + + +--- 204,212 ---- + + + +! + +! + + + +*************** +*** 261,264 **** + + + +! +\ No newline at end of file +--- 261,264 ---- + + + +! +diff -crB from/apktool.yml to/apktool.yml +*** from/apktool.yml 2021-01-05 00:52:08.987558100 -0500 +--- to/apktool.yml 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 82,86 **** + tag: null + version: 2.5.1-e25c0f-SNAPSHOT + versionInfo: +! versionCode: '1370' +! versionName: '55.1' +--- 82,86 ---- + tag: null + version: 2.5.1-e25c0f-SNAPSHOT + versionInfo: +! versionCode: '1370CTCBUILD' +! versionName: '55.1-cutthecord-CTCBUILD' +diff -crB from/res/values/strings.xml to/res/values/strings.xml +*** from/res/values/strings.xml 2021-01-05 00:48:45.334596200 -0500 +--- to/res/values/strings.xml 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 1626,1632 **** + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! Discord + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +--- 1626,1632 ---- + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! CTCNAME + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +*************** +*** 4637,4643 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Notifications + Notifications, muted +--- 4637,4643 ---- + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! CTCNAME + "Somebody Playin'" + Notifications + Notifications, muted +*************** +*** 6394,6400 **** + Subscriptions + Suggestions + %1$s, %2$s +! Support + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +--- 6394,6400 ---- + Subscriptions + Suggestions + %1$s, %2$s +! CutTheCord Repo + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali +*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2021-01-05 00:49:39.819431100 -0500 +--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 78,84 **** + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://discord.com/app" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +--- 78,84 ---- + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali +*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2021-01-05 00:50:28.766751400 -0500 +--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 63,69 **** + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://support.discord.com" + + const/4 v3, 0x0 + +--- 63,69 ---- + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://gitdab.com/distok/cutthecord" + + const/4 v3, 0x0 + diff --git a/patches/branding/1371.patch b/patches/branding/1371.patch new file mode 100644 index 0000000..4999cf6 --- /dev/null +++ b/patches/branding/1371.patch @@ -0,0 +1,239 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2021-01-05 01:57:20.951907000 -0500 +--- to/AndroidManifest.xml 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 21,34 **** + + + +! + + + + + + +! + + + +--- 21,34 ---- + + + +! + + + + + + +! + + + +*************** +*** 132,138 **** + + + +! + + + +--- 132,138 ---- + + + +! + + + +*************** +*** 156,162 **** + + + +! + + + +--- 156,162 ---- + + + +! + + + +*************** +*** 165,171 **** + + + +! + + + +--- 165,171 ---- + + + +! + + + +*************** +*** 204,212 **** + + + +! + +! + + + +--- 204,212 ---- + + + +! + +! + + + +*************** +*** 261,264 **** + + + +! +\ No newline at end of file +--- 261,264 ---- + + + +! +diff -crB from/apktool.yml to/apktool.yml +*** from/apktool.yml 2021-01-05 00:52:08.987558100 -0500 +--- to/apktool.yml 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 82,86 **** + tag: null + version: 2.5.1-e25c0f-SNAPSHOT + versionInfo: +! versionCode: '1371' +! versionName: '56.0' +--- 82,86 ---- + tag: null + version: 2.5.1-e25c0f-SNAPSHOT + versionInfo: +! versionCode: '1371CTCBUILD' +! versionName: '56.0-cutthecord-CTCBUILD' +diff -crB from/res/values/strings.xml to/res/values/strings.xml +*** from/res/values/strings.xml 2021-01-05 00:48:45.334596200 -0500 +--- to/res/values/strings.xml 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 1626,1632 **** + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! Discord + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +--- 1626,1632 ---- + Disconnect !!%1$s!! + Disconnect from Voice + User has been disconnected from voice. +! CTCNAME + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Your place to talk + discord.gg/ +*************** +*** 4637,4643 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Notifications + Notifications, muted +--- 4637,4643 ---- + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! CTCNAME + "Somebody Playin'" + Notifications + Notifications, muted +*************** +*** 6394,6400 **** + Subscriptions + Suggestions + %1$s, %2$s +! Support + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +--- 6394,6400 ---- + Subscriptions + Suggestions + %1$s, %2$s +! CutTheCord Repo + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali +*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2021-01-05 00:49:39.819431100 -0500 +--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 78,84 **** + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://discord.com/app" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +--- 78,84 ---- + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali +*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2021-01-05 00:50:28.766751400 -0500 +--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$18.smali 2021-01-05 16:44:28.410000000 -0500 +*************** +*** 63,69 **** + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://support.discord.com" + + const/4 v3, 0x0 + +--- 63,69 ---- + + invoke-static {v1, p1}, Lx/m/c/j;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://gitdab.com/distok/cutthecord" + + const/4 v3, 0x0 + diff --git a/patches/branding/78204.patch b/patches/branding/78204.patch new file mode 100644 index 0000000..152bf54 --- /dev/null +++ b/patches/branding/78204.patch @@ -0,0 +1,168 @@ +diff --color -crB com.discord-78204/AndroidManifest.xml com.discord-78204-modded/AndroidManifest.xml +*** com.discord-78204/AndroidManifest.xml 2021-06-30 15:12:22.293202928 +0300 +--- com.discord-78204-modded/AndroidManifest.xml 2021-06-30 15:10:23.549871390 +0300 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 22,28 **** + + + +! + + + +--- 22,28 ---- + + + +! + + + +*************** +*** 35,41 **** + + + +! + + + +--- 35,41 ---- + + + +! + + + +*************** +*** 143,149 **** + + + +! + + + +--- 143,149 ---- + + + +! + + + +*************** +*** 166,172 **** + + + +! + + + +--- 166,172 ---- + + + +! + + + +*************** +*** 211,219 **** + + + +! + +! + + + +--- 211,219 ---- + + + +! + +! + + + +*************** +*** 268,271 **** + + + +! +\ No newline at end of file +--- 268,271 ---- + + + +! +diff --color -crB com.discord-78204/apktool.yml com.discord-78204-modded/apktool.yml +*** com.discord-78204/apktool.yml 2021-06-30 15:12:32.186536114 +0300 +--- com.discord-78204-modded/apktool.yml 2021-06-30 15:10:40.026537802 +0300 +*************** +*** 860,864 **** + tag: null + version: 2.4.2-83a459-SNAPSHOT + versionInfo: +! versionCode: '78204' +! versionName: 78.4 - Alpha +--- 860,864 ---- + tag: null + version: 2.4.2-83a459-SNAPSHOT + versionInfo: +! versionCode: '78204CTCBUILD' +! versionName: 78.4 - Alpha-cutthecord-CTCBUILD +diff --color -crB com.discord-78204/res/values/strings.xml com.discord-78204-modded/res/values/strings.xml +*** com.discord-78204/res/values/strings.xml 2021-06-30 15:12:25.916536208 +0300 +--- com.discord-78204-modded/res/values/strings.xml 2021-06-30 15:11:59.216536608 +0300 +*************** +*** 2108,2114 **** + Disconnect + Disconnect + User has been disconnected from voice. +! Discord-Canary + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Imagine a place + discord.gg/ +--- 2108,2114 ---- + Disconnect + Disconnect + User has been disconnected from voice. +! CTCNAME + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Imagine a place + discord.gg/ +*************** +*** 5366,5372 **** + Failed to reply to {recipient} + Replied to {recipient} + Notification Settings +! Discord + "Somebody Playin'" + Notifications + Notifications, muted +--- 5366,5372 ---- + Failed to reply to {recipient} + Replied to {recipient} + Notification Settings +! CTCNAME + "Somebody Playin'" + Notifications + Notifications, muted diff --git a/patches/branding/87202.patch b/patches/branding/87202.patch new file mode 100644 index 0000000..578d277 --- /dev/null +++ b/patches/branding/87202.patch @@ -0,0 +1,212 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2021-08-04 19:44:13.386881200 +0100 +--- to/AndroidManifest.xml 2021-08-04 23:05:33.372467500 +0100 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 22,28 **** + + + +! + + + +--- 22,28 ---- + + + +! + + + +*************** +*** 35,41 **** + + + +! + + + +--- 35,41 ---- + + + +! + + + +*************** +*** 143,149 **** + + + +! + + + +--- 143,149 ---- + + + +! + + + +*************** +*** 166,172 **** + + + +! + + + +--- 166,172 ---- + + + +! + + + +*************** +*** 210,218 **** + + + +! + +! + + + +--- 210,218 ---- + + + +! + +! + + + +diff -crB from/apktool.yml to/apktool.yml +*** from/apktool.yml 2021-08-04 19:47:51.922495900 +0100 +--- to/apktool.yml 2021-08-04 23:19:20.589588900 +0100 +*************** +*** 860,864 **** + tag: null + version: 2.5.1-e25c0f-SNAPSHOT + versionInfo: +! versionCode: '87202' +! versionName: 87.2 - Alpha +--- 860,864 ---- + tag: null + version: 2.5.1-e25c0f-SNAPSHOT + versionInfo: +! versionCode: '87202CTCBUILD' +! versionName: 87.2-cutthecord-CTCBUILD +diff -crB from/res/values/strings.xml to/res/values/strings.xml +*** from/res/values/strings.xml 2021-08-04 19:45:07.324879100 +0100 +--- to/res/values/strings.xml 2021-08-04 23:10:01.984080100 +0100 +*************** +*** 2119,2125 **** + Disconnect + Disconnect + User has been disconnected from voice. +! Discord-Canary + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Imagine a place + discord.gg/ +--- 2119,2125 ---- + Disconnect + Disconnect + User has been disconnected from voice. +! CTCNAME + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Imagine a place + discord.gg/ +*************** +*** 5802,5808 **** + Failed to reply to {recipient} + Replied to {recipient} + Notification Settings +! Discord + "Somebody Playin'" + Notifications + Notifications, muted +--- 5802,5808 ---- + Failed to reply to {recipient} + Replied to {recipient} + Notification Settings +! CTCNAME + "Somebody Playin'" + Notifications + Notifications, muted +*************** +*** 8036,8042 **** + Suggested languages + Suggestions + %1$s, %2$s +! Support + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +--- 8036,8042 ---- + Suggested languages + Suggestions + %1$s, %2$s +! CutTheCord Repo + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +diff -crB from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali +*** from/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2021-08-04 19:45:49.664874800 +0100 +--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2021-08-04 23:10:50.091576100 +0100 +*************** +*** 104,110 **** + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://discord.com/app" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +--- 104,110 ---- + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +diff -crB from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$1$21.smali to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$1$21.smali +*** from/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$1$21.smali 2021-08-04 19:46:33.436376300 +0100 +--- to/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$1$21.smali 2021-08-04 23:13:23.464566700 +0100 +*************** +*** 89,95 **** + + invoke-static {v1, p1}, Ld0/z/d/m;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://support.discord.com" + + const/4 v3, 0x0 + +--- 89,95 ---- + + invoke-static {v1, p1}, Ld0/z/d/m;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://gitdab.com/distok/cutthecord" + + const/4 v3, 0x0 diff --git a/patches/branding/README.md b/patches/branding/README.md index 91dc5ff..129a50e 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -100,13 +100,13 @@ You can use the following line to patch authorities: - 11.0 - 11.4 - 11.5 -- 12.0-alpha1 - 11.7 +- 12.0-alpha1 - 12.1 - 12.2 - 12.3 -- 13-alpha1 - 12.5 +- 13-alpha1 - 14-alpha2 - 14-alpha3 - 14.0 @@ -115,68 +115,24 @@ You can use the following line to patch authorities: - 16 - 17.0 - 18.0-alpha1 -- 18.0-alpha9 - 18.0-alpha11 - 18.0-alpha12 +- 18.0-alpha9 - 19.0 - 20-alpha1 - 21-alpha2 -- 22-alpha1 - 21.3 -- 22-alpha3-alpha1 -- 16 -- 17.0 -- 18.0-alpha1 -- 18.0-alpha9 -- 18.0-alpha11 -- 18.0-alpha12 -- 19.0 -- 20-alpha1 -- 21-alpha2 - 22-alpha1 -- 21.3 -- 22-alpha3-alpha4 -- 16 -- 17.0 -- 18.0-alpha1 -- 18.0-alpha9 -- 18.0-alpha11 -- 18.0-alpha12 -- 19.0 -- 20-alpha1 -- 21-alpha2 -- 22-alpha1 -- 21.3 -- 22-alpha3-alpha6 -- 16 -- 17.0 -- 18.0-alpha1 -- 18.0-alpha9 -- 18.0-alpha11 -- 18.0-alpha12 -- 19.0 -- 20-alpha1 -- 21-alpha2 -- 22-alpha1 -- 21.3 -- 22-alpha3-alpha7 -- 16 -- 17.0 -- 18.0-alpha1 -- 18.0-alpha9 -- 18.0-alpha11 -- 18.0-alpha12 -- 19.0 -- 20-alpha1 -- 21-alpha2 -- 22-alpha1 -- 21.3 - 22-alpha3 +- 22-alpha3-alpha1 +- 22-alpha3-alpha4 +- 22-alpha3-alpha6 +- 22-alpha3-alpha7 - 22.4 - 22.5 - 23.0 -- 24-alpha2 - 24 +- 24-alpha2 - 28-alpha2 - 28.1 - 29-alpha1 @@ -215,9 +171,16 @@ You can use the following line to patch authorities: - 48.1 - 48.2 - 49.1 -- 49.2 -- 49.8 - 49.10 - 49.12 - 49.13 - +- 49.2 +- 49.8 +- 52.3 +- 53.0 +- 53.1 +- 53.3 +- 54.0 +- 55.1 +- 56.0 +- 78.4 - Alpha diff --git a/patches/customtheme/1355.patch b/patches/customtheme/1355.patch new file mode 100644 index 0000000..bde3fa9 --- /dev/null +++ b/patches/customtheme/1355.patch @@ -0,0 +1,391 @@ +diff -crB from/res/drawable/drawable_bg_corners_20dp.xml to/res/drawable/drawable_bg_corners_20dp.xml +*** from/res/drawable/drawable_bg_corners_20dp.xml 2020-12-10 17:59:04.751813759 +0000 +--- to/res/drawable/drawable_bg_corners_20dp.xml 2020-12-10 18:12:27.204983526 +0000 +*************** +*** 1,6 **** + + +! + + +\ No newline at end of file +--- 1,6 ---- + + +! + + +\ No newline at end of file +diff -crB from/res/drawable/drawable_circle_black.xml to/res/drawable/drawable_circle_black.xml +*** from/res/drawable/drawable_circle_black.xml 2020-12-10 17:59:03.025793888 +0000 +--- to/res/drawable/drawable_circle_black.xml 2020-12-10 18:12:27.204983526 +0000 +*************** +*** 1,5 **** + + +! + +\ No newline at end of file +--- 1,5 ---- + + +! + +\ No newline at end of file +diff -crB from/res/drawable/drawable_overlay_channels_active_dark.xml to/res/drawable/drawable_overlay_channels_active_dark.xml +*** from/res/drawable/drawable_overlay_channels_active_dark.xml 2020-12-10 17:59:04.073805954 +0000 +--- to/res/drawable/drawable_overlay_channels_active_dark.xml 2020-12-10 18:12:27.204983526 +0000 +*************** +*** 3,9 **** + xmlns:android="http://schemas.android.com/apk/res/android"> + + +! + + + +--- 3,9 ---- + xmlns:android="http://schemas.android.com/apk/res/android"> + + +! + + + +diff -crB from/res/layout/widget_chat_input.xml to/res/layout/widget_chat_input.xml +*** from/res/layout/widget_chat_input.xml 2020-12-10 17:59:04.749813737 +0000 +--- to/res/layout/widget_chat_input.xml 2020-12-10 18:13:03.941401392 +0000 +*************** +*** 7,13 **** + + + +! + + + +--- 7,13 ---- + + + +! + + + +*************** +*** 17,20 **** + + + +! +\ No newline at end of file +--- 17,20 ---- + + + +! +diff -crB from/res/values/colors.xml to/res/values/colors.xml +*** from/res/values/colors.xml 2020-12-10 17:59:05.913827138 +0000 +--- to/res/values/colors.xml 2020-12-10 18:15:30.087062907 +0000 +*************** +*** 107,116 **** + #1f000000 + #90000000 + #de000000 +! #ff36393e +! #ff303337 + #14000000 +! #ff121212 + #ffcf6679 + #ffffffff + #ff000000 +--- 107,116 ---- + #1f000000 + #90000000 + #de000000 +! #ff000000 +! #ff000000 + #14000000 +! #ff000000 + #ffcf6679 + #ffffffff + #ff000000 +*************** +*** 122,128 **** + #ff3700b3 + #ff03dac6 + #ff03dac6 +! #ff121212 + #ffffffff + #ffb00020 + #ff000000 +--- 122,128 ---- + #ff3700b3 + #ff03dac6 + #ff03dac6 +! #ff000000 + #ffffffff + #ffb00020 + #ff000000 +*************** +*** 171,178 **** + #4d737f8d + #ff949494 + #0d4f545c +! #ff282b30 +! #ff8a8e94 + #6680cbc4 + #66009688 + #ff9c84ef +--- 171,178 ---- + #4d737f8d + #ff949494 + #0d4f545c +! #ff000000 +! #ff000000 + #6680cbc4 + #66009688 + #ff9c84ef +*************** +*** 182,188 **** + #ff45ddc0 + #ff45ddc0 + #ff021f25 +! #ff00b0f4 + #fff2fbfe + #ffe8f8fe + #ffdaf4fd +--- 182,188 ---- + #ff45ddc0 + #ff45ddc0 + #ff021f25 +! #ff50f148 + #fff2fbfe + #ffe8f8fe + #ffdaf4fd +*************** +*** 294,315 **** + #ff72767d + #4d72767d + #9972767d +! #ff4f545c +! #334f545c +! #4d4f545c +! #514f545c +! #994f545c + #ff40444b +! #ff36393f +! #9936393f +! #ff2f3136 +! #992f3136 +! #e62f3136 +! #ff292b2f +! #e6292b2f +! #ff202225 +! #80202225 +! #99202225 + #ff18191c + #8018191c + #9918191c +--- 294,315 ---- + #ff72767d + #4d72767d + #9972767d +! #ff333333 +! #330f0f0f +! #4d0f0f0f +! #510f0f0f +! #990f0f0f + #ff40444b +! #ff000000 +! #99000000 +! #ff000000 +! #99000000 +! #e6000000 +! #ff000000 +! #e6000000 +! #ff000000 +! #80000000 +! #990f0f0f + #ff18191c + #8018191c + #9918191c +*************** +*** 334,343 **** + #ff4f545c + #ff484c54 + #ff40444b +! #ff36393f +! #ff2f3136 + #ff292b2f +! #ff202225 + #ff1e1f22 + #ff1b1d20 + #ff18191c +--- 334,343 ---- + #ff4f545c + #ff484c54 + #ff40444b +! #ff000000 +! #ff000000 + #ff292b2f +! #ff000000 + #ff1e1f22 + #ff1b1d20 + #ff18191c +*************** +*** 381,389 **** + #de000000 + #4dffffff + #39000000 +! #ff738bd7 +! #1a738bd7 +! #ff697ec4 + #ffc9d2f0 + #ff5161ff + #4d5c6a9e +--- 381,389 ---- + #de000000 + #4dffffff + #39000000 +! #ff9c4249 +! #1a9c4249 +! #ff000000 + #ffc9d2f0 + #ff5161ff + #4d5c6a9e +*************** +*** 518,524 **** + #ffbdbdbd + #ffbdbdbd + #fff1f1f1 +! #e6616161 + #e6ffffff + @android:color/transparent + #ff593695 +--- 518,524 ---- + #ffbdbdbd + #ffbdbdbd + #fff1f1f1 +! #e6000000 + #e6ffffff + @android:color/transparent + #ff593695 +diff -crB from/res/values/styles.xml to/res/values/styles.xml +*** from/res/values/styles.xml 2020-12-10 17:59:05.953827597 +0000 +--- to/res/values/styles.xml 2020-12-10 18:12:27.206983549 +0000 +*************** +*** 424,430 **** + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp + @color/primary_500 +! #ff34373c + @color/grey_unread + @color/primary_630 + @color/grey_account +--- 424,430 ---- + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp + @color/primary_500 +! @color/primary_500 + @color/grey_unread + @color/primary_630 + @color/grey_account +*************** +*** 440,446 **** + #1afaa61a + @drawable/drawable_bg_reaction_dark + @drawable/drawable_reaction_text_color_dark +! @color/primary_700 + @color/white_alpha_10 + @color/primary_600 + @drawable/img_empty_server_settings_emoji_dark +--- 440,446 ---- + #1afaa61a + @drawable/drawable_bg_reaction_dark + @drawable/drawable_reaction_text_color_dark +! @color/primary_500 + @color/white_alpha_10 + @color/primary_600 + @drawable/img_empty_server_settings_emoji_dark +*************** +*** 679,688 **** + #ffe5e5e5 + @drawable/ic_img_selected_light_theme + @color/purple_brand +! #33faa61a + @drawable/drawable_bg_reaction_light + @drawable/drawable_reaction_text_color_light +! @color/primary_300 + @color/black_alpha_10 + @color/primary_300 + @drawable/img_empty_server_settings_emoji_light +--- 679,688 ---- + #ffe5e5e5 + @drawable/ic_img_selected_light_theme + @color/purple_brand +! @color/purple_brand_alpha_10 + @drawable/drawable_bg_reaction_light + @drawable/drawable_reaction_text_color_light +! @color/primary_500 + @color/black_alpha_10 + @color/primary_300 + @drawable/img_empty_server_settings_emoji_light +*************** +*** 786,792 **** + @color/brand_500 + @color/primary_100 + @color/primary_600 +! #ff2b2e31 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +