From eb39c6f9c6619a5c5fed4f31887d911384933e92 Mon Sep 17 00:00:00 2001 From: Ave Ozkal Date: Sat, 31 Aug 2019 15:06:13 +0300 Subject: [PATCH] Revert "9.5.0" Things are bork This reverts commit b907e73caa78e0049a82c941631f882bb659e070. --- README.md | 2 +- patches/branding/950.patch | 233 -- patches/branding/README.md | 1 - patches/compact/950.patch | 78 - patches/compact/README.md | 1 - patches/customdefaultemoji/950.patch | 80 - patches/customdefaultemoji/README.md | 1 - patches/customtheme/950.patch | 265 -- patches/customtheme/README.md | 1 - patches/customversion/950.patch | 20 - patches/customversion/README.md | 1 - patches/disable-mobileindicator/950.patch | 20 - patches/disable-mobileindicator/README.md | 1 - patches/experiments/950.patch | 196 -- patches/experiments/README.md | 1 - patches/litecord/950.patch | 289 -- patches/litecord/README.md | 1 - patches/mutant/950.patch | 1911 ------------- patches/mutant/README.md | 1 - patches/necessary/950.patch | 14 - patches/noblocked/950.patch | 18 - patches/noblocked/README.md | 1 - patches/nonearby/950.patch | 102 - patches/nonearby/README.md | 1 - patches/noprofilestrip/950.patch | 53 - patches/noprofilestrip/README.md | 1 - patches/nospoiler/950.patch | 64 - patches/nospoiler/README.md | 1 - patches/notrack/950.patch | 3069 -------------------- patches/nozlib/950.patch | 34 - patches/nozlib/README.md | 1 - patches/pureevil/950.patch | 45 - patches/pureevil/README.md | 1 - patches/slashcommands/950.patch | 3124 --------------------- patches/slashcommands/README.md | 1 - patches/smalltime/950.patch | 190 -- patches/smalltime/README.md | 1 - patches/squareavatars/950.patch | 21 - patches/squareavatars/README.md | 1 - patches/tokenlogin/950.patch | 33 - patches/tokenlogin/README.md | 1 - patchport-state.json | 2 +- 42 files changed, 2 insertions(+), 9880 deletions(-) delete mode 100644 patches/branding/950.patch delete mode 100644 patches/compact/950.patch delete mode 100644 patches/customdefaultemoji/950.patch delete mode 100644 patches/customtheme/950.patch delete mode 100644 patches/customversion/950.patch delete mode 100644 patches/disable-mobileindicator/950.patch delete mode 100644 patches/experiments/950.patch delete mode 100644 patches/litecord/950.patch delete mode 100644 patches/mutant/950.patch delete mode 100644 patches/necessary/950.patch delete mode 100644 patches/noblocked/950.patch delete mode 100644 patches/nonearby/950.patch delete mode 100644 patches/noprofilestrip/950.patch delete mode 100644 patches/nospoiler/950.patch delete mode 100644 patches/notrack/950.patch delete mode 100644 patches/nozlib/950.patch delete mode 100644 patches/pureevil/950.patch delete mode 100644 patches/slashcommands/950.patch delete mode 100644 patches/smalltime/950.patch delete mode 100644 patches/squareavatars/950.patch delete mode 100644 patches/tokenlogin/950.patch diff --git a/README.md b/README.md index d872d1b..f0dedf8 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.5.0 (950), released on 2019-08-31. +**Latest supported Discord Android version:** 9.4.8 (948), released on 2019-08-27. New patch development will be done for the latest supported version. diff --git a/patches/branding/950.patch b/patches/branding/950.patch deleted file mode 100644 index 3641069..0000000 --- a/patches/branding/950.patch +++ /dev/null @@ -1,233 +0,0 @@ -diff -crB from/AndroidManifest.xml to/AndroidManifest.xml -*** from/AndroidManifest.xml 2019-08-31 14:22:52.421642988 +0300 ---- to/AndroidManifest.xml 2019-08-31 14:23:01.165028034 +0300 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 19,29 **** - - - -! - - - -! - - - ---- 19,29 ---- - - - -! - - - -! - - - -*************** -*** 78,84 **** - - - -! - - - ---- 78,84 ---- - - - -! - - - -*************** -*** 108,121 **** - - - -! - - - - - - -! - - - ---- 108,121 ---- - - - -! - - - - - - -! - - - -*************** -*** 178,184 **** - - - -! - - - ---- 178,184 ---- - - - -! - - - -*************** -*** 189,196 **** - - - -! -! - - - ---- 189,196 ---- - - - -! -! - - - -diff -crB from/apktool.yml to/apktool.yml -*** from/apktool.yml 2019-08-31 14:22:12.638074322 +0300 ---- to/apktool.yml 2019-08-31 14:23:01.165028034 +0300 -*************** -*** 181,185 **** - tag: null - version: 2.4.1-75e4c6-SNAPSHOT - versionInfo: -! versionCode: '950' -! versionName: 9.5.0 ---- 181,185 ---- - tag: null - version: 2.4.1-75e4c6-SNAPSHOT - versionInfo: -! versionCode: '950CTCBUILD' -! versionName: 9.5.0-cutthecord-CTCBUILD -diff -crB from/res/values/strings.xml to/res/values/strings.xml -*** from/res/values/strings.xml 2019-08-31 14:22:08.388049185 +0300 ---- to/res/values/strings.xml 2019-08-31 14:23:01.165028034 +0300 -*************** -*** 1297,1303 **** - 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/ ---- 1297,1303 ---- - 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/ -*************** -*** 3133,3139 **** - Failed to reply to %1$s - Replied to %1$s - Notification Settings -! Discord - "Somebody Playin'" - Join them: %1$s - Join the party! ---- 3133,3139 ---- - Failed to reply to %1$s - Replied to %1$s - Notification Settings -! CTCNAME - "Somebody Playin'" - Join them: %1$s - Join the party! -*************** -*** 4302,4308 **** - 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." ---- 4302,4308 ---- - 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." -diff -crB from/smali/com/discord/app/e.smali to/smali/com/discord/app/e.smali -*** from/smali/com/discord/app/e.smali 2019-08-31 14:22:09.634723225 +0300 ---- to/smali/com/discord/app/e.smali 2019-08-31 14:23:01.165028034 +0300 -*************** -*** 56,62 **** - .line 17 - sput-object v0, Lcom/discord/app/e;->um:Ljava/lang/String; - -! const-string v0, "https://support.discordapp.com" - - .line 18 - sput-object v0, Lcom/discord/app/e;->un:Ljava/lang/String; ---- 56,62 ---- - .line 17 - sput-object v0, Lcom/discord/app/e;->um:Ljava/lang/String; - -! const-string v0, "https://gitdab.com/distok/cutthecord" - - .line 18 - sput-object v0, Lcom/discord/app/e;->un: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-08-31 14:22:09.981391942 +0300 ---- to/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-08-31 14:23:01.165028034 +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 1dfac0d..4030038 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -60,5 +60,4 @@ You can use the following line to patch authorities: - 9.4.6 - 9.4.7 - 9.4.8 -- 9.5.0 diff --git a/patches/compact/950.patch b/patches/compact/950.patch deleted file mode 100644 index f755879..0000000 --- a/patches/compact/950.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-08-12 17:12:52.667032201 +0300 ---- to/res/layout/widget_chat_list_adapter_item_text.xml 2019-08-12 17:13:38.650669506 +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-08-12 17:12:51.407023798 +0300 ---- to/res/layout-v17/widget_chat_list_adapter_item_text.xml 2019-08-12 17:13:38.650669506 +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-08-12 17:12:52.937034002 +0300 ---- to/res/values/dimens.xml 2019-08-12 17:13:38.650669506 +0300 -*************** -*** 334,340 **** - 4.0dip - 1.0dip - 96.0dip -! 58.0dip - 48.0dip - 72.0dip - 3.0dip ---- 334,340 ---- - 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 56449f3..0e0b785 100644 --- a/patches/compact/README.md +++ b/patches/compact/README.md @@ -44,5 +44,4 @@ This patch, when combined with `smalltime` patch, emulates the "compact"/"irc" t - 9.4.6 - 9.4.7 - 9.4.8 -- 9.5.0 diff --git a/patches/customdefaultemoji/950.patch b/patches/customdefaultemoji/950.patch deleted file mode 100644 index d3a25e2..0000000 --- a/patches/customdefaultemoji/950.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-08-31 14:22:09.818057643 +0300 ---- to/smali/com/discord/stores/StoreEmoji.smali 2019-08-31 14:23:05.848389068 +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 5fe68b4..824177b 100644 --- a/patches/customdefaultemoji/README.md +++ b/patches/customdefaultemoji/README.md @@ -26,5 +26,4 @@ This patch changes default list of custom emojis. - 9.4.6 - 9.4.7 - 9.4.8 -- 9.5.0 diff --git a/patches/customtheme/950.patch b/patches/customtheme/950.patch deleted file mode 100644 index e75cc26..0000000 --- a/patches/customtheme/950.patch +++ /dev/null @@ -1,265 +0,0 @@ -diff -crB from/res/values/colors.xml to/res/values/colors.xml -*** from/res/values/colors.xml 2019-08-31 14:22:08.218048179 +0300 ---- to/res/values/colors.xml 2019-08-31 14:23:15.051776836 +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 -*************** -*** 151,165 **** - #ff72767d - #4d72767d - #9972767d -! #ff4f545c -! #4d4f545c -! #994f545c - #ff40444b -! #ff36393f -! #9936393f -! #ff2f3136 -! #992f3136 -! #e62f3136 - #ff292b2f - #ff202225 - #99202225 ---- 151,165 ---- - #ff72767d - #4d72767d - #9972767d -! #ff0f0f0f -! #4d0f0f0f -! #990f0f0f - #ff40444b -! #ff000000 -! #99000000 -! #ff000000 -! #99000000 -! #e6000000 - #ff292b2f - #ff202225 - #99202225 -*************** -*** 192,200 **** - #de000000 - #4dffffff - #39000000 -! #ff738bd7 -! #1a738bd7 -! #ff697ec4 - #ffc9d2f0 - #ff5161ff - #4d5c6a9e ---- 192,200 ---- - #de000000 - #4dffffff - #39000000 -! #ff9c4249 -! #1a9c4249 -! #ff000000 - #ffc9d2f0 - #ff5161ff - #4d5c6a9e -diff -crB from/res/values/styles.xml to/res/values/styles.xml -*** from/res/values/styles.xml 2019-08-31 14:22:08.178047943 +0300 ---- to/res/values/styles.xml 2019-08-31 14:23:15.051776836 +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 -*************** -*** 336,342 **** - @color/white_alpha_40 - @drawable/ic_backspace_white_24dp - @color/primary_500 -! #ff34373c - @color/grey_unread - @color/grey_channels - @color/grey_account ---- 336,342 ---- - @color/white_alpha_40 - @drawable/ic_backspace_white_24dp - @color/primary_500 -! @color/primary_500 - @color/grey_unread - @color/grey_channels - @color/grey_account -*************** -*** 350,361 **** - @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 ---- 350,361 ---- - @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 -*************** -*** 421,427 **** - @color/brand_500 - @color/primary_100 - @color/primary_600 -! #ff2b2e31 - - - - - - -