From d81a4624b6bf51634ce82a9f4313b6a7d97db426 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Thu, 15 Apr 2021 13:55:10 +1000 Subject: [PATCH] Fix group editing logic --- Session/Closed Groups/EditClosedGroupVC.swift | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Session/Closed Groups/EditClosedGroupVC.swift b/Session/Closed Groups/EditClosedGroupVC.swift index 66efa8890..8db0b6346 100644 --- a/Session/Closed Groups/EditClosedGroupVC.swift +++ b/Session/Closed Groups/EditClosedGroupVC.swift @@ -299,14 +299,8 @@ final class EditClosedGroupVC : BaseVC, UITableViewDataSource, UITableViewDelega } private func canBeRemoved(_ publicKey: String) -> Bool { - return !isAdmin(publicKey) || isCurrentUser(publicKey) - } - - private func isAdmin(_ publicKey: String) -> Bool { - return thread.groupModel.groupAdminIds.contains(publicKey) - } - - private func isCurrentUser(_ publicKey: String) -> Bool { - return publicKey == getUserHexEncodedPublicKey() + let userPublicKey = getUserHexEncodedPublicKey() + let isCurrentUserAdmin = thread.groupModel.groupAdminIds.contains(userPublicKey) + return isCurrentUserAdmin || (publicKey == userPublicKey) } }