From 177b5c5893d095f73f0b3ef38c4099fe3990cf62 Mon Sep 17 00:00:00 2001 From: 46620 <46620osu@gmail.com> Date: Wed, 28 Jul 2021 16:38:20 +0000 Subject: [PATCH] 86.1 - Alpha (86201) --- README.md | 2 +- patches/betterdmheader/86201.patch | 68 ++++++ patches/betterdmheader/README.md | 1 + patches/branding/86201.patch | 225 ++++++++++++++++++++ patches/branding/README.md | 1 + patches/customversion/86201.patch | 20 ++ patches/customversion/README.md | 1 + patches/disable-mobileindicator/86201.patch | 92 ++++++++ patches/disable-mobileindicator/README.md | 1 + patches/noblocked/86201.patch | 18 ++ patches/noblocked/README.md | 1 + patches/squareavatars/86201.patch | 42 ++++ patches/squareavatars/README.md | 1 + patchport-state.json | 2 +- 14 files changed, 473 insertions(+), 2 deletions(-) create mode 100644 patches/betterdmheader/86201.patch create mode 100644 patches/branding/86201.patch create mode 100644 patches/customversion/86201.patch create mode 100644 patches/disable-mobileindicator/86201.patch create mode 100644 patches/noblocked/86201.patch create mode 100644 patches/squareavatars/86201.patch diff --git a/README.md b/README.md index d01c35b..810f630 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Modular Client Mod for Discord's Android app. -**Latest supported Discord Android version:** 83.10 - Alpha (83210), released on 2021-07-04. +**Latest supported Discord Android version:** 86.1 - Alpha (86201), released on 2021-07-28. New patch development will be done for the latest supported version. diff --git a/patches/betterdmheader/86201.patch b/patches/betterdmheader/86201.patch new file mode 100644 index 0000000..00f50eb --- /dev/null +++ b/patches/betterdmheader/86201.patch @@ -0,0 +1,68 @@ +diff --color -crB com.discord-base/res/menu/menu_chat_toolbar.xml com.discord/res/menu/menu_chat_toolbar.xml +*** com.discord-base/res/menu/menu_chat_toolbar.xml 2021-06-03 15:00:13.923995379 +0000 +--- com.discord/res/menu/menu_chat_toolbar.xml 2021-06-03 15:06:45.358117680 +0000 +*************** +*** 1,12 **** + + +! + + + +! + +! + +! +\ No newline at end of file +--- 1,12 ---- + + +! + + + +! + +! + +! +diff -crB com.discord-base/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali com.discord/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali +*** com.discord-base/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2021-06-03 15:00:16.264008075 +0000 +--- com.discord/smali_classes2/com/discord/widgets/home/WidgetHomeHeaderManager$getOnConfigureAction$1.smali 2021-06-03 15:12:19.415927487 +0000 +*************** +*** 181,187 **** + + invoke-static {v3, v9}, Ld0/z/d/m;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v8}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 181,187 ---- + + invoke-static {v3, v9}, Ld0/z/d/m;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! invoke-interface {v3, v2}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 7 + invoke-interface {p1, v8}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +*************** +*** 260,266 **** + + xor-int/2addr v4, v2 + +! invoke-interface {v3, v4}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 13 + invoke-interface {p1, v6}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; +--- 260,266 ---- + + xor-int/2addr v4, v2 + +! invoke-interface {v3, v1}, Landroid/view/MenuItem;->setVisible(Z)Landroid/view/MenuItem; + + .line 13 + invoke-interface {p1, v6}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem; diff --git a/patches/betterdmheader/README.md b/patches/betterdmheader/README.md index b038afb..881b280 100644 --- a/patches/betterdmheader/README.md +++ b/patches/betterdmheader/README.md @@ -35,3 +35,4 @@ This patch replaces the call button on DM headers with search button. The call b - 81.11 - Beta - 82.6 - Alpha - 83.10 - Alpha +- 86.1 - Alpha diff --git a/patches/branding/86201.patch b/patches/branding/86201.patch new file mode 100644 index 0000000..89343d2 --- /dev/null +++ b/patches/branding/86201.patch @@ -0,0 +1,225 @@ +diff --color -crB com.discord-base/AndroidManifest.xml com.discord/AndroidManifest.xml +*** com.discord-base/AndroidManifest.xml 2021-06-01 20:30:56.781349523 +0000 +--- com.discord/AndroidManifest.xml 2021-06-01 20:38:49.344651420 +0000 +*************** +*** 1,4 **** +! + + + +--- 1,4 ---- +! + + + +*************** +*** 22,28 **** + + + +! + + + +--- 22,28 ---- + + + +! + + + +*************** +*** 35,41 **** + + + +! + + + +--- 35,41 ---- + + + +! + + + +*************** +*** 143,149 **** + + + +! + + + +--- 143,149 ---- + + + +! + + + +*************** +*** 166,172 **** + + + +! + + + +--- 166,172 ---- + + + +! + + + +*************** +*** 210,218 **** + + + +! + +! + + + +--- 210,218 ---- + + + +! + +! + + + +*************** +*** 267,270 **** + + + +! +\ No newline at end of file +--- 267,270 ---- + + + +! +diff --color -crB com.discord-base/apktool.yml com.discord/apktool.yml +*** com.discord-base/apktool.yml 2021-06-01 17:16:48.545258394 +0000 +--- com.discord/apktool.yml 2021-06-01 21:07:32.119096655 +0000 +*************** +*** 1,5 **** + !!brut.androlib.meta.MetaInfo +! apkFileName: com.discord-86201.apk + compressionType: false + doNotCompress: + - resources.arsc +--- 1,5 ---- + !!brut.androlib.meta.MetaInfo +! apkFileName: com.cutthecord.CTCBRANCH-86201.apk + compressionType: false + doNotCompress: + - resources.arsc +diff --color -crB com.discord-base/res/values/strings.xml com.discord/res/values/strings.xml +*** com.discord-base/res/values/strings.xml 2021-06-01 17:16:48.953260531 +0000 +--- com.discord/res/values/strings.xml 2021-06-01 21:46:44.631007562 +0000 +*************** +*** 2098,2104 **** + Disconnect + Disconnect + User has been disconnected from voice. +! Discord-Canary + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Imagine a place + discord.gg/ +--- 2098,2104 ---- + Disconnect + Disconnect + User has been disconnected from voice. +! CTCNAME + Join over 100 million people who use Discord to talk and hang out with communities and friends. + Imagine a place + discord.gg/ +*************** +*** 5697,5703 **** + Failed to reply to {recipient} + Replied to {recipient} + Notification Settings +! Discord + "Somebody Playin'" + Notifications + Notifications, muted +--- 5697,5703 ---- + Failed to reply to {recipient} + Replied to {recipient} + Notification Settings +! CTCNAME + "Somebody Playin'" + Notifications + Notifications, muted +*************** +*** 7947,7953 **** + Suggested Friends + Suggestions + %1$s, %2$s +! Support + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +--- 7947,7953 ---- + Suggested Friends + Suggestions + %1$s, %2$s +! Gitlab Repo + Remove all embeds + This will remove all embeds on this message for everyone. + Remove All Embeds +diff --color -crB com.discord-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali +*** com.discord-base/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2021-06-01 17:16:49.173261683 +0000 +--- com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1.smali 2021-06-01 21:50:33.255916346 +0000 +*************** +*** 104,110 **** + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://discord.com/app" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +--- 104,110 ---- + .line 3 + new-instance v0, Landroid/content/Intent; + +! const-string v1, "https://gitdab.com/distok/cutthecord/issues/22#issuecomment-82" + + .line 4 + invoke-static {v1}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri; +diff --color -crB com.discord-base/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$1$21.smali com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$1$21.smali +*** com.discord-base/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$1$21.smali 2021-06-01 17:16:49.461263192 +0000 +--- com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings$onViewBound$1$21.smali 2021-06-01 21:59:39.038419446 +0000 +*************** +*** 89,95 **** + + invoke-static {v1, p1}, Ld0/z/d/m;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://support.discord.com" + + const/4 v3, 0x0 + +--- 89,95 ---- + + invoke-static {v1, p1}, Ld0/z/d/m;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V + +! const-string v2, "https://git.46620.moe/femboy-apps/discord/cutthecord" + + const/4 v3, 0x0 + diff --git a/patches/branding/README.md b/patches/branding/README.md index 9892d7d..0c50319 100644 --- a/patches/branding/README.md +++ b/patches/branding/README.md @@ -49,3 +49,4 @@ You can use the following line to patch authorities: - 81.11 - Beta - 82.6 - Alpha - 83.10 - Alpha +- 86.1 - Alpha diff --git a/patches/customversion/86201.patch b/patches/customversion/86201.patch new file mode 100644 index 0000000..41a172a --- /dev/null +++ b/patches/customversion/86201.patch @@ -0,0 +1,20 @@ +diff --color -crB com.discord-base/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali +*** com.discord-base/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali 2021-06-03 15:00:16.364008616 +0000 +--- com.discord/smali_classes2/com/discord/widgets/settings/WidgetSettings.smali 2021-06-03 15:14:42.460701540 +0000 +*************** +*** 813,819 **** + + invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + +! const-string v1, " - 86.1 - Alpha (86201)" + + invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + +--- 813,819 ---- + + invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + +! const-string v1, " - 99.99.99 (86201), made with love" + + invoke-virtual {v2, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + diff --git a/patches/customversion/README.md b/patches/customversion/README.md index e058d80..0eef2dc 100644 --- a/patches/customversion/README.md +++ b/patches/customversion/README.md @@ -35,3 +35,4 @@ This patch replaces version string and adds mention of cutthecord in the user se - 81.11 - Beta - 82.6 - Alpha - 83.10 - Alpha +- 86.1 - Alpha diff --git a/patches/disable-mobileindicator/86201.patch b/patches/disable-mobileindicator/86201.patch new file mode 100644 index 0000000..b7648c3 --- /dev/null +++ b/patches/disable-mobileindicator/86201.patch @@ -0,0 +1,92 @@ +diff --color -crB from/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali to/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali +*** com.discord-base/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2021-06-01 17:16:49.169261662 +0000 +--- com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali 2021-06-01 22:16:21.775478972 +0000 +*************** +*** 432,502 **** + .end method + + .method private final setSuperProperties(Ljava/util/Map;)V +! .locals 3 +! .annotation system Ldalvik/annotation/Signature; +! value = { +! "(", +! "Ljava/util/Map<", +! "Ljava/lang/String;", +! "+", +! "Ljava/lang/Object;", +! ">;)V" +! } +! .end annotation +! +! sget-object v0, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->superProperties$delegate:Lkotlin/properties/ReadWriteProperty; +! +! sget-object v1, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->$$delegatedProperties:[Lkotlin/reflect/KProperty; +! +! const/4 v2, 0x0 +! +! aget-object v1, v1, v2 +! +! invoke-interface {v0, p0, v1, p1}, Lkotlin/properties/ReadWriteProperty;->setValue(Ljava/lang/Object;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V + + return-void + .end method + + .method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V +! .locals 1 +! .annotation system Ldalvik/annotation/Signature; +! value = { +! "(", +! "Ljava/util/Map<", +! "Ljava/lang/String;", +! "+", +! "Ljava/lang/Object;", +! ">;)V" +! } +! .end annotation +! +! monitor-enter p0 +! +! .line 1 +! :try_start_0 +! invoke-virtual {p0}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->getSuperProperties()Ljava/util/Map; +! +! move-result-object v0 +! +! invoke-static {v0, p1}, Ld0/t/h0;->plus(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map; +! +! move-result-object p1 +! +! invoke-direct {p0, p1}, Lcom/discord/utilities/analytics/AnalyticSuperProperties;->setSuperProperties(Ljava/util/Map;)V +! :try_end_0 +! .catchall {:try_start_0 .. :try_end_0} :catchall_0 +! +! .line 2 +! monitor-exit p0 + + return-void +- +- :catchall_0 +- move-exception p1 +- +- monitor-exit p0 +- +- throw p1 + .end method + + +--- 432,446 ---- + .end method + + .method private final setSuperProperties(Ljava/util/Map;)V +! .locals 0 + + return-void + .end method + + .method private final declared-synchronized updateSuperProperties(Ljava/util/Map;)V +! .locals 0 + + return-void + .end method + + diff --git a/patches/disable-mobileindicator/README.md b/patches/disable-mobileindicator/README.md index bfac85a..33b41c5 100644 --- a/patches/disable-mobileindicator/README.md +++ b/patches/disable-mobileindicator/README.md @@ -20,3 +20,4 @@ Between 8.3.0 and 33.1: This patch replaces the browser name from "Discord Andro - 81.11 - Beta - 82.6 - Alpha - 83.10 - Alpha +- 86.1 - Alpha diff --git a/patches/noblocked/86201.patch b/patches/noblocked/86201.patch new file mode 100644 index 0000000..985a85f --- /dev/null +++ b/patches/noblocked/86201.patch @@ -0,0 +1,18 @@ +diff -crB -x dist -x build com.discord-835-base/res/layout/widget_chat_list_adapter_item_blocked.xml com.discord-835/res/layout/widget_chat_list_adapter_item_blocked.xml +*** com.discord-835-base/res/layout/widget_chat_list_adapter_item_blocked.xml 2019-01-25 10:57:34.359248256 +0300 +--- com.discord-835/res/layout/widget_chat_list_adapter_item_blocked.xml 2019-01-27 00:08:22.929085528 +0300 +*************** +*** 1,5 **** + +! +! + +\ No newline at end of file +--- 1,5 ---- + +! +! + +\ No newline at end of file \ No newline at end of file diff --git a/patches/noblocked/README.md b/patches/noblocked/README.md index dd4110f..842c517 100644 --- a/patches/noblocked/README.md +++ b/patches/noblocked/README.md @@ -33,3 +33,4 @@ This patch completely hides the "# Blocked Message(s)" thing. - 81.11 - Beta - 82.6 - Alpha - 83.10 - Alpha +- 86.1 - Alpha diff --git a/patches/squareavatars/86201.patch b/patches/squareavatars/86201.patch new file mode 100644 index 0000000..5fda354 --- /dev/null +++ b/patches/squareavatars/86201.patch @@ -0,0 +1,42 @@ +diff --color -crB com.discord-base/res/values/dimens.xml com.discord-mod/res/values/dimens.xml +*** com.discord-base/res/values/dimens.xml 2021-06-01 17:16:48.949260510 +0000 +--- com.discord/res/values/dimens.xml 2021-06-01 22:31:55.552836411 +0000 +*************** +*** 261,267 **** + 6.0dip + 16.0dip + 4.0dip +! 12.0dip + 54.0dip + 6.0dip + 72.0dip +--- 261,267 ---- + 6.0dip + 16.0dip + 4.0dip +! 0.0dip + 54.0dip + 6.0dip + 72.0dip +diff --color -crB com.discord-base/res/values/styles.xml com.discord/res/values/styles.xml +*** com.discord-base/res/values/styles.xml 2021-06-01 17:16:48.953260531 +0000 +--- com.discord/res/values/styles.xml 2021-06-01 22:36:04.570193047 +0000 +*************** +*** 1133,1139 **** + fitCenter + ?asset_default_avatar_32dp + fitCenter +! true + + +