From 7a7055a66d42aa70e74be33c536b3b3abfc03fef Mon Sep 17 00:00:00 2001 From: Ave Ozkal Date: Tue, 1 Oct 2019 23:19:52 +0300 Subject: [PATCH] Fix noprofilestrip --- patches/noprofilestrip/963.patch | 55 -------------------------------- patches/noprofilestrip/964.patch | 21 ++++++------ patches/noprofilestrip/README.md | 1 - 3 files changed, 10 insertions(+), 67 deletions(-) delete mode 100644 patches/noprofilestrip/963.patch diff --git a/patches/noprofilestrip/963.patch b/patches/noprofilestrip/963.patch deleted file mode 100644 index 400dc30..0000000 --- a/patches/noprofilestrip/963.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -crB com.discord-910-base/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali com.discord-910/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali -*** com.discord-910-base/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali 2019-06-25 14:39:18.242542912 +0300 ---- com.discord-910/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali 2019-06-25 14:44:50.891235106 +0300 -*************** -*** 440,454 **** - - move-result-object v2 - -! invoke-virtual {p1}, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; -! -! move-result-object v4 -! -! invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String; -! -! move-result-object v4 -! -! check-cast v4, Ljava/lang/CharSequence; - - invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V - ---- 440,446 ---- - - move-result-object v2 - -! const-string v4, "" - - invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V - -*************** -*** 457,471 **** - - move-result-object v2 - -! invoke-virtual {p1}, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; -! -! move-result-object p1 -! -! invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getDiscriminatorWithPadding()Ljava/lang/String; -! -! move-result-object p1 -! -! check-cast p1, Ljava/lang/CharSequence; - - invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V - ---- 449,455 ---- - - move-result-object v2 - -! const-string p1, "" - - invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V - -Only in com.discord-910/smali/com/discord/widgets/user: WidgetUserProfileStrip.smali.orig -Only in com.discord-910/smali/com/discord/widgets/user: WidgetUserProfileStrip.smali.rej diff --git a/patches/noprofilestrip/964.patch b/patches/noprofilestrip/964.patch index 400dc30..37e96f7 100644 --- a/patches/noprofilestrip/964.patch +++ b/patches/noprofilestrip/964.patch @@ -1,12 +1,12 @@ -diff -crB com.discord-910-base/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali com.discord-910/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali -*** com.discord-910-base/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali 2019-06-25 14:39:18.242542912 +0300 ---- com.discord-910/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali 2019-06-25 14:44:50.891235106 +0300 +diff -crB com.discord-964-base/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali com.discord-964/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali +*** com.discord-964-base/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2019-10-01 23:18:34.424827650 +0300 +--- com.discord-964/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali 2019-10-01 23:18:09.171329729 +0300 *************** -*** 440,454 **** +*** 426,440 **** move-result-object v2 -! invoke-virtual {p1}, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; +! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; ! ! move-result-object v4 ! @@ -18,7 +18,7 @@ diff -crB com.discord-910-base/smali/com/discord/widgets/user/WidgetUserProfileS invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V ---- 440,446 ---- +--- 426,432 ---- move-result-object v2 @@ -27,11 +27,11 @@ diff -crB com.discord-910-base/smali/com/discord/widgets/user/WidgetUserProfileS invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V *************** -*** 457,471 **** +*** 443,457 **** move-result-object v2 -! invoke-virtual {p1}, Lcom/discord/widgets/user/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; +! invoke-virtual {p1}, Lcom/discord/widgets/user/profile/WidgetUserProfileStrip$Model;->getUser()Lcom/discord/models/domain/ModelUser; ! ! move-result-object p1 ! @@ -43,7 +43,7 @@ diff -crB com.discord-910-base/smali/com/discord/widgets/user/WidgetUserProfileS invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V ---- 449,455 ---- +--- 435,441 ---- move-result-object v2 @@ -51,5 +51,4 @@ diff -crB com.discord-910-base/smali/com/discord/widgets/user/WidgetUserProfileS invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V -Only in com.discord-910/smali/com/discord/widgets/user: WidgetUserProfileStrip.smali.orig -Only in com.discord-910/smali/com/discord/widgets/user: WidgetUserProfileStrip.smali.rej + diff --git a/patches/noprofilestrip/README.md b/patches/noprofilestrip/README.md index 4bbeea0..674bf5f 100644 --- a/patches/noprofilestrip/README.md +++ b/patches/noprofilestrip/README.md @@ -40,6 +40,5 @@ This patch removes the "profile strip" from the left side menu, helping remove P - 9.4.6 - 9.4.7 - 9.4.8 -- 9.6.3 - 9.6.4