From 86ebe8e67d2b0e766b682d39c7e5d5a255c018c1 Mon Sep 17 00:00:00 2001 From: ave Date: Sun, 22 Aug 2021 23:48:00 +0300 Subject: [PATCH 1/5] showtag: zero-left-pad discrims THIS IS BROKEN! > Caused by: java.lang.VerifyError: Verifier rejected class com.discord.models.member.GuildMember$Companion: java.lang.String com.discord.models.member.GuildMember$Companion.getNickOrUsername(com.discord.models.user.User, com.discord.models.member.GuildMember, com.discord.api.channel.Channel, java.util.List) failed to verify: java.lang.String com.discord.models.member.GuildMember$Companion.getNickOrUsername(com.discord.models.user.User, com.discord.models.member.GuildMember, com.discord.api.channel.Channel, java.util.List): [0x6B] copyRes1 v2<- result0 type=Precise Reference: java.lang.String (declaration of 'com.discord.models.member.GuildMember$Companion' [...] https://docs.oracle.com/javase/7/docs/api/java/text/DecimalFormat.html --- resources/patches/notrack/87202-post.sh | 1 - resources/patches/showtag/87202.patch | 40 +++++++++++++++++++------ 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/resources/patches/notrack/87202-post.sh b/resources/patches/notrack/87202-post.sh index 27b03f0..a9bf588 100644 --- a/resources/patches/notrack/87202-post.sh +++ b/resources/patches/notrack/87202-post.sh @@ -1,2 +1 @@ #!/bin/bash -mv smali/com/airbnb smali_classes2/com/ diff --git a/resources/patches/showtag/87202.patch b/resources/patches/showtag/87202.patch index 0ae2bf0..7675f48 100644 --- a/resources/patches/showtag/87202.patch +++ b/resources/patches/showtag/87202.patch @@ -1,11 +1,9 @@ -Binary files com.discord-base/build/apk/classes.dex and com.discord/build/apk/classes.dex differ -Binary files com.discord-base/dist/com.discord-78204.apk and com.discord/dist/com.discord-78204.apk differ -diff -crB com.discord-base/smali/com/discord/models/member/GuildMember$Companion.smali com.discord/smali/com/discord/models/member/GuildMember$Companion.smali -*** com.discord-base/smali/com/discord/models/member/GuildMember$Companion.smali 2021-05-31 14:05:54.000000000 +0300 ---- com.discord/smali/com/discord/models/member/GuildMember$Companion.smali 2021-05-31 18:27:22.000000000 +0300 +diff --color -crB com.discord-87202-base/smali/com/discord/models/member/GuildMember$Companion.smali com.discord-87202/smali/com/discord/models/member/GuildMember$Companion.smali +*** com.discord-87202-base/smali/com/discord/models/member/GuildMember$Companion.smali 2021-08-22 22:08:12.812390705 +0300 +--- com.discord-87202/smali/com/discord/models/member/GuildMember$Companion.smali 2021-08-22 23:39:54.753848426 +0300 *************** *** 530,535 **** ---- 530,567 ---- +--- 530,581 ---- :goto_4 if-eqz v0, :cond_8 @@ -31,7 +29,21 @@ diff -crB com.discord-base/smali/com/discord/models/member/GuildMember$Companion + + move-result v2 + -+ invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; ++ invoke-static {v2}, Ljava/lang/Integer;->toString(I)Ljava/lang/String; ++ ++ move-result v2 ++ ++ new-instance v0, Ljava/text/DecimalFormat; ++ ++ const-string v3, "0000" ++ ++ invoke-direct {v0, v3}, Ljava/text/DecimalFormat;->(Ljava/lang/String;)V ++ ++ invoke-virtual {v0, v2}, Ljava/text/DecimalFormat;->format(Ljava/lang/Object;)Ljava/lang/String; ++ ++ move-result-object v2 ++ ++ invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + + const-string v2, ")" + @@ -46,7 +58,7 @@ diff -crB com.discord-base/smali/com/discord/models/member/GuildMember$Companion :cond_8 *************** *** 537,542 **** ---- 569,592 ---- +--- 583,616 ---- move-result-object v0 @@ -62,7 +74,17 @@ diff -crB com.discord-base/smali/com/discord/models/member/GuildMember$Companion + + move-result v2 + -+ invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; ++ new-instance v0, Ljava/text/DecimalFormat; ++ ++ const-string v3, "0000" ++ ++ invoke-direct {v0, v3}, Ljava/text/DecimalFormat;->(Ljava/lang/String;)V ++ ++ invoke-virtual {v0, v2}, Ljava/text/DecimalFormat;->format(Ljava/lang/Object;)Ljava/lang/String; ++ ++ move-result-object v2 ++ ++ invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + + invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + From b7aa5694359b8cff55dd9c10b06533ac0e8cf6e5 Mon Sep 17 00:00:00 2001 From: ave Date: Mon, 23 Aug 2021 00:01:16 +0300 Subject: [PATCH 2/5] README: Update readme --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fc55aca..12561b1 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,9 @@ Modular Client Mod for Discord's Android app. -**THIS IS A WORK IN PROGRESS BRANCH! THE PATCHES ARE INCOMPLETE!** +**THIS IS A WORK IN PROGRESS BRANCH! SOME PATCHES ARE MISSING (tokenlogin, hideunusableemojis, plus showtag has a bug)!** + +Current state is good enough™ for an RC release, and there's currently RC releases in the repo. Update away! For status updates and support on the project, join #cutthecord on https://libera.chat. WebIRC link: https://web.libera.chat/#cutthecord @@ -10,7 +12,7 @@ For status updates and support on the project, join #cutthecord on https://liber New patch development will be done for the latest supported version. -![A CutTheCord screenshot](https://elixi.re/t/mh3eirsy9.png) +![A CutTheCord screenshot](https://elixi.re/i/16z287iw.png) Check out [README.md in patches folder to see what patches are available and what each of them do](patches/README.md)! From de8cfb9a1044aa41af01bcc4070f240090913b89 Mon Sep 17 00:00:00 2001 From: ave Date: Mon, 23 Aug 2021 00:03:15 +0300 Subject: [PATCH 3/5] readme: Make the screenshot smaller --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 12561b1..bd82bc6 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ For status updates and support on the project, join #cutthecord on https://liber New patch development will be done for the latest supported version. -![A CutTheCord screenshot](https://elixi.re/i/16z287iw.png) +![A CutTheCord screenshot](https://elixi.re/t/m16z287iw.png) Check out [README.md in patches folder to see what patches are available and what each of them do](patches/README.md)! From a8c17e20328571bb1645eac5d458a71e8799e63a Mon Sep 17 00:00:00 2001 From: ave Date: Tue, 24 Aug 2021 21:47:57 +0300 Subject: [PATCH 4/5] betterrotation: Restore from old-patches --- resources/{old-patches => patches}/betterrotation/1340.patch | 0 resources/{old-patches => patches}/betterrotation/1355.patch | 0 resources/{old-patches => patches}/betterrotation/1356.patch | 0 resources/{old-patches => patches}/betterrotation/1358.patch | 0 resources/{old-patches => patches}/betterrotation/1361.patch | 0 resources/{old-patches => patches}/betterrotation/1362.patch | 0 resources/{old-patches => patches}/betterrotation/1365.patch | 0 resources/{old-patches => patches}/betterrotation/1367.patch | 0 resources/{old-patches => patches}/betterrotation/1368.patch | 0 resources/{old-patches => patches}/betterrotation/1370.patch | 0 resources/{old-patches => patches}/betterrotation/1371.patch | 0 resources/{old-patches => patches}/betterrotation/78204.patch | 0 resources/{old-patches => patches}/betterrotation/87202.patch | 0 resources/{old-patches => patches}/betterrotation/README.md | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename resources/{old-patches => patches}/betterrotation/1340.patch (100%) rename resources/{old-patches => patches}/betterrotation/1355.patch (100%) rename resources/{old-patches => patches}/betterrotation/1356.patch (100%) rename resources/{old-patches => patches}/betterrotation/1358.patch (100%) rename resources/{old-patches => patches}/betterrotation/1361.patch (100%) rename resources/{old-patches => patches}/betterrotation/1362.patch (100%) rename resources/{old-patches => patches}/betterrotation/1365.patch (100%) rename resources/{old-patches => patches}/betterrotation/1367.patch (100%) rename resources/{old-patches => patches}/betterrotation/1368.patch (100%) rename resources/{old-patches => patches}/betterrotation/1370.patch (100%) rename resources/{old-patches => patches}/betterrotation/1371.patch (100%) rename resources/{old-patches => patches}/betterrotation/78204.patch (100%) rename resources/{old-patches => patches}/betterrotation/87202.patch (100%) rename resources/{old-patches => patches}/betterrotation/README.md (100%) diff --git a/resources/old-patches/betterrotation/1340.patch b/resources/patches/betterrotation/1340.patch similarity index 100% rename from resources/old-patches/betterrotation/1340.patch rename to resources/patches/betterrotation/1340.patch diff --git a/resources/old-patches/betterrotation/1355.patch b/resources/patches/betterrotation/1355.patch similarity index 100% rename from resources/old-patches/betterrotation/1355.patch rename to resources/patches/betterrotation/1355.patch diff --git a/resources/old-patches/betterrotation/1356.patch b/resources/patches/betterrotation/1356.patch similarity index 100% rename from resources/old-patches/betterrotation/1356.patch rename to resources/patches/betterrotation/1356.patch diff --git a/resources/old-patches/betterrotation/1358.patch b/resources/patches/betterrotation/1358.patch similarity index 100% rename from resources/old-patches/betterrotation/1358.patch rename to resources/patches/betterrotation/1358.patch diff --git a/resources/old-patches/betterrotation/1361.patch b/resources/patches/betterrotation/1361.patch similarity index 100% rename from resources/old-patches/betterrotation/1361.patch rename to resources/patches/betterrotation/1361.patch diff --git a/resources/old-patches/betterrotation/1362.patch b/resources/patches/betterrotation/1362.patch similarity index 100% rename from resources/old-patches/betterrotation/1362.patch rename to resources/patches/betterrotation/1362.patch diff --git a/resources/old-patches/betterrotation/1365.patch b/resources/patches/betterrotation/1365.patch similarity index 100% rename from resources/old-patches/betterrotation/1365.patch rename to resources/patches/betterrotation/1365.patch diff --git a/resources/old-patches/betterrotation/1367.patch b/resources/patches/betterrotation/1367.patch similarity index 100% rename from resources/old-patches/betterrotation/1367.patch rename to resources/patches/betterrotation/1367.patch diff --git a/resources/old-patches/betterrotation/1368.patch b/resources/patches/betterrotation/1368.patch similarity index 100% rename from resources/old-patches/betterrotation/1368.patch rename to resources/patches/betterrotation/1368.patch diff --git a/resources/old-patches/betterrotation/1370.patch b/resources/patches/betterrotation/1370.patch similarity index 100% rename from resources/old-patches/betterrotation/1370.patch rename to resources/patches/betterrotation/1370.patch diff --git a/resources/old-patches/betterrotation/1371.patch b/resources/patches/betterrotation/1371.patch similarity index 100% rename from resources/old-patches/betterrotation/1371.patch rename to resources/patches/betterrotation/1371.patch diff --git a/resources/old-patches/betterrotation/78204.patch b/resources/patches/betterrotation/78204.patch similarity index 100% rename from resources/old-patches/betterrotation/78204.patch rename to resources/patches/betterrotation/78204.patch diff --git a/resources/old-patches/betterrotation/87202.patch b/resources/patches/betterrotation/87202.patch similarity index 100% rename from resources/old-patches/betterrotation/87202.patch rename to resources/patches/betterrotation/87202.patch diff --git a/resources/old-patches/betterrotation/README.md b/resources/patches/betterrotation/README.md similarity index 100% rename from resources/old-patches/betterrotation/README.md rename to resources/patches/betterrotation/README.md From 59c76a65063332e61e8057dc42df57f8c5d11e3f Mon Sep 17 00:00:00 2001 From: ave Date: Tue, 24 Aug 2021 22:14:28 +0300 Subject: [PATCH 5/5] Revert "betterrotation: Restore from old-patches" This reverts commit a8c17e20328571bb1645eac5d458a71e8799e63a. I am an idiot --- resources/{patches => old-patches}/betterrotation/1340.patch | 0 resources/{patches => old-patches}/betterrotation/1355.patch | 0 resources/{patches => old-patches}/betterrotation/1356.patch | 0 resources/{patches => old-patches}/betterrotation/1358.patch | 0 resources/{patches => old-patches}/betterrotation/1361.patch | 0 resources/{patches => old-patches}/betterrotation/1362.patch | 0 resources/{patches => old-patches}/betterrotation/1365.patch | 0 resources/{patches => old-patches}/betterrotation/1367.patch | 0 resources/{patches => old-patches}/betterrotation/1368.patch | 0 resources/{patches => old-patches}/betterrotation/1370.patch | 0 resources/{patches => old-patches}/betterrotation/1371.patch | 0 resources/{patches => old-patches}/betterrotation/78204.patch | 0 resources/{patches => old-patches}/betterrotation/87202.patch | 0 resources/{patches => old-patches}/betterrotation/README.md | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename resources/{patches => old-patches}/betterrotation/1340.patch (100%) rename resources/{patches => old-patches}/betterrotation/1355.patch (100%) rename resources/{patches => old-patches}/betterrotation/1356.patch (100%) rename resources/{patches => old-patches}/betterrotation/1358.patch (100%) rename resources/{patches => old-patches}/betterrotation/1361.patch (100%) rename resources/{patches => old-patches}/betterrotation/1362.patch (100%) rename resources/{patches => old-patches}/betterrotation/1365.patch (100%) rename resources/{patches => old-patches}/betterrotation/1367.patch (100%) rename resources/{patches => old-patches}/betterrotation/1368.patch (100%) rename resources/{patches => old-patches}/betterrotation/1370.patch (100%) rename resources/{patches => old-patches}/betterrotation/1371.patch (100%) rename resources/{patches => old-patches}/betterrotation/78204.patch (100%) rename resources/{patches => old-patches}/betterrotation/87202.patch (100%) rename resources/{patches => old-patches}/betterrotation/README.md (100%) diff --git a/resources/patches/betterrotation/1340.patch b/resources/old-patches/betterrotation/1340.patch similarity index 100% rename from resources/patches/betterrotation/1340.patch rename to resources/old-patches/betterrotation/1340.patch diff --git a/resources/patches/betterrotation/1355.patch b/resources/old-patches/betterrotation/1355.patch similarity index 100% rename from resources/patches/betterrotation/1355.patch rename to resources/old-patches/betterrotation/1355.patch diff --git a/resources/patches/betterrotation/1356.patch b/resources/old-patches/betterrotation/1356.patch similarity index 100% rename from resources/patches/betterrotation/1356.patch rename to resources/old-patches/betterrotation/1356.patch diff --git a/resources/patches/betterrotation/1358.patch b/resources/old-patches/betterrotation/1358.patch similarity index 100% rename from resources/patches/betterrotation/1358.patch rename to resources/old-patches/betterrotation/1358.patch diff --git a/resources/patches/betterrotation/1361.patch b/resources/old-patches/betterrotation/1361.patch similarity index 100% rename from resources/patches/betterrotation/1361.patch rename to resources/old-patches/betterrotation/1361.patch diff --git a/resources/patches/betterrotation/1362.patch b/resources/old-patches/betterrotation/1362.patch similarity index 100% rename from resources/patches/betterrotation/1362.patch rename to resources/old-patches/betterrotation/1362.patch diff --git a/resources/patches/betterrotation/1365.patch b/resources/old-patches/betterrotation/1365.patch similarity index 100% rename from resources/patches/betterrotation/1365.patch rename to resources/old-patches/betterrotation/1365.patch diff --git a/resources/patches/betterrotation/1367.patch b/resources/old-patches/betterrotation/1367.patch similarity index 100% rename from resources/patches/betterrotation/1367.patch rename to resources/old-patches/betterrotation/1367.patch diff --git a/resources/patches/betterrotation/1368.patch b/resources/old-patches/betterrotation/1368.patch similarity index 100% rename from resources/patches/betterrotation/1368.patch rename to resources/old-patches/betterrotation/1368.patch diff --git a/resources/patches/betterrotation/1370.patch b/resources/old-patches/betterrotation/1370.patch similarity index 100% rename from resources/patches/betterrotation/1370.patch rename to resources/old-patches/betterrotation/1370.patch diff --git a/resources/patches/betterrotation/1371.patch b/resources/old-patches/betterrotation/1371.patch similarity index 100% rename from resources/patches/betterrotation/1371.patch rename to resources/old-patches/betterrotation/1371.patch diff --git a/resources/patches/betterrotation/78204.patch b/resources/old-patches/betterrotation/78204.patch similarity index 100% rename from resources/patches/betterrotation/78204.patch rename to resources/old-patches/betterrotation/78204.patch diff --git a/resources/patches/betterrotation/87202.patch b/resources/old-patches/betterrotation/87202.patch similarity index 100% rename from resources/patches/betterrotation/87202.patch rename to resources/old-patches/betterrotation/87202.patch diff --git a/resources/patches/betterrotation/README.md b/resources/old-patches/betterrotation/README.md similarity index 100% rename from resources/patches/betterrotation/README.md rename to resources/old-patches/betterrotation/README.md