minor issue fix

pull/557/head
Ryan Zhao 4 years ago
parent 8ed77435d8
commit 70a562344c

@ -208,8 +208,7 @@ final class VisibleMessageCell : MessageCell, LinkPreviewViewDelegate {
// MARK: Updating // MARK: Updating
override func update() { override func update() {
guard let viewItem = viewItem, let message = viewItem.interaction as? TSMessage else { return } guard let viewItem = viewItem, let message = viewItem.interaction as? TSMessage else { return }
let thread = message.thread let isGroupThread = viewItem.isGroupThread
let isGroupThread = thread.isGroupThread()
// Profile picture view // Profile picture view
profilePictureViewLeftConstraint.constant = isGroupThread ? VisibleMessageCell.groupThreadHSpacing : 0 profilePictureViewLeftConstraint.constant = isGroupThread ? VisibleMessageCell.groupThreadHSpacing : 0
profilePictureViewWidthConstraint.constant = isGroupThread ? VisibleMessageCell.profilePictureSize : 0 profilePictureViewWidthConstraint.constant = isGroupThread ? VisibleMessageCell.profilePictureSize : 0
@ -218,8 +217,8 @@ final class VisibleMessageCell : MessageCell, LinkPreviewViewDelegate {
if let senderSessionID = senderSessionID { if let senderSessionID = senderSessionID {
profilePictureView.update(for: senderSessionID) profilePictureView.update(for: senderSessionID)
} }
if let thread = thread as? TSGroupThread, thread.isOpenGroup, let senderSessionID = senderSessionID { if let senderSessionID = senderSessionID, message.isOpenGroupMessage {
if let openGroupV2 = Storage.shared.getV2OpenGroup(for: thread.uniqueId!) { if let openGroupV2 = Storage.shared.getV2OpenGroup(for: message.uniqueThreadId) {
let isUserModerator = OpenGroupAPIV2.isUserModerator(senderSessionID, for: openGroupV2.room, on: openGroupV2.server) let isUserModerator = OpenGroupAPIV2.isUserModerator(senderSessionID, for: openGroupV2.room, on: openGroupV2.server)
moderatorIconImageView.isHidden = !isUserModerator || profilePictureView.isHidden moderatorIconImageView.isHidden = !isUserModerator || profilePictureView.isHidden
} else { } else {

@ -143,7 +143,7 @@ final class JoinOpenGroupVC : BaseVC, UIPageViewControllerDataSource, UIPageView
Storage.shared.write { transaction in Storage.shared.write { transaction in
OpenGroupManagerV2.shared.add(room: room, server: server, publicKey: publicKey, using: transaction) OpenGroupManagerV2.shared.add(room: room, server: server, publicKey: publicKey, using: transaction)
.done(on: DispatchQueue.main) { [weak self] _ in .done(on: DispatchQueue.main) { [weak self] _ in
self?.presentingViewController!.dismiss(animated: true, completion: nil) self?.presentingViewController?.dismiss(animated: true, completion: nil)
let appDelegate = UIApplication.shared.delegate as! AppDelegate let appDelegate = UIApplication.shared.delegate as! AppDelegate
appDelegate.forceSyncConfigurationNowIfNeeded().retainUntilComplete() // FIXME: It's probably cleaner to do this inside addOpenGroup(...) appDelegate.forceSyncConfigurationNowIfNeeded().retainUntilComplete() // FIXME: It's probably cleaner to do this inside addOpenGroup(...)
} }

Loading…
Cancel
Save