Compare commits

..

1 commit

Author SHA1 Message Date
ave
86ebe8e67d 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
2021-08-22 23:48:00 +03:00
3 changed files with 33 additions and 14 deletions

View file

@ -2,9 +2,7 @@
Modular Client Mod for Discord's Android app. Modular Client Mod for Discord's Android app.
**THIS IS A WORK IN PROGRESS BRANCH! SOME PATCHES ARE MISSING (tokenlogin, hideunusableemojis, plus showtag has a bug)!** **THIS IS A WORK IN PROGRESS BRANCH! THE PATCHES ARE INCOMPLETE!**
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 For status updates and support on the project, join #cutthecord on https://libera.chat. WebIRC link: https://web.libera.chat/#cutthecord
@ -12,7 +10,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. New patch development will be done for the latest supported version.
![A CutTheCord screenshot](https://elixi.re/t/m16z287iw.png) ![A CutTheCord screenshot](https://elixi.re/t/mh3eirsy9.png)
Check out [README.md in patches folder to see what patches are available and what each of them do](patches/README.md)! Check out [README.md in patches folder to see what patches are available and what each of them do](patches/README.md)!

View file

@ -1,2 +1 @@
#!/bin/bash #!/bin/bash
mv smali/com/airbnb smali_classes2/com/

View file

@ -1,11 +1,9 @@
Binary files com.discord-base/build/apk/classes.dex and com.discord/build/apk/classes.dex differ 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
Binary files com.discord-base/dist/com.discord-78204.apk and com.discord/dist/com.discord-78204.apk differ *** com.discord-87202-base/smali/com/discord/models/member/GuildMember$Companion.smali 2021-08-22 22:08:12.812390705 +0300
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-87202/smali/com/discord/models/member/GuildMember$Companion.smali 2021-08-22 23:39:54.753848426 +0300
*** 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
*************** ***************
*** 530,535 **** *** 530,535 ****
--- 530,567 ---- --- 530,581 ----
:goto_4 :goto_4
if-eqz v0, :cond_8 if-eqz v0, :cond_8
@ -31,7 +29,21 @@ diff -crB com.discord-base/smali/com/discord/models/member/GuildMember$Companion
+ +
+ move-result v2 + 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;-><init>(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, ")" + const-string v2, ")"
+ +
@ -46,7 +58,7 @@ diff -crB com.discord-base/smali/com/discord/models/member/GuildMember$Companion
:cond_8 :cond_8
*************** ***************
*** 537,542 **** *** 537,542 ****
--- 569,592 ---- --- 583,616 ----
move-result-object v0 move-result-object v0
@ -62,7 +74,17 @@ diff -crB com.discord-base/smali/com/discord/models/member/GuildMember$Companion
+ +
+ move-result v2 + 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;-><init>(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; + invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+ +