From 0481c2149e0e40e86c0e17bf0c2ba31fc983f005 Mon Sep 17 00:00:00 2001 From: Ave Ozkal Date: Thu, 31 Oct 2019 11:33:05 +0300 Subject: [PATCH] Add 9.8.0 support Untested, slashcommands miiight break. --- README.md | 2 +- patches/branding/980.patch | 242 ++ patches/branding/README.md | 1 + patches/compact/980.patch | 78 + patches/compact/README.md | 1 + patches/customdefaultemoji/980.patch | 80 + patches/customdefaultemoji/README.md | 1 + patches/customtheme/980.patch | 313 ++ patches/customtheme/README.md | 1 + patches/customversion/980.patch | 20 + patches/customversion/README.md | 1 + patches/disable-mobileindicator/980.patch | 20 + patches/disable-mobileindicator/README.md | 1 + patches/experiments/980.patch | 203 ++ patches/experiments/README.md | 1 + patches/litecord/980.patch | 330 ++ patches/litecord/README.md | 1 + patches/mutant/980.patch | 1909 ++++++++++++ patches/mutant/README.md | 1 + patches/necessary/980.patch | 14 + patches/noblocked/980.patch | 18 + patches/noblocked/README.md | 1 + patches/nonearby/980.patch | 100 + patches/nonearby/README.md | 1 + patches/noprofilestrip/980.patch | 53 + patches/noprofilestrip/README.md | 1 + patches/nospoiler/980.patch | 64 + patches/nospoiler/README.md | 1 + patches/notrack/980.patch | 2786 +++++++++++++++++ patches/nozlib/980.patch | 37 + patches/nozlib/README.md | 1 + patches/pureevil/980.patch | 48 + patches/pureevil/README.md | 1 + patches/slashcommands/980.patch | 3378 +++++++++++++++++++++ patches/slashcommands/README.md | 1 + patches/smalltime/980.patch | 190 ++ patches/smalltime/README.md | 1 + patches/squareavatars/980.patch | 21 + patches/squareavatars/README.md | 1 + patches/tokenlogin/980.patch | 33 + patches/tokenlogin/README.md | 1 + patchport-state.json | 2 +- 42 files changed, 9958 insertions(+), 2 deletions(-) create mode 100644 patches/branding/980.patch create mode 100644 patches/compact/980.patch create mode 100644 patches/customdefaultemoji/980.patch create mode 100644 patches/customtheme/980.patch create mode 100644 patches/customversion/980.patch create mode 100644 patches/disable-mobileindicator/980.patch create mode 100644 patches/experiments/980.patch create mode 100644 patches/litecord/980.patch create mode 100644 patches/mutant/980.patch create mode 100644 patches/necessary/980.patch create mode 100644 patches/noblocked/980.patch create mode 100644 patches/nonearby/980.patch create mode 100644 patches/noprofilestrip/980.patch create mode 100644 patches/nospoiler/980.patch create mode 100644 patches/notrack/980.patch create mode 100644 patches/nozlib/980.patch create mode 100644 patches/pureevil/980.patch create mode 100644 patches/slashcommands/980.patch create mode 100644 patches/smalltime/980.patch create mode 100644 patches/squareavatars/980.patch create mode 100644 patches/tokenlogin/980.patch diff --git a/README.md b/README.md index b240d36..cf663dc 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.7.0 (970), released on 2019-10-10. +**Latest supported Discord Android version:** 9.8.0 (980), released on 2019-10-31. New patch development will be done for the latest supported version. diff --git a/patches/branding/980.patch b/patches/branding/980.patch new file mode 100644 index 0000000..d4fd156 --- /dev/null +++ b/patches/branding/980.patch @@ -0,0 +1,242 @@ +diff -crB from/AndroidManifest.xml to/AndroidManifest.xml +*** from/AndroidManifest.xml 2019-10-31 11:16:39.576244857 +0300 +--- to/AndroidManifest.xml 2019-10-31 11:16:41.239586999 +0300 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 19,30 **** + + + +! + + + + +! + + + +--- 19,30 ---- + + + +! + + + + +! + + + +*************** +*** 85,91 **** + + + +! + + + +--- 85,91 ---- + + + +! + + + +*************** +*** 115,121 **** + + + +! + + + +--- 115,121 ---- + + + +! + + + +*************** +*** 146,152 **** + + + +! + + + +--- 146,152 ---- + + + +! + + + +*************** +*** 157,163 **** + + + +! + + + +--- 157,163 ---- + + + +! + + + +*************** +*** 197,205 **** + + + +! +! +! + + + +\ No newline at end of file +--- 197,205 ---- + + + +! +! +! + + + +\ No newline at end of file +diff -crB from/apktool.yml to/apktool.yml +*** from/apktool.yml 2019-10-31 11:15:19.115819149 +0300 +--- to/apktool.yml 2019-10-31 11:16:41.239586999 +0300 +*************** +*** 181,185 **** + tag: null + version: 2.4.1-197d46-SNAPSHOT + versionInfo: +! versionCode: '980' +! versionName: 9.8.0 +--- 181,185 ---- + tag: null + version: 2.4.1-197d46-SNAPSHOT + versionInfo: +! versionCode: '980CTCBUILD' +! versionName: 9.8.0-cutthecord-CTCBUILD +diff -crB from/res/values/strings.xml to/res/values/strings.xml +*** from/res/values/strings.xml 2019-10-31 11:15:14.299127045 +0300 +--- to/res/values/strings.xml 2019-10-31 11:16:41.239586999 +0300 +*************** +*** 1371,1377 **** + 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/ +--- 1371,1377 ---- + 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/ +*************** +*** 3300,3306 **** + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! Discord + "Somebody Playin'" + Join them: %1$s + Join the party! +--- 3300,3306 ---- + Failed to reply to %1$s + Replied to %1$s + Notification Settings +! CTCNAME + "Somebody Playin'" + Join them: %1$s + Join the party! +*************** +*** 4604,4610 **** + "Hey! What you're purchasing is a recurring subscription, which means we'll charge you today and continue to charge you yearly until you cancel the subscription. You can cancel anytime from your Settings page, though!" + Subscriptions + Suggestions +! Support + Remove all embeds + Suppressed + "It seems you've gone AFK on us. We've went ahead and moved you to the AFK channel." +--- 4604,4610 ---- + "Hey! What you're purchasing is a recurring subscription, which means we'll charge you today and continue to charge you yearly until you cancel the subscription. You can cancel anytime from your Settings page, though!" + Subscriptions + Suggestions +! 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." +diff -crB from/smali/com/discord/app/e.smali to/smali/com/discord/app/e.smali +*** from/smali/com/discord/app/e.smali 2019-10-31 11:15:16.465805154 +0300 +--- to/smali/com/discord/app/e.smali 2019-10-31 11:16:41.239586999 +0300 +*************** +*** 56,62 **** + .line 17 + 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 17 + 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; +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 2019-10-31 11:15:16.829140406 +0300 +--- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-10-31 11:16:41.239586999 +0300 +*************** +*** 77,83 **** + + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://discordapp.com/app" + + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; + +--- 77,83 ---- + + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" + + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; + diff --git a/patches/branding/README.md b/patches/branding/README.md index 370a2ea..2586d3e 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -67,4 +67,5 @@ You can use the following line to patch authorities: - 9.6.7 - 9.6.8 - 9.7.0 +- 9.8.0 diff --git a/patches/compact/980.patch b/patches/compact/980.patch new file mode 100644 index 0000000..21e032b --- /dev/null +++ b/patches/compact/980.patch @@ -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/patches/compact/README.md index b06a9bc..53ede96 100644 --- a/patches/compact/README.md +++ b/patches/compact/README.md @@ -51,4 +51,5 @@ This patch, when combined with `smalltime` patch, emulates the "compact"/"irc" t - 9.6.7 - 9.6.8 - 9.7.0 +- 9.8.0 diff --git a/patches/customdefaultemoji/980.patch b/patches/customdefaultemoji/980.patch new file mode 100644 index 0000000..48aa3bc --- /dev/null +++ b/patches/customdefaultemoji/980.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-10-01 22:09:20.710656138 +0300 +--- to/smali/com/discord/stores/StoreEmoji.smali 2019-10-01 22:10:14.464346867 +0300 +*************** +*** 100,136 **** + + 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 + +--- 100,136 ---- + + 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 48a76a8..4cd7246 100644 --- a/patches/customdefaultemoji/README.md +++ b/patches/customdefaultemoji/README.md @@ -33,4 +33,5 @@ This patch changes default list of custom emojis. - 9.6.7 - 9.6.8 - 9.7.0 +- 9.8.0 diff --git a/patches/customtheme/980.patch b/patches/customtheme/980.patch new file mode 100644 index 0000000..f40f328 --- /dev/null +++ b/patches/customtheme/980.patch @@ -0,0 +1,313 @@ +diff -crB com.discord-980-base/res/drawable/drawable_overlay_channels_active.xml com.discord-980/res/drawable/drawable_overlay_channels_active.xml +*** com.discord-980-base/res/drawable/drawable_overlay_channels_active.xml 2019-10-31 11:15:12.435783871 +0300 +--- com.discord-980/res/drawable/drawable_overlay_channels_active.xml 2019-10-31 11:28:16.199908598 +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-980-base/res/values/colors.xml com.discord-980/res/values/colors.xml +*** com.discord-980-base/res/values/colors.xml 2019-10-31 11:15:14.045792374 +0300 +--- com.discord-980/res/values/colors.xml 2019-10-31 11:28:16.203241949 +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,120 **** + #fff47b67 + #ff45ddc0 + #ff021f25 +! #fff2fbfe +! #ffcceffd +! #ff99dffb +! #ff33c0f6 +! #ff00b0f4 +! #ff0078a6 +! #ff004662 +! #ff003549 +! #ff00090c + #ff37474f + #ff263238 + #ff21272b +--- 106,120 ---- + #fff47b67 + #ff45ddc0 + #ff021f25 +! #ff8cf687 +! #ff7df577 +! #ff6ef368 +! #ff5ff258 +! #ff50f148 +! #ff41f038 +! #ff32ef28 +! #ff23ed19 +! #ff1be411 + #ff37474f + #ff263238 + #ff21272b +*************** +*** 152,169 **** + #ff72767d + #4d72767d + #9972767d +! #ff4f545c +! #4d4f545c +! #994f545c + #ff40444b +! #ff36393f +! #9936393f +! #ff2f3136 +! #992f3136 +! #e62f3136 + #ff292b2f +! #ff202225 +! #99202225 + #ff18191c + #9918191c + #e618191c +--- 152,169 ---- + #ff72767d + #4d72767d + #9972767d +! #ff0f0f0f +! #4d0f0f0f +! #99404040 + #ff40444b +! #ff000000 +! #99000000 +! #ff000000 +! #99000000 +! #e6000000 + #ff292b2f +! #ff0f0f0f +! #990f0f0f + #ff18191c + #9918191c + #e618191c +*************** +*** 193,201 **** + #de000000 + #4dffffff + #39000000 +! #ff738bd7 +! #1a738bd7 +! #ff697ec4 + #ffc9d2f0 + #ff5161ff + #4d5c6a9e +--- 193,201 ---- + #de000000 + #4dffffff + #39000000 +! #ff9c4249 +! #1a9c4249 +! #ff000000 + #ffc9d2f0 + #ff5161ff + #4d5c6a9e +*************** +*** 257,263 **** + #ffbdbdbd + #ffbdbdbd + #fff1f1f1 +! #e6616161 + #e6ffffff + @android:color/transparent + #ff593695 +--- 257,263 ---- + #ffbdbdbd + #ffbdbdbd + #fff1f1f1 +! #e6000000 + #e6ffffff + @android:color/transparent + #ff593695 +Only in com.discord-980/res/values: colors.xml.orig +diff -crB com.discord-980-base/res/values/styles.xml com.discord-980/res/values/styles.xml +*** com.discord-980-base/res/values/styles.xml 2019-10-31 11:15:14.402460924 +0300 +--- com.discord-980/res/values/styles.xml 2019-10-31 11:28:16.206575299 +0300 +*************** +*** 114,120 **** + @color/primary_600 + @drawable/drawable_uikit_primary_600_bg_dark + @drawable/drawable_uikit_primary_600_circle +! #ff2b2e31 + @color/primary_500_alpha_60 + @color/black_alpha_05 + @style/AppTheme.Dark.Notice +--- 114,120 ---- + @color/primary_600 + @drawable/drawable_uikit_primary_600_bg_dark + @drawable/drawable_uikit_primary_600_circle +! @color/primary_630 + @color/primary_500_alpha_60 + @color/black_alpha_05 + @style/AppTheme.Dark.Notice +*************** +*** 352,358 **** + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp + @color/primary_500 +! #ff34373c + @color/grey_unread + @color/grey_channels + @color/grey_account +--- 352,358 ---- + @color/white_alpha_40 + @drawable/ic_backspace_white_24dp + @color/primary_500 +! @color/primary_500 + @color/grey_unread + @color/grey_channels + @color/grey_account +*************** +*** 366,377 **** + @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 + @color/white + @drawable/drawable_bg_reaction_dark + @drawable/drawable_reaction_text_color_dark +--- 366,377 ---- + @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 + @color/white + @drawable/drawable_bg_reaction_dark + @drawable/drawable_reaction_text_color_dark +*************** +*** 437,443 **** + @color/brand_500 + @color/primary_100 + @color/primary_600 +! #ff2b2e31 + + + + + + +