From b39f916337dbfa35ef83614ff5ec01f26e00b55a Mon Sep 17 00:00:00 2001 From: Ave Ozkal Date: Mon, 12 Aug 2019 21:15:05 +0300 Subject: [PATCH] Get rid of 9.1.2 patches which do not work --- patches/branding/912.patch | 236 -- patches/compact/912.patch | 79 - patches/customdefaultemoji/912.patch | 81 - patches/customtheme/912.patch | 270 -- patches/customversion/912.patch | 20 - patches/disable-mobileindicator/912.patch | 20 - patches/experiments/912.patch | 180 -- patches/litecord/912.patch | 289 -- patches/mutant/912.patch | 1907 ------------- patches/necessary/912.patch | 14 - patches/noblocked/912.patch | 18 - patches/nonearby/912.patch | 102 - patches/noprofilestrip/912.patch | 55 - patches/nospoiler/912.patch | 65 - patches/notrack/912.patch | 3049 -------------------- patches/nozlib/912.patch | 34 - patches/pureevil/912.patch | 45 - patches/slashcommands/912.patch | 3130 --------------------- patches/smalltime/912.patch | 190 -- patches/squareavatars/912.patch | 21 - patches/tokenlogin/912.patch | 33 - 21 files changed, 9838 deletions(-) delete mode 100644 patches/branding/912.patch delete mode 100644 patches/compact/912.patch delete mode 100644 patches/customdefaultemoji/912.patch delete mode 100644 patches/customtheme/912.patch delete mode 100644 patches/customversion/912.patch delete mode 100644 patches/disable-mobileindicator/912.patch delete mode 100644 patches/experiments/912.patch delete mode 100644 patches/litecord/912.patch delete mode 100644 patches/mutant/912.patch delete mode 100644 patches/necessary/912.patch delete mode 100644 patches/noblocked/912.patch delete mode 100644 patches/nonearby/912.patch delete mode 100644 patches/noprofilestrip/912.patch delete mode 100644 patches/nospoiler/912.patch delete mode 100644 patches/notrack/912.patch delete mode 100644 patches/nozlib/912.patch delete mode 100644 patches/pureevil/912.patch delete mode 100644 patches/slashcommands/912.patch delete mode 100644 patches/smalltime/912.patch delete mode 100644 patches/squareavatars/912.patch delete mode 100644 patches/tokenlogin/912.patch diff --git a/patches/branding/912.patch b/patches/branding/912.patch deleted file mode 100644 index e92aa56..0000000 --- a/patches/branding/912.patch +++ /dev/null @@ -1,236 +0,0 @@ -diff -crB com.discord-912-base/AndroidManifest.xml com.discord-912/AndroidManifest.xml -*** com.discord-912-base/AndroidManifest.xml 2019-07-11 00:34:28.153108378 +0300 ---- com.discord-912/AndroidManifest.xml 2019-07-11 14:33:25.821964562 +0300 -*************** -*** 1,4 **** -! - - - ---- 1,4 ---- -! - - - -*************** -*** 18,28 **** - - - -! - - - -! - - - ---- 18,28 ---- - - - -! - - - -! - - - -*************** -*** 77,83 **** - - - -! - - - ---- 77,83 ---- - - - -! - - - -*************** -*** 105,118 **** - - - -! - - - - - - -! - - - ---- 105,118 ---- - - - -! - - - - - - -! - - - -*************** -*** 175,181 **** - - - -! - - - ---- 175,181 ---- - - - -! - - - -*************** -*** 186,193 **** - - - -! -! - - - ---- 186,193 ---- - - - -! -! - - - -Only in com.discord-912: AndroidManifest.xml.orig -Only in com.discord-912: AndroidManifest.xml.rej -diff -crB com.discord-912-base/apktool.yml com.discord-912/apktool.yml -*** com.discord-912-base/apktool.yml 2019-07-11 00:34:19.979726547 +0300 ---- com.discord-912/apktool.yml 2019-07-11 14:26:29.223084876 +0300 -*************** -*** 308,312 **** - tag: null - version: 2.4.1-73ac0d-SNAPSHOT - versionInfo: -! versionCode: '912' -! versionName: 9.1.2-SA ---- 308,312 ---- - tag: null - version: 2.4.1-73ac0d-SNAPSHOT - versionInfo: -! versionCode: '912CTCBUILD' -! versionName: 9.1.2-SA-cutthecord-CTCBUILD -diff -crB com.discord-912-base/res/values/strings.xml com.discord-912/res/values/strings.xml -*** com.discord-912-base/res/values/strings.xml 2019-07-11 00:34:13.503021451 +0300 ---- com.discord-912/res/values/strings.xml 2019-07-11 14:26:29.226418227 +0300 -*************** -*** 1322,1328 **** - 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/ ---- 1322,1328 ---- - 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/ -*************** -*** 3092,3098 **** - Failed to reply to %1$s - Replied to %1$s - Notification Settings -! Discord - "Somebody Playin'" - Join them: %1$s - Join the party! ---- 3092,3098 ---- - Failed to reply to %1$s - Replied to %1$s - Notification Settings -! CTCNAME - "Somebody Playin'" - Join them: %1$s - Join the party! -*************** -*** 4171,4177 **** - 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." ---- 4171,4177 ---- - 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-912/res/values: strings.xml.orig -diff -crB com.discord-912-base/smali/com/discord/app/e.smali com.discord-912/smali/com/discord/app/e.smali -*** com.discord-912-base/smali/com/discord/app/e.smali 2019-07-11 00:34:15.959702694 +0300 ---- com.discord-912/smali/com/discord/app/e.smali 2019-07-11 14:26:29.226418227 +0300 -*************** -*** 53,59 **** - .line 15 - sput-object v0, Lcom/discord/app/e;->sH:Ljava/lang/String; - -! const-string v0, "https://support.discordapp.com" - - .line 16 - sput-object v0, Lcom/discord/app/e;->sI:Ljava/lang/String; ---- 53,59 ---- - .line 15 - sput-object v0, Lcom/discord/app/e;->sH:Ljava/lang/String; - -! const-string v0, "https://gitdab.com/distok/cutthecord" - - .line 16 - sput-object v0, Lcom/discord/app/e;->sI:Ljava/lang/String; -diff -crB com.discord-912-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali com.discord-912/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali -*** com.discord-912-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-07-11 00:34:16.483039133 +0300 ---- com.discord-912/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2019-07-11 14:26:29.226418227 +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/compact/912.patch b/patches/compact/912.patch deleted file mode 100644 index 1a8096a..0000000 --- a/patches/compact/912.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/customdefaultemoji/912.patch b/patches/customdefaultemoji/912.patch deleted file mode 100644 index 974a726..0000000 --- a/patches/customdefaultemoji/912.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/customtheme/912.patch b/patches/customtheme/912.patch deleted file mode 100644 index 08f1f35..0000000 --- a/patches/customtheme/912.patch +++ /dev/null @@ -1,270 +0,0 @@ -diff -crB com.discord-912-base/res/values/colors.xml com.discord-912/res/values/colors.xml -*** com.discord-912-base/res/values/colors.xml 2019-07-11 00:34:13.339687148 +0300 ---- com.discord-912/res/values/colors.xml 2019-07-11 14:40:56.994367747 +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 -! #ff000000 -! #4d000000 -! #99000000 -! #ff000000 -! #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 -Only in com.discord-912/res/values: colors.xml.orig -Only in com.discord-912/res/values: colors.xml.rej -diff -crB com.discord-912-base/res/values/styles.xml com.discord-912/res/values/styles.xml -*** com.discord-912-base/res/values/styles.xml 2019-07-11 00:34:13.389687445 +0300 ---- com.discord-912/res/values/styles.xml 2019-07-11 14:39:08.493789172 +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 -*************** -*** 312,318 **** - @color/white - @color/white_alpha_40 - @drawable/ic_backspace_white_24dp -! #ff34373c - @color/grey_unread - @color/grey_channels - @color/grey_account ---- 312,318 ---- - @color/white - @color/white_alpha_40 - @drawable/ic_backspace_white_24dp -! @color/primary_500 - @color/grey_unread - @color/grey_channels - @color/grey_account -*************** -*** 326,337 **** - @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 ---- 326,337 ---- - @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 -*************** -*** 397,403 **** - @color/brand_500 - @color/primary_100 - @color/primary_600 -! #ff2b2e31 - - - - - - -