diff --git a/README.md b/README.md index cf663dc97..ece783e57 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Modular Client Mod for Discord's Android app. -**Latest supported Discord Android version:** 9.8.0 (980), released on 2019-10-31. +**Latest supported Discord Android version:** 9.8.4 (984), released on 2019-11-14. New patch development will be done for the latest supported version. diff --git a/old-patches/README.md b/old-patches/README.md index e9790219f..bd6a6c3da 100644 --- a/old-patches/README.md +++ b/old-patches/README.md @@ -5,3 +5,5 @@ This folder contains old patches. Here's why these patches are no longer maintained in this form: - nohiddenchannels: Moved into slashcommands as a slash command - notyping: Moved into slashcommands as a slash command +- pureevil: It's now upstream (yay.) +- compact: It's just a pain to maintain. diff --git a/patches/compact/835.patch b/old-patches/compact/835.patch similarity index 100% rename from patches/compact/835.patch rename to old-patches/compact/835.patch diff --git a/patches/compact/836.patch b/old-patches/compact/836.patch similarity index 100% rename from patches/compact/836.patch rename to old-patches/compact/836.patch diff --git a/patches/compact/839.patch b/old-patches/compact/839.patch similarity index 100% rename from patches/compact/839.patch rename to old-patches/compact/839.patch diff --git a/patches/compact/841.patch b/old-patches/compact/841.patch similarity index 100% rename from patches/compact/841.patch rename to old-patches/compact/841.patch diff --git a/patches/compact/842.patch b/old-patches/compact/842.patch similarity index 100% rename from patches/compact/842.patch rename to old-patches/compact/842.patch diff --git a/patches/compact/843.patch b/old-patches/compact/843.patch similarity index 100% rename from patches/compact/843.patch rename to old-patches/compact/843.patch diff --git a/patches/compact/844.patch b/old-patches/compact/844.patch similarity index 100% rename from patches/compact/844.patch rename to old-patches/compact/844.patch diff --git a/patches/compact/845.patch b/old-patches/compact/845.patch similarity index 100% rename from patches/compact/845.patch rename to old-patches/compact/845.patch diff --git a/patches/compact/848.patch b/old-patches/compact/848.patch similarity index 100% rename from patches/compact/848.patch rename to old-patches/compact/848.patch diff --git a/patches/compact/850.patch b/old-patches/compact/850.patch similarity index 100% rename from patches/compact/850.patch rename to old-patches/compact/850.patch diff --git a/patches/compact/851.patch b/old-patches/compact/851.patch similarity index 100% rename from patches/compact/851.patch rename to old-patches/compact/851.patch diff --git a/patches/compact/853.patch b/old-patches/compact/853.patch similarity index 100% rename from patches/compact/853.patch rename to old-patches/compact/853.patch diff --git a/patches/compact/854.patch b/old-patches/compact/854.patch similarity index 100% rename from patches/compact/854.patch rename to old-patches/compact/854.patch diff --git a/patches/compact/855.patch b/old-patches/compact/855.patch similarity index 100% rename from patches/compact/855.patch rename to old-patches/compact/855.patch diff --git a/patches/compact/856.patch b/old-patches/compact/856.patch similarity index 100% rename from patches/compact/856.patch rename to old-patches/compact/856.patch diff --git a/patches/compact/876.patch b/old-patches/compact/876.patch similarity index 100% rename from patches/compact/876.patch rename to old-patches/compact/876.patch diff --git a/patches/compact/884.patch b/old-patches/compact/884.patch similarity index 100% rename from patches/compact/884.patch rename to old-patches/compact/884.patch diff --git a/patches/compact/888.patch b/old-patches/compact/888.patch similarity index 100% rename from patches/compact/888.patch rename to old-patches/compact/888.patch diff --git a/patches/compact/896.patch b/old-patches/compact/896.patch similarity index 100% rename from patches/compact/896.patch rename to old-patches/compact/896.patch diff --git a/patches/compact/897.patch b/old-patches/compact/897.patch similarity index 100% rename from patches/compact/897.patch rename to old-patches/compact/897.patch diff --git a/patches/compact/898.patch b/old-patches/compact/898.patch similarity index 100% rename from patches/compact/898.patch rename to old-patches/compact/898.patch diff --git a/patches/compact/899.patch b/old-patches/compact/899.patch similarity index 100% rename from patches/compact/899.patch rename to old-patches/compact/899.patch diff --git a/patches/compact/900.patch b/old-patches/compact/900.patch similarity index 100% rename from patches/compact/900.patch rename to old-patches/compact/900.patch diff --git a/patches/compact/901.patch b/old-patches/compact/901.patch similarity index 100% rename from patches/compact/901.patch rename to old-patches/compact/901.patch diff --git a/patches/compact/902.patch b/old-patches/compact/902.patch similarity index 100% rename from patches/compact/902.patch rename to old-patches/compact/902.patch diff --git a/patches/compact/903.patch b/old-patches/compact/903.patch similarity index 100% rename from patches/compact/903.patch rename to old-patches/compact/903.patch diff --git a/patches/compact/904.patch b/old-patches/compact/904.patch similarity index 100% rename from patches/compact/904.patch rename to old-patches/compact/904.patch diff --git a/patches/compact/906.patch b/old-patches/compact/906.patch similarity index 100% rename from patches/compact/906.patch rename to old-patches/compact/906.patch diff --git a/patches/compact/909.patch b/old-patches/compact/909.patch similarity index 100% rename from patches/compact/909.patch rename to old-patches/compact/909.patch diff --git a/patches/compact/910.patch b/old-patches/compact/910.patch similarity index 100% rename from patches/compact/910.patch rename to old-patches/compact/910.patch diff --git a/patches/compact/938.patch b/old-patches/compact/938.patch similarity index 100% rename from patches/compact/938.patch rename to old-patches/compact/938.patch diff --git a/patches/compact/939.patch b/old-patches/compact/939.patch similarity index 100% rename from patches/compact/939.patch rename to old-patches/compact/939.patch diff --git a/patches/compact/940.patch b/old-patches/compact/940.patch similarity index 100% rename from patches/compact/940.patch rename to old-patches/compact/940.patch diff --git a/patches/compact/942.patch b/old-patches/compact/942.patch similarity index 100% rename from patches/compact/942.patch rename to old-patches/compact/942.patch diff --git a/patches/compact/943.patch b/old-patches/compact/943.patch similarity index 100% rename from patches/compact/943.patch rename to old-patches/compact/943.patch diff --git a/patches/compact/945.patch b/old-patches/compact/945.patch similarity index 100% rename from patches/compact/945.patch rename to old-patches/compact/945.patch diff --git a/patches/compact/946.patch b/old-patches/compact/946.patch similarity index 100% rename from patches/compact/946.patch rename to old-patches/compact/946.patch diff --git a/patches/compact/947.patch b/old-patches/compact/947.patch similarity index 100% rename from patches/compact/947.patch rename to old-patches/compact/947.patch diff --git a/patches/compact/948.patch b/old-patches/compact/948.patch similarity index 100% rename from patches/compact/948.patch rename to old-patches/compact/948.patch diff --git a/patches/compact/963.patch b/old-patches/compact/963.patch similarity index 100% rename from patches/compact/963.patch rename to old-patches/compact/963.patch diff --git a/patches/compact/964.patch b/old-patches/compact/964.patch similarity index 100% rename from patches/compact/964.patch rename to old-patches/compact/964.patch diff --git a/patches/compact/965.patch b/old-patches/compact/965.patch similarity index 100% rename from patches/compact/965.patch rename to old-patches/compact/965.patch diff --git a/patches/compact/966.patch b/old-patches/compact/966.patch similarity index 100% rename from patches/compact/966.patch rename to old-patches/compact/966.patch diff --git a/patches/compact/967.patch b/old-patches/compact/967.patch similarity index 100% rename from patches/compact/967.patch rename to old-patches/compact/967.patch diff --git a/patches/compact/968.patch b/old-patches/compact/968.patch similarity index 100% rename from patches/compact/968.patch rename to old-patches/compact/968.patch diff --git a/patches/compact/970.patch b/old-patches/compact/970.patch similarity index 100% rename from patches/compact/970.patch rename to old-patches/compact/970.patch diff --git a/patches/compact/980.patch b/old-patches/compact/980.patch similarity index 100% rename from patches/compact/980.patch rename to old-patches/compact/980.patch diff --git a/old-patches/compact/984.patch-failed b/old-patches/compact/984.patch-failed new file mode 100644 index 000000000..21e032b36 --- /dev/null +++ b/old-patches/compact/984.patch-failed @@ -0,0 +1,78 @@ +diff -crB from/res/layout/widget_chat_list_adapter_item_text.xml to/res/layout/widget_chat_list_adapter_item_text.xml +*** from/res/layout/widget_chat_list_adapter_item_text.xml 2019-10-31 11:15:13.565789839 +0300 +--- to/res/layout/widget_chat_list_adapter_item_text.xml 2019-10-31 11:16:43.746266942 +0300 +*************** +*** 2,12 **** + + +- + + + + + +- + +\ No newline at end of file +--- 2,11 ---- + + + + + + ++ + + +\ No newline at end of file +diff -crB from/res/layout-v17/widget_chat_list_adapter_item_text.xml to/res/layout-v17/widget_chat_list_adapter_item_text.xml +*** from/res/layout-v17/widget_chat_list_adapter_item_text.xml 2019-10-31 11:15:12.369116853 +0300 +--- to/res/layout-v17/widget_chat_list_adapter_item_text.xml 2019-10-31 11:16:43.746266942 +0300 +*************** +*** 2,12 **** + + +- + + + + + +- + +\ No newline at end of file +--- 2,11 ---- + + + + + + ++ + + +\ No newline at end of file +diff -crB from/res/values/dimens.xml to/res/values/dimens.xml +*** from/res/values/dimens.xml 2019-10-31 11:15:14.162459657 +0300 +--- to/res/values/dimens.xml 2019-10-31 11:16:43.746266942 +0300 +*************** +*** 334,340 **** + 1.0dip + 96.0dip + 4.0dip +! 58.0dip + 48.0dip + 72.0dip + 3.0dip +--- 334,340 ---- + 1.0dip + 96.0dip + 4.0dip +! 20.0dip + 48.0dip + 72.0dip + 3.0dip diff --git a/patches/compact/README.md b/old-patches/compact/README.md similarity index 98% rename from patches/compact/README.md rename to old-patches/compact/README.md index 53ede9696..4b52a0a71 100644 --- a/patches/compact/README.md +++ b/old-patches/compact/README.md @@ -52,4 +52,5 @@ This patch, when combined with `smalltime` patch, emulates the "compact"/"irc" t - 9.6.8 - 9.7.0 - 9.8.0 +- 9.8.4 diff --git a/patches/pureevil/832.patch b/old-patches/pureevil/832.patch similarity index 100% rename from patches/pureevil/832.patch rename to old-patches/pureevil/832.patch diff --git a/patches/pureevil/833.patch b/old-patches/pureevil/833.patch similarity index 100% rename from patches/pureevil/833.patch rename to old-patches/pureevil/833.patch diff --git a/patches/pureevil/834.patch b/old-patches/pureevil/834.patch similarity index 100% rename from patches/pureevil/834.patch rename to old-patches/pureevil/834.patch diff --git a/patches/pureevil/835.patch b/old-patches/pureevil/835.patch similarity index 100% rename from patches/pureevil/835.patch rename to old-patches/pureevil/835.patch diff --git a/patches/pureevil/836.patch b/old-patches/pureevil/836.patch similarity index 100% rename from patches/pureevil/836.patch rename to old-patches/pureevil/836.patch diff --git a/patches/pureevil/839.patch b/old-patches/pureevil/839.patch similarity index 100% rename from patches/pureevil/839.patch rename to old-patches/pureevil/839.patch diff --git a/patches/pureevil/841.patch b/old-patches/pureevil/841.patch similarity index 100% rename from patches/pureevil/841.patch rename to old-patches/pureevil/841.patch diff --git a/patches/pureevil/842.patch b/old-patches/pureevil/842.patch similarity index 100% rename from patches/pureevil/842.patch rename to old-patches/pureevil/842.patch diff --git a/patches/pureevil/843.patch b/old-patches/pureevil/843.patch similarity index 100% rename from patches/pureevil/843.patch rename to old-patches/pureevil/843.patch diff --git a/patches/pureevil/844.patch b/old-patches/pureevil/844.patch similarity index 100% rename from patches/pureevil/844.patch rename to old-patches/pureevil/844.patch diff --git a/patches/pureevil/845.patch b/old-patches/pureevil/845.patch similarity index 100% rename from patches/pureevil/845.patch rename to old-patches/pureevil/845.patch diff --git a/patches/pureevil/848.patch b/old-patches/pureevil/848.patch similarity index 100% rename from patches/pureevil/848.patch rename to old-patches/pureevil/848.patch diff --git a/patches/pureevil/850.patch b/old-patches/pureevil/850.patch similarity index 100% rename from patches/pureevil/850.patch rename to old-patches/pureevil/850.patch diff --git a/patches/pureevil/851.patch b/old-patches/pureevil/851.patch similarity index 100% rename from patches/pureevil/851.patch rename to old-patches/pureevil/851.patch diff --git a/patches/pureevil/853.patch b/old-patches/pureevil/853.patch similarity index 100% rename from patches/pureevil/853.patch rename to old-patches/pureevil/853.patch diff --git a/patches/pureevil/854.patch b/old-patches/pureevil/854.patch similarity index 100% rename from patches/pureevil/854.patch rename to old-patches/pureevil/854.patch diff --git a/patches/pureevil/855.patch b/old-patches/pureevil/855.patch similarity index 100% rename from patches/pureevil/855.patch rename to old-patches/pureevil/855.patch diff --git a/patches/pureevil/856.patch b/old-patches/pureevil/856.patch similarity index 100% rename from patches/pureevil/856.patch rename to old-patches/pureevil/856.patch diff --git a/patches/pureevil/876.patch b/old-patches/pureevil/876.patch similarity index 100% rename from patches/pureevil/876.patch rename to old-patches/pureevil/876.patch diff --git a/patches/pureevil/884.patch b/old-patches/pureevil/884.patch similarity index 100% rename from patches/pureevil/884.patch rename to old-patches/pureevil/884.patch diff --git a/patches/pureevil/888.patch b/old-patches/pureevil/888.patch similarity index 100% rename from patches/pureevil/888.patch rename to old-patches/pureevil/888.patch diff --git a/patches/pureevil/896.patch b/old-patches/pureevil/896.patch similarity index 100% rename from patches/pureevil/896.patch rename to old-patches/pureevil/896.patch diff --git a/patches/pureevil/897.patch b/old-patches/pureevil/897.patch similarity index 100% rename from patches/pureevil/897.patch rename to old-patches/pureevil/897.patch diff --git a/patches/pureevil/898.patch b/old-patches/pureevil/898.patch similarity index 100% rename from patches/pureevil/898.patch rename to old-patches/pureevil/898.patch diff --git a/patches/pureevil/899.patch b/old-patches/pureevil/899.patch similarity index 100% rename from patches/pureevil/899.patch rename to old-patches/pureevil/899.patch diff --git a/patches/pureevil/900.patch b/old-patches/pureevil/900.patch similarity index 100% rename from patches/pureevil/900.patch rename to old-patches/pureevil/900.patch diff --git a/patches/pureevil/901.patch b/old-patches/pureevil/901.patch similarity index 100% rename from patches/pureevil/901.patch rename to old-patches/pureevil/901.patch diff --git a/patches/pureevil/902.patch b/old-patches/pureevil/902.patch similarity index 100% rename from patches/pureevil/902.patch rename to old-patches/pureevil/902.patch diff --git a/patches/pureevil/903.patch b/old-patches/pureevil/903.patch similarity index 100% rename from patches/pureevil/903.patch rename to old-patches/pureevil/903.patch diff --git a/patches/pureevil/904.patch b/old-patches/pureevil/904.patch similarity index 100% rename from patches/pureevil/904.patch rename to old-patches/pureevil/904.patch diff --git a/patches/pureevil/906.patch b/old-patches/pureevil/906.patch similarity index 100% rename from patches/pureevil/906.patch rename to old-patches/pureevil/906.patch diff --git a/patches/pureevil/909.patch b/old-patches/pureevil/909.patch similarity index 100% rename from patches/pureevil/909.patch rename to old-patches/pureevil/909.patch diff --git a/patches/pureevil/910.patch b/old-patches/pureevil/910.patch similarity index 100% rename from patches/pureevil/910.patch rename to old-patches/pureevil/910.patch diff --git a/patches/pureevil/938.patch b/old-patches/pureevil/938.patch similarity index 100% rename from patches/pureevil/938.patch rename to old-patches/pureevil/938.patch diff --git a/patches/pureevil/939.patch b/old-patches/pureevil/939.patch similarity index 100% rename from patches/pureevil/939.patch rename to old-patches/pureevil/939.patch diff --git a/patches/pureevil/940.patch b/old-patches/pureevil/940.patch similarity index 100% rename from patches/pureevil/940.patch rename to old-patches/pureevil/940.patch diff --git a/patches/pureevil/942.patch b/old-patches/pureevil/942.patch similarity index 100% rename from patches/pureevil/942.patch rename to old-patches/pureevil/942.patch diff --git a/patches/pureevil/943.patch b/old-patches/pureevil/943.patch similarity index 100% rename from patches/pureevil/943.patch rename to old-patches/pureevil/943.patch diff --git a/patches/pureevil/945.patch b/old-patches/pureevil/945.patch similarity index 100% rename from patches/pureevil/945.patch rename to old-patches/pureevil/945.patch diff --git a/patches/pureevil/946.patch b/old-patches/pureevil/946.patch similarity index 100% rename from patches/pureevil/946.patch rename to old-patches/pureevil/946.patch diff --git a/patches/pureevil/947.patch b/old-patches/pureevil/947.patch similarity index 100% rename from patches/pureevil/947.patch rename to old-patches/pureevil/947.patch diff --git a/patches/pureevil/948.patch b/old-patches/pureevil/948.patch similarity index 100% rename from patches/pureevil/948.patch rename to old-patches/pureevil/948.patch diff --git a/patches/pureevil/963.patch b/old-patches/pureevil/963.patch similarity index 100% rename from patches/pureevil/963.patch rename to old-patches/pureevil/963.patch diff --git a/patches/pureevil/964.patch b/old-patches/pureevil/964.patch similarity index 100% rename from patches/pureevil/964.patch rename to old-patches/pureevil/964.patch diff --git a/patches/pureevil/965.patch b/old-patches/pureevil/965.patch similarity index 100% rename from patches/pureevil/965.patch rename to old-patches/pureevil/965.patch diff --git a/patches/pureevil/966.patch b/old-patches/pureevil/966.patch similarity index 100% rename from patches/pureevil/966.patch rename to old-patches/pureevil/966.patch diff --git a/patches/pureevil/967.patch b/old-patches/pureevil/967.patch similarity index 100% rename from patches/pureevil/967.patch rename to old-patches/pureevil/967.patch diff --git a/patches/pureevil/968.patch b/old-patches/pureevil/968.patch similarity index 100% rename from patches/pureevil/968.patch rename to old-patches/pureevil/968.patch diff --git a/patches/pureevil/970.patch b/old-patches/pureevil/970.patch similarity index 100% rename from patches/pureevil/970.patch rename to old-patches/pureevil/970.patch diff --git a/patches/pureevil/980.patch b/old-patches/pureevil/980.patch similarity index 100% rename from patches/pureevil/980.patch rename to old-patches/pureevil/980.patch diff --git a/old-patches/pureevil/984.patch-failed b/old-patches/pureevil/984.patch-failed new file mode 100644 index 000000000..a8904a045 --- /dev/null +++ b/old-patches/pureevil/984.patch-failed @@ -0,0 +1,48 @@ +diff -crB com.discord-970-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali com.discord-970/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali +*** com.discord-970-base/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2019-10-10 08:36:54.540387242 +0300 +--- com.discord-970/smali/com/discord/widgets/settings/WidgetSettingsAppearance$Model$Companion$get$1.smali 2019-10-10 08:53:49.152282087 +0300 +*************** +*** 77,87 **** + const-string v0, "meUser" + + .line 186 +! invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V +! +! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->isStaff()Z +! +! move-result v2 + + const-string v1, "fontScale" + +--- 77,83 ---- + const-string v0, "meUser" + + .line 186 +! const/4 v2, 0x1 + + const-string v1, "fontScale" + +*************** +*** 95,105 **** + const-string p3, "isAlphaTesterOrStaff" + + .line 188 +! invoke-static {p4, p3}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V +! +! invoke-virtual {p4}, Ljava/lang/Boolean;->booleanValue()Z +! +! move-result v4 + + .line 189 + invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V +--- 91,97 ---- + const-string p3, "isAlphaTesterOrStaff" + + .line 188 +! const/4 v4, 0x1 + + .line 189 + invoke-static {p1, v0}, Lkotlin/jvm/internal/l;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V +Only in com.discord-970/smali/com/discord/widgets/settings: WidgetSettingsAppearance$Model$Companion$get$1.smali.orig +Only in com.discord-970/smali/com/discord/widgets/settings: WidgetSettingsAppearance$Model$Companion$get$1.smali.rej + diff --git a/patches/pureevil/README.md b/old-patches/pureevil/README.md similarity index 99% rename from patches/pureevil/README.md rename to old-patches/pureevil/README.md index a4a091e17..b65e9c46a 100644 --- a/patches/pureevil/README.md +++ b/old-patches/pureevil/README.md @@ -59,4 +59,5 @@ This patch enables the secret AMOLED theme (which is shit). - 9.6.8 - 9.7.0 - 9.8.0 +- 9.8.4 diff --git a/patches/README.md b/patches/README.md index b5cc33c35..dd44af5e4 100644 --- a/patches/README.md +++ b/patches/README.md @@ -27,10 +27,6 @@ After bettertm: (that's not the official logo of CutTheCord, it's simply one I have on my own branch) -- compact: Discord's compact layout, but for android. - -![Compact layout](https://elixi.re/i/nbuosbqc.png) - - customdefaultemoji: Changes default emojis, which show up in a couple places. It's uesd to insert star into the list, as many bots have starboards. - customfont: Has instructions for changing the font used. @@ -75,7 +71,6 @@ Video demonstration: https://www.youtube.com/watch?v=NMRPsAgqtWQ - nospoiler: Automatically shows all spoilers. Useful for moderation. - **notrack**: Disables most of the tracking in Discord. Included in all official branches. - nozlib: Disables zlib-stream field on wss, making it easier to parse wss communications when MITMing the app. -- pureevil: Enables a secret staff-only, half-assed AMOLED-optimized theme called "pure evil". You're recommended to use `customtheme` instead. ![Pure evil setting](https://elixi.re/i/f1e7t1y0.png) diff --git a/patches/branding/984.patch b/patches/branding/984.patch new file mode 100644 index 000000000..7d545d898 --- /dev/null +++ b/patches/branding/984.patch @@ -0,0 +1,250 @@ +diff -crB com.discord-984-base/AndroidManifest.xml com.discord-984/AndroidManifest.xml +*** com.discord-984-base/AndroidManifest.xml 2019-11-14 22:33:10.106785708 +0300 +--- com.discord-984/AndroidManifest.xml 2019-11-14 22:57:01.714687835 +0300 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 19,30 **** + + + +! + + + + +! + + + +--- 19,30 ---- + + + +! + + + + +! + + + +*************** +*** 85,91 **** + + + +! + + + +--- 85,91 ---- + + + +! + + + +*************** +*** 115,121 **** + + + +! + + + +--- 115,121 ---- + + + +! + + + +*************** +*** 141,147 **** + + + +! + + + +--- 141,147 ---- + + + +! + + + +*************** +*** 151,157 **** + + + +! + + + +--- 151,157 ---- + + + +! + + + +*************** +*** 191,199 **** + + + +! +! +! + + + +\ No newline at end of file +--- 191,199 ---- + + + +! +! +! + + + +\ No newline at end of file +Only in com.discord-984: AndroidManifest.xml.orig +Only in com.discord-984: AndroidManifest.xml.rej +diff -crB com.discord-984-base/apktool.yml com.discord-984/apktool.yml +*** com.discord-984-base/apktool.yml 2019-11-14 22:32:24.769871049 +0300 +--- com.discord-984/apktool.yml 2019-11-14 22:56:22.034448251 +0300 +*************** +*** 179,183 **** + tag: null + version: 2.4.1-197d46-SNAPSHOT + versionInfo: +! versionCode: '984' +! versionName: 9.8.4 +--- 179,183 ---- + tag: null + version: 2.4.1-197d46-SNAPSHOT + versionInfo: +! versionCode: '984CTCBUILD' +! versionName: 9.8.4-cutthecord-CTCBUILD +Only in com.discord-984: apktool.yml.orig +diff -crB com.discord-984-base/res/values/strings.xml com.discord-984/res/values/strings.xml +*** com.discord-984-base/res/values/strings.xml 2019-11-14 22:32:18.039834236 +0300 +--- com.discord-984/res/values/strings.xml 2019-11-14 22:56:41.611233120 +0300 +*************** +*** 1376,1382 **** + Disconnecting your account might remove you from servers you joined via this account. + Disconnect %1$s + Disconnect from Voice +! Discord + Free and secure chat for gamers, works on both your desktop and your phone. + Team voice & text chat + discord.gg/ +--- 1376,1382 ---- + Disconnecting your account might remove you from servers you joined via this account. + Disconnect %1$s + Disconnect from Voice +! CTCNAME + Free and secure chat for gamers, works on both your desktop and your phone. + Team voice & text chat + discord.gg/ +*************** +*** 3277,3283 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Join them: %1$s + Join the party! +--- 3277,3283 ---- + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! CTCNAME + "Somebody Playin'" + Join them: %1$s + Join the party! +*************** +*** 4590,4596 **** + Subscriptions + Suggestions + %1$s, %2$s +! Support + Remove all embeds + Suppressed + "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." +--- 4590,4596 ---- + Subscriptions + Suggestions + %1$s, %2$s +! CutTheCord Repo + Remove all embeds + Suppressed + "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." +Only in com.discord-984/res/values: strings.xml.orig +Only in com.discord-984/res/values: strings.xml.rej +diff -crB com.discord-984-base/smali/com/discord/app/e.smali com.discord-984/smali/com/discord/app/e.smali +*** com.discord-984-base/smali/com/discord/app/e.smali 2019-11-14 22:32:20.866516365 +0300 +--- com.discord-984/smali/com/discord/app/e.smali 2019-11-14 22:56:22.037781605 +0300 +*************** +*** 56,62 **** + .line 16 + sput-object v0, Lcom/discord/app/e;->uZ:Ljava/lang/String; + +! const-string v0, "https://support.discordapp.com" + + .line 18 + sput-object v0, Lcom/discord/app/e;->va:Ljava/lang/String; +--- 56,62 ---- + .line 16 + sput-object v0, Lcom/discord/app/e;->uZ:Ljava/lang/String; + +! const-string v0, "https://gitdab.com/distok/cutthecord" + + .line 18 + sput-object v0, Lcom/discord/app/e;->va:Ljava/lang/String; +Only in com.discord-984/smali/com/discord/app: e.smali.orig +diff -crB com.discord-984-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali com.discord-984/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali +*** com.discord-984-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-11-14 22:32:21.259851850 +0300 +--- com.discord-984/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-11-14 22:56:22.037781605 +0300 +*************** +*** 78,84 **** + .line 65 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://discordapp.com/app" + + .line 67 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +--- 78,84 ---- + .line 65 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" + + .line 67 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +Only in com.discord-984/smali/com/discord/utilities/captcha: CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali.orig + diff --git a/patches/branding/README.md b/patches/branding/README.md index 2586d3ea2..553c77e6b 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -68,4 +68,5 @@ You can use the following line to patch authorities: - 9.6.8 - 9.7.0 - 9.8.0 +- 9.8.4 diff --git a/patches/customdefaultemoji/984.patch b/patches/customdefaultemoji/984.patch new file mode 100644 index 000000000..eed3df5e8 --- /dev/null +++ b/patches/customdefaultemoji/984.patch @@ -0,0 +1,80 @@ +diff -crB from/smali/com/discord/stores/StoreEmoji.smali to/smali/com/discord/stores/StoreEmoji.smali +*** from/smali/com/discord/stores/StoreEmoji.smali 2019-11-14 22:32:21.079850865 +0300 +--- to/smali/com/discord/stores/StoreEmoji.smali 2019-11-14 22:33:18.846833515 +0300 +*************** +*** 103,139 **** + + const/4 v1, 0x0 + +! const-string v2, "thinking" + + aput-object v2, v0, v1 + + const/4 v1, 0x1 + +! const-string v2, "ok_hand" + + aput-object v2, v0, v1 + + const/4 v1, 0x2 + +! const-string v2, "eyes" + + aput-object v2, v0, v1 + + const/4 v1, 0x3 + +! const-string v2, "sweat_drops" + + aput-object v2, v0, v1 + + const/4 v1, 0x4 + +! const-string v2, "joy" + + aput-object v2, v0, v1 + + const/4 v1, 0x5 + +! const-string v2, "pig" + + aput-object v2, v0, v1 + +--- 103,139 ---- + + const/4 v1, 0x0 + +! const-string v2, "star" + + aput-object v2, v0, v1 + + const/4 v1, 0x1 + +! const-string v2, "thinking" + + aput-object v2, v0, v1 + + const/4 v1, 0x2 + +! const-string v2, "ok_hand" + + aput-object v2, v0, v1 + + const/4 v1, 0x3 + +! const-string v2, "eyes" + + aput-object v2, v0, v1 + + const/4 v1, 0x4 + +! const-string v2, "sweat_drops" + + aput-object v2, v0, v1 + + const/4 v1, 0x5 + +! const-string v2, "joy" + + aput-object v2, v0, v1 + diff --git a/patches/customdefaultemoji/README.md b/patches/customdefaultemoji/README.md index 4cd724682..b72f32b28 100644 --- a/patches/customdefaultemoji/README.md +++ b/patches/customdefaultemoji/README.md @@ -34,4 +34,5 @@ This patch changes default list of custom emojis. - 9.6.8 - 9.7.0 - 9.8.0 +- 9.8.4 diff --git a/patches/customtheme/984.patch b/patches/customtheme/984.patch new file mode 100644 index 000000000..a63c3d89d --- /dev/null +++ b/patches/customtheme/984.patch @@ -0,0 +1,282 @@ +diff -crB com.discord-984-base/res/drawable/drawable_overlay_channels_active.xml com.discord-984/res/drawable/drawable_overlay_channels_active.xml +*** com.discord-984-base/res/drawable/drawable_overlay_channels_active.xml 2019-11-14 22:32:16.653159985 +0300 +--- com.discord-984/res/drawable/drawable_overlay_channels_active.xml 2019-11-14 23:29:32.886839126 +0300 +*************** +*** 3,9 **** + xmlns:android="http://schemas.android.com/apk/res/android"> + + +! + + + +--- 3,9 ---- + xmlns:android="http://schemas.android.com/apk/res/android"> + + +! + + + +diff -crB com.discord-984-base/res/values/colors.xml com.discord-984/res/values/colors.xml +*** com.discord-984-base/res/values/colors.xml 2019-11-14 22:32:17.843166494 +0300 +--- com.discord-984/res/values/colors.xml 2019-11-14 23:30:04.083704396 +0300 +*************** +*** 50,56 **** + #37000000 + #ff657b83 + #ff333333 +! #ff1d1d1d + #40000000 + #40ffffff + @android:color/white +--- 50,56 ---- + #37000000 + #ff657b83 + #ff333333 +! #ff000000 + #40000000 + #40ffffff + @android:color/white +*************** +*** 61,68 **** + #1f000000 + #90000000 + #de000000 +! #ff36393e +! #ff303337 + #14000000 + #ff3f51b5 + #ff303f9f +--- 61,68 ---- + #1f000000 + #90000000 + #de000000 +! #ff000000 +! #ff000000 + #14000000 + #ff3f51b5 + #ff303f9f +*************** +*** 96,104 **** + #ff4f545c + #0d4f545c + #4d4f545c +! #ff282b30 +! #ff2e3136 +! #ff1e2124 + #ff8a8e94 + #6680cbc4 + #66009688 +--- 96,104 ---- + #ff4f545c + #0d4f545c + #4d4f545c +! #ff000000 +! #ff000000 +! #ff000000 + #ff8a8e94 + #6680cbc4 + #66009688 +*************** +*** 106,112 **** + #fff47b67 + #ff45ddc0 + #ff021f25 +! #ff00b0f4 + #ff0067e0 + #ff37474f + #ff263238 +--- 106,112 ---- + #fff47b67 + #ff45ddc0 + #ff021f25 +! #ff50f148 + #ff0067e0 + #ff37474f + #ff263238 +*************** +*** 149,166 **** + #ff72767d + #4d72767d + #9972767d +! #ff4f545c +! #4d4f545c +! #994f545c + #ff40444b +! #ff36393f +! #9936393f +! #ff2f3136 +! #992f3136 +! #e62f3136 + #ff292b2f +! #ff202225 +! #99202225 + #ff18191c + #9918191c + #e618191c +--- 149,166 ---- + #ff72767d + #4d72767d + #9972767d +! #ff0f0f0f +! #4d0f0f0f +! #99404040 + #ff40444b +! #ff000000 +! #99000000 +! #ff000000 +! #99000000 +! #e6000000 + #ff292b2f +! #ff0f0f0f +! #990f0f0f + #ff18191c + #9918191c + #e618191c +*************** +*** 191,199 **** + #de000000 + #4dffffff + #39000000 +! #ff738bd7 +! #1a738bd7 +! #ff697ec4 + #ffc9d2f0 + #ff5161ff + #4d5c6a9e +--- 191,199 ---- + #de000000 + #4dffffff + #39000000 +! #ff9c4249 +! #1a9c4249 +! #ff000000 + #ffc9d2f0 + #ff5161ff + #4d5c6a9e +*************** +*** 255,261 **** + #ffbdbdbd + #ffbdbdbd + #fff1f1f1 +! #e6616161 + #e6ffffff + @android:color/transparent + #ff593695 +--- 255,261 ---- + #ffbdbdbd + #ffbdbdbd + #fff1f1f1 +! #e6000000 + #e6ffffff + @android:color/transparent + #ff593695 +Only in com.discord-984/res/values: colors.xml.orig +Only in com.discord-984/res/values: colors.xml.rej +diff -crB com.discord-984-base/res/values/styles.xml com.discord-984/res/values/styles.xml +*** com.discord-984-base/res/values/styles.xml 2019-11-14 22:32:18.063167697 +0300 +--- com.discord-984/res/values/styles.xml 2019-11-14 23:30:54.617359433 +0300 +*************** +*** 365,371 **** + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp + @color/primary_500 +! #ff34373c + @color/grey_unread + @color/grey_channels + @color/grey_account +--- 365,371 ---- + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp + @color/primary_500 +! @color/primary_500 + @color/grey_unread + @color/grey_channels + @color/grey_account +*************** +*** 377,388 **** + @color/chat_input_button_tint_colors_dark + @drawable/drawable_rect_rounded_dark + @color/dark_grey_2_alpha_10 +! #ff3e4145 + @drawable/ic_img_selected_dark_theme + @color/white_alpha_70 + @color/white_alpha_20 + @color/white +! #1afaa61a + @drawable/drawable_bg_reaction_dark + @drawable/drawable_reaction_text_color_dark + @color/primary_700 +--- 377,388 ---- + @color/chat_input_button_tint_colors_dark + @drawable/drawable_rect_rounded_dark + @color/dark_grey_2_alpha_10 +! @color/primary_600 + @drawable/ic_img_selected_dark_theme + @color/white_alpha_70 + @color/white_alpha_20 + @color/white +! @color/purple_brand_alpha_10 + @drawable/drawable_bg_reaction_dark + @drawable/drawable_reaction_text_color_dark + @color/primary_700 +*************** +*** 445,451 **** + @color/brand_500 + @color/primary_100 + @color/primary_600 +! #ff2b2e31 + + + + + + +