diff --git a/README.md b/README.md index bdcf276..705f6ea 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.6.8 (968), released on 2019-10-07. +**Latest supported Discord Android version:** 9.6.7 (967), released on 2019-10-05. New patch development will be done for the latest supported version. diff --git a/patches/branding/968.patch b/patches/branding/968.patch deleted file mode 100644 index c709ec6..0000000 --- a/patches/branding/968.patch +++ /dev/null @@ -1,247 +0,0 @@ -diff -crB com.discord-968-base/AndroidManifest.xml com.discord-968/AndroidManifest.xml -*** com.discord-968-base/AndroidManifest.xml 2019-10-08 02:17:31.347153020 +0300 ---- com.discord-968/AndroidManifest.xml 2019-10-08 02:25:30.516848928 +0300 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 19,30 **** - - - -! - - - - -! - - - ---- 19,30 ---- - - - -! - - - - -! - - - -*************** -*** 79,85 **** - - - -! - - - ---- 79,85 ---- - - - -! - - - -*************** -*** 109,115 **** - - - -! - - - ---- 109,115 ---- - - - -! - - - -*************** -*** 140,146 **** - - - -! - - - ---- 140,146 ---- - - - -! - - - -*************** -*** 151,157 **** - - - -! - - - ---- 151,157 ---- - - - -! - - - -*************** -*** 191,199 **** - - - -! -! -! - - - -\ No newline at end of file ---- 191,199 ---- - - - -! -! -! - - - -\ No newline at end of file -Only in com.discord-968: AndroidManifest.xml.orig -Only in com.discord-968: AndroidManifest.xml.rej -diff -crB com.discord-968-base/apktool.yml com.discord-968/apktool.yml -*** com.discord-968-base/apktool.yml 2019-10-08 02:17:21.010427435 +0300 ---- com.discord-968/apktool.yml 2019-10-08 02:23:33.399532354 +0300 -*************** -*** 181,185 **** - tag: null - version: 2.4.1-75e4c6-SNAPSHOT - versionInfo: -! versionCode: '968' -! versionName: 9.6.8 ---- 181,185 ---- - tag: null - version: 2.4.1-75e4c6-SNAPSHOT - versionInfo: -! versionCode: '968CTCBUILD' -! versionName: 9.6.8-cutthecord-CTCBUILD -diff -crB com.discord-968-base/res/values/strings.xml com.discord-968/res/values/strings.xml -*** com.discord-968-base/res/values/strings.xml 2019-10-08 02:17:17.370406687 +0300 ---- com.discord-968/res/values/strings.xml 2019-10-08 02:23:33.402865704 +0300 -*************** -*** 1298,1304 **** - 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/ ---- 1298,1304 ---- - 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/ -*************** -*** 3191,3197 **** - Failed to reply to %1$s - Replied to %1$s - Notification Settings -! Discord - "Somebody Playin'" - Join them: %1$s - Join the party! ---- 3191,3197 ---- - Failed to reply to %1$s - Replied to %1$s - Notification Settings -! CTCNAME - "Somebody Playin'" - Join them: %1$s - Join the party! -*************** -*** 4374,4380 **** - Sub Enabled Servers - Subscriber Information - 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." ---- 4374,4380 ---- - Sub Enabled Servers - Subscriber Information - 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." -Only in com.discord-968/res/values: strings.xml.orig -diff -crB com.discord-968-base/smali/com/discord/app/e.smali com.discord-968/smali/com/discord/app/e.smali -*** com.discord-968-base/smali/com/discord/app/e.smali 2019-10-08 02:17:18.630413869 +0300 ---- com.discord-968/smali/com/discord/app/e.smali 2019-10-08 02:23:33.402865704 +0300 -*************** -*** 56,62 **** - .line 17 - sput-object v0, Lcom/discord/app/e;->uP:Ljava/lang/String; - -! const-string v0, "https://support.discordapp.com" - - .line 18 - sput-object v0, Lcom/discord/app/e;->uQ:Ljava/lang/String; ---- 56,62 ---- - .line 17 - sput-object v0, Lcom/discord/app/e;->uP:Ljava/lang/String; - -! const-string v0, "https://gitdab.com/distok/cutthecord" - - .line 18 - sput-object v0, Lcom/discord/app/e;->uQ:Ljava/lang/String; -Only in com.discord-968/smali/com/discord/app: e.smali.orig -diff -crB com.discord-968-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali com.discord-968/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali -*** com.discord-968-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-10-08 02:17:18.910415465 +0300 ---- com.discord-968/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-10-08 02:23:33.402865704 +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 64b3506..73d1482 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -65,5 +65,4 @@ You can use the following line to patch authorities: - 9.6.5 - 9.6.6 - 9.6.7 -- 9.6.8 diff --git a/patches/compact/968.patch b/patches/compact/968.patch deleted file mode 100644 index dcae113..0000000 --- a/patches/compact/968.patch +++ /dev/null @@ -1,78 +0,0 @@ -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-08 02:17:15.957065298 +0300 ---- to/res/layout/widget_chat_list_adapter_item_text.xml 2019-10-08 02:17:32.963828902 +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-08 02:17:15.837064614 +0300 ---- to/res/layout-v17/widget_chat_list_adapter_item_text.xml 2019-10-08 02:17:32.963828902 +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-08 02:17:17.480407314 +0300 ---- to/res/values/dimens.xml 2019-10-08 02:17:32.963828902 +0300 -*************** -*** 336,342 **** - 1.0dip - 96.0dip - 4.0dip -! 58.0dip - 48.0dip - 72.0dip - 3.0dip ---- 336,342 ---- - 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 d6fb2c8..590e71f 100644 --- a/patches/compact/README.md +++ b/patches/compact/README.md @@ -49,5 +49,4 @@ This patch, when combined with `smalltime` patch, emulates the "compact"/"irc" t - 9.6.5 - 9.6.6 - 9.6.7 -- 9.6.8 diff --git a/patches/customdefaultemoji/968.patch b/patches/customdefaultemoji/968.patch deleted file mode 100644 index 48aa3bc..0000000 --- a/patches/customdefaultemoji/968.patch +++ /dev/null @@ -1,80 +0,0 @@ -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 7314427..4838256 100644 --- a/patches/customdefaultemoji/README.md +++ b/patches/customdefaultemoji/README.md @@ -31,5 +31,4 @@ This patch changes default list of custom emojis. - 9.6.5 - 9.6.6 - 9.6.7 -- 9.6.8 diff --git a/patches/customtheme/968.patch b/patches/customtheme/968.patch deleted file mode 100644 index c239985..0000000 --- a/patches/customtheme/968.patch +++ /dev/null @@ -1,291 +0,0 @@ -Only in com.discord-968: build -Only in com.discord-968: dist -diff -crB com.discord-968-base/res/values/colors.xml com.discord-968/res/values/colors.xml -*** com.discord-968-base/res/values/colors.xml 2019-10-08 02:17:17.500407428 +0300 ---- com.discord-968/res/values/colors.xml 2019-10-08 02:36:50.527287192 +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 -diff -crB com.discord-968-base/res/values/styles.xml com.discord-968/res/values/styles.xml -*** com.discord-968-base/res/values/styles.xml 2019-10-08 02:17:17.290406231 +0300 ---- com.discord-968/res/values/styles.xml 2019-10-08 02:26:41.200587211 +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 -*************** -*** 344,350 **** - @color/white_alpha_40 - @drawable/ic_backspace_white_24dp - @color/primary_500 -! #ff34373c - @color/grey_unread - @color/grey_channels - @color/grey_account ---- 344,350 ---- - @color/white_alpha_40 - @drawable/ic_backspace_white_24dp - @color/primary_500 -! @color/primary_500 - @color/grey_unread - @color/grey_channels - @color/grey_account -*************** -*** 358,369 **** - @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 ---- 358,369 ---- - @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 -*************** -*** 429,435 **** - @color/brand_500 - @color/primary_100 - @color/primary_600 -! #ff2b2e31 - - - - - - -