From 34ddf62a18a744392dc5e1257694389a9e17da98 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sat, 11 Jan 2020 10:24:45 +0300 Subject: [PATCH] AccountActivity: don't show moderator badge if user already admin --- .../main/java/com/keylesspalace/tusky/AccountActivity.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt index 40f55a0a..0a81ffc8 100644 --- a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt @@ -392,8 +392,11 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI accountLockedImageView.visible(account.locked) accountBadgeTextView.visible(account.bot) - accountAdminTextView.visible(account.pleroma?.isAdmin ?: false) - accountModeratorTextView.visible(account.pleroma?.isModerator ?: false) + // API can return user is both admin and mod + // but admin rights already implies moderator, so just ignore it + val isAdmin = account.pleroma?.isAdmin ?: false + accountAdminTextView.visible(isAdmin) + accountModeratorTextView.visible(!isAdmin && account.pleroma?.isModerator ?: false) updateAccountAvatar() updateToolbar()