From ff09c1bcbda01428a1ffc0064ac6587525ce8f74 Mon Sep 17 00:00:00 2001 From: Ave Ozkal Date: Wed, 29 May 2019 01:42:47 +0300 Subject: [PATCH] Revert "9.0.4" more apktool bugs, I'm afraid. This reverts commit 16708c42dc434b6cc9af4c1348bb8f3763c1c143. --- README.md | 2 +- patches/branding/904.patch | 177 -- patches/branding/README.md | 1 - patches/compact/904.patch | 79 - patches/compact/README.md | 1 - patches/customdefaultemoji/904.patch | 81 - patches/customdefaultemoji/README.md | 1 - patches/customtheme/904.patch | 272 -- patches/customtheme/README.md | 1 - patches/customversion/904.patch | 20 - patches/customversion/README.md | 1 - patches/disable-mobileindicator/904.patch | 20 - patches/disable-mobileindicator/README.md | 1 - patches/experiments/904.patch | 179 -- patches/experiments/README.md | 1 - patches/litecord/904.patch | 289 -- patches/litecord/README.md | 1 - patches/mutant/904.patch | 1907 ------------- patches/mutant/README.md | 1 - patches/necessary/904.patch | 14 - patches/noblocked/904.patch | 18 - patches/noblocked/README.md | 1 - patches/nonearby/904.patch | 101 - patches/nonearby/README.md | 1 - patches/noprofilestrip/904.patch | 53 - patches/noprofilestrip/README.md | 1 - patches/nospoiler/904.patch | 65 - patches/nospoiler/README.md | 1 - patches/notrack/904.patch | 3044 -------------------- patches/nozlib/904.patch | 34 - patches/nozlib/README.md | 1 - patches/pureevil/904.patch | 45 - patches/pureevil/README.md | 1 - patches/slashcommands/904.patch | 3145 --------------------- patches/slashcommands/README.md | 1 - patches/smalltime/904.patch | 190 -- patches/smalltime/README.md | 1 - patches/squareavatars/904.patch | 21 - patches/squareavatars/README.md | 1 - patches/tokenlogin/904.patch | 33 - patches/tokenlogin/README.md | 1 - patchport-state.json | 2 +- 42 files changed, 2 insertions(+), 9808 deletions(-) delete mode 100644 patches/branding/904.patch delete mode 100644 patches/compact/904.patch delete mode 100644 patches/customdefaultemoji/904.patch delete mode 100644 patches/customtheme/904.patch delete mode 100644 patches/customversion/904.patch delete mode 100644 patches/disable-mobileindicator/904.patch delete mode 100644 patches/experiments/904.patch delete mode 100644 patches/litecord/904.patch delete mode 100644 patches/mutant/904.patch delete mode 100644 patches/necessary/904.patch delete mode 100644 patches/noblocked/904.patch delete mode 100644 patches/nonearby/904.patch delete mode 100644 patches/noprofilestrip/904.patch delete mode 100644 patches/nospoiler/904.patch delete mode 100644 patches/notrack/904.patch delete mode 100644 patches/nozlib/904.patch delete mode 100644 patches/pureevil/904.patch delete mode 100644 patches/slashcommands/904.patch delete mode 100644 patches/smalltime/904.patch delete mode 100644 patches/squareavatars/904.patch delete mode 100644 patches/tokenlogin/904.patch diff --git a/README.md b/README.md index 3d602c48..04a66e16 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.0.4 (904), released on 2019-05-28. +**Latest supported Discord Android version:** 9.0.3 (903), released on 2019-05-24. New patch development will be done for the latest supported version. diff --git a/patches/branding/904.patch b/patches/branding/904.patch deleted file mode 100644 index 483e127c..00000000 --- a/patches/branding/904.patch +++ /dev/null @@ -1,177 +0,0 @@ -diff -crB from/AndroidManifest.xml to/AndroidManifest.xml -*** from/AndroidManifest.xml 2019-05-29 01:13:18.465785205 +0300 ---- to/AndroidManifest.xml 2019-05-29 01:13:20.105793791 +0300 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 21,27 **** - - - -! - - - ---- 21,27 ---- - - - -! - - - -*************** -*** 96,102 **** - - - -! - - - ---- 96,102 ---- - - - -! - - - -*************** -*** 133,139 **** - - - -! - - - ---- 133,139 ---- - - - -! - - - -*************** -*** 143,149 **** - - - -! - - - ---- 143,149 ---- - - - -! - - - -*************** -*** 182,190 **** - - - -! -! - - - -! -\ No newline at end of file ---- 182,190 ---- - - - -! -! - - - -! -diff -crB from/apktool.yml to/apktool.yml -*** from/apktool.yml 2019-05-29 01:12:20.135479797 +0300 ---- to/apktool.yml 2019-05-29 01:13:20.105793791 +0300 -*************** -*** 308,312 **** - tag: null - version: 2.4.1-73ac0d-SNAPSHOT - versionInfo: -! versionCode: '904' -! versionName: 9.0.4 ---- 308,312 ---- - tag: null - version: 2.4.1-73ac0d-SNAPSHOT - versionInfo: -! versionCode: '904CTCBUILD' -! versionName: 9.0.4-cutthecord-CTCBUILD -diff -crB from/res/values/strings.xml to/res/values/strings.xml -*** from/res/values/strings.xml 2019-05-29 01:12:15.258787597 +0300 ---- to/res/values/strings.xml 2019-05-29 01:13:20.109127142 +0300 -*************** -*** 1284,1290 **** - 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/ ---- 1284,1290 ---- - 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/ -*************** -*** 2993,2999 **** - Failed to reply to %1$s - Replied to %1$s - Notification Settings -! Discord - "Somebody Playin'" - Notifications - Continue ---- 2993,2999 ---- - Failed to reply to %1$s - Replied to %1$s - Notification Settings -! CTCNAME - "Somebody Playin'" - Notifications - Continue -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-05-29 01:12:17.215464508 +0300 ---- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-05-29 01:13:20.109127142 +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 c3357bb8..7559c2c0 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -44,5 +44,4 @@ You can use the following line to patch authorities: - 9.0.1 - 9.0.2 - 9.0.3 -- 9.0.4 diff --git a/patches/compact/904.patch b/patches/compact/904.patch deleted file mode 100644 index 1a8096aa..00000000 --- a/patches/compact/904.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -crB com.discord-896-base/res/layout/widget_chat_list_adapter_item_text.xml com.discord-896/res/layout/widget_chat_list_adapter_item_text.xml -*** com.discord-896-base/res/layout/widget_chat_list_adapter_item_text.xml 2019-05-12 12:13:44.797747805 +0300 ---- com.discord-896/res/layout/widget_chat_list_adapter_item_text.xml 2019-05-12 12:23:58.467979023 +0300 -*************** -*** 2,12 **** - - -- - - - - - -- - -\ No newline at end of file ---- 2,11 ---- - - - - - - -+ - - -\ No newline at end of file -diff -crB com.discord-896-base/res/layout-v17/widget_chat_list_adapter_item_text.xml com.discord-896/res/layout-v17/widget_chat_list_adapter_item_text.xml -*** com.discord-896-base/res/layout-v17/widget_chat_list_adapter_item_text.xml 2019-05-12 12:13:44.247726523 +0300 ---- com.discord-896/res/layout-v17/widget_chat_list_adapter_item_text.xml 2019-05-12 12:24:20.918161669 +0300 -*************** -*** 2,12 **** - - -- - - - - - -- - -\ No newline at end of file ---- 2,11 ---- - - - - - - -+ - - -\ No newline at end of file -diff -crB com.discord-896-base/res/values/dimens.xml com.discord-896/res/values/dimens.xml -*** com.discord-896-base/res/values/dimens.xml 2019-05-12 12:13:45.377770248 +0300 ---- com.discord-896/res/values/dimens.xml 2019-05-12 12:25:17.025177841 +0300 -*************** -*** 327,333 **** - 4.0dip - 1.0dip - 96.0dip -! 58.0dip - 48.0dip - 72.0dip - 3.0dip ---- 327,333 ---- - 4.0dip - 1.0dip - 96.0dip -! 20.0dip - 48.0dip - 72.0dip - 3.0dip - diff --git a/patches/compact/README.md b/patches/compact/README.md index c61a1352..33614ca7 100644 --- a/patches/compact/README.md +++ b/patches/compact/README.md @@ -31,5 +31,4 @@ This patch, when combined with `smalltime` patch, emulates the "compact"/"irc" t - 9.0.1 - 9.0.2 - 9.0.3 -- 9.0.4 diff --git a/patches/customdefaultemoji/904.patch b/patches/customdefaultemoji/904.patch deleted file mode 100644 index 974a726f..00000000 --- a/patches/customdefaultemoji/904.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -crB com.discord-896-base/smali/com/discord/stores/StoreEmoji.smali com.discord-896/smali/com/discord/stores/StoreEmoji.smali -*** com.discord-896-base/smali/com/discord/stores/StoreEmoji.smali 2019-05-12 12:13:46.831159818 +0300 ---- com.discord-896/smali/com/discord/stores/StoreEmoji.smali 2019-05-12 12:18:56.659462281 +0300 -*************** -*** 101,137 **** - - 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 - ---- 101,137 ---- - - 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 897f106e..80c9ac67 100644 --- a/patches/customdefaultemoji/README.md +++ b/patches/customdefaultemoji/README.md @@ -13,5 +13,4 @@ This patch changes default list of custom emojis. - 9.0.1 - 9.0.2 - 9.0.3 -- 9.0.4 diff --git a/patches/customtheme/904.patch b/patches/customtheme/904.patch deleted file mode 100644 index 3d0d9bd9..00000000 --- a/patches/customtheme/904.patch +++ /dev/null @@ -1,272 +0,0 @@ -diff -crB com.discord-896-base/res/values/colors.xml com.discord-896/res/values/colors.xml -*** com.discord-896-base/res/values/colors.xml 2019-05-12 12:13:45.547776826 +0300 ---- com.discord-896/res/values/colors.xml 2019-05-12 12:33:31.496710188 +0300 -*************** -*** 50,56 **** - #37000000 - #ff657b83 - #ff333333 -! #ff1d1d1d - @android:color/white - #1f000000 - @android:color/black ---- 50,56 ---- - #37000000 - #ff657b83 - #ff333333 -! #ff000000 - @android:color/white - #1f000000 - @android:color/black -*************** -*** 59,66 **** - #1f000000 - #90000000 - #de000000 -! #ff36393e -! #ff303337 - #14000000 - #ff3f51b5 - #ff303f9f ---- 59,66 ---- - #1f000000 - #90000000 - #de000000 -! #ff000000 -! #ff000000 - #14000000 - #ff3f51b5 - #ff303f9f -*************** -*** 94,102 **** - #ff4f545c - #0d4f545c - #4d4f545c -! #ff282b30 -! #ff2e3136 -! #ff1e2124 - #ff8a8e94 - #6680cbc4 - #66009688 ---- 94,102 ---- - #ff4f545c - #0d4f545c - #4d4f545c -! #ff000000 -! #ff000000 -! #ff000000 - #ff8a8e94 - #6680cbc4 - #66009688 -*************** -*** 104,118 **** - #fff47b67 - #ff45ddc0 - #ff021f25 -! #fff2fbfe -! #ffcceffd -! #ff99dffb -! #ff33c0f6 -! #ff00b0f4 -! #ff0078a6 -! #ff004662 -! #ff003549 -! #ff00090c - #ff37474f - #ff263238 - #ff21272b ---- 104,118 ---- - #fff47b67 - #ff45ddc0 - #ff021f25 -! #ff8cf687 -! #ff7df577 -! #ff6ef368 -! #ff5ff258 -! #ff50f148 -! #ff41f038 -! #ff32ef28 -! #ff23ed19 -! #ff1be411 - #ff37474f - #ff263238 - #ff21272b -*************** -*** 154,171 **** - #4d7d8187 - #997d8187 - #e67d8187 -! #ff4f545c -! #4d4f545c -! #994f545c -! #e64f545c -! #ff36393f -! #4d36393f -! #9936393f -! #e636393f -! #ff2f3136 -! #4d2f3136 -! #992f3136 -! #e62f3136 - #ff292b2f - #4d292b2f - #99292b2f ---- 154,171 ---- - #4d7d8187 - #997d8187 - #e67d8187 -! #ff0f0f0f -! #4d0f0f0f -! #990f0f0f -! #e60f0f0f -! #ff000000 -! #4d000000 -! #99000000 -! #e6000000 -! #ff000000 -! #4d000000 -! #99000000 -! #e6000000 - #ff292b2f - #4d292b2f - #99292b2f -*************** -*** 190,198 **** - #de000000 - #4dffffff - #39000000 -! #ff738bd7 -! #1a738bd7 -! #ff697ec4 - #ffc9d2f0 - #ff5161ff - #4d5c6a9e ---- 190,198 ---- - #de000000 - #4dffffff - #39000000 -! #ff9c4249 -! #1a9c4249 -! #ff000000 - #ffc9d2f0 - #ff5161ff - #4d5c6a9e -diff -crB com.discord-896-base/res/values/styles.xml com.discord-896/res/values/styles.xml -*** com.discord-896-base/res/values/styles.xml 2019-05-12 12:13:45.444439495 +0300 ---- com.discord-896/res/values/styles.xml 2019-05-12 12:25:58.908605844 +0300 -*************** -*** 113,119 **** - @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 ---- 113,119 ---- - @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 -*************** -*** 331,337 **** - @color/white - @color/white_alpha_40 - @drawable/ic_backspace_white_24dp -! #ff34373c - @color/grey_unread - @color/grey_channels - @color/grey_account ---- 331,337 ---- - @color/white - @color/white_alpha_40 - @drawable/ic_backspace_white_24dp -! @color/primary_500 - @color/grey_unread - @color/grey_channels - @color/grey_account -*************** -*** 345,356 **** - @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 ---- 345,356 ---- - @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 -*************** -*** 416,422 **** - @color/brand_500 - @color/primary_100 - @color/primary_600 -! #ff2b2e31 - - - - - - -