oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix incorrect flag

This commit is contained in:
nielsandriesse 2020-10-30 11:07:37 +11:00
parent 1c4f0700a1
commit b8a25a7942
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SignalMessaging/Loki/Redesign/Components/ProfilePictureView.swift
View File

@ -5,7 +5,7 @@ public final class ProfilePictureView : UIView {
private var imageViewHeightConstraint: NSLayoutConstraint! private var imageViewHeightConstraint: NSLayoutConstraint!
private var additionalImageViewWidthConstraint: NSLayoutConstraint! private var additionalImageViewWidthConstraint: NSLayoutConstraint!
private var additionalImageViewHeightConstraint: NSLayoutConstraint! private var additionalImageViewHeightConstraint: NSLayoutConstraint!
private var isUsingPlaceholder: Bool = true private var hasTappableProfilePicture: Bool = false
@objc public var size: CGFloat = 0 // Not an implicitly unwrapped optional due to Obj-C limitations @objc public var size: CGFloat = 0 // Not an implicitly unwrapped optional due to Obj-C limitations
@objc public var isRSSFeed = false @objc public var isRSSFeed = false
@objc public var hexEncodedPublicKey: String! @objc public var hexEncodedPublicKey: String!
@ -66,7 +66,7 @@ public final class ProfilePictureView : UIView {
} else if let openGroupProfilePicture = thread.groupModel.groupImage { // An open group with a profile picture } else if let openGroupProfilePicture = thread.groupModel.groupImage { // An open group with a profile picture
self.openGroupProfilePicture = openGroupProfilePicture self.openGroupProfilePicture = openGroupProfilePicture
isRSSFeed = false isRSSFeed = false
isUsingPlaceholder = false hasTappableProfilePicture = true
} else if thread.groupModel.groupType == .openGroup } else if thread.groupModel.groupType == .openGroup
|| thread.groupModel.groupType == .rssFeed { // An open group without a profile picture or an RSS feed || thread.groupModel.groupType == .rssFeed { // An open group without a profile picture or an RSS feed
hexEncodedPublicKey = "" hexEncodedPublicKey = ""
@ -84,6 +84,7 @@ public final class ProfilePictureView : UIView {
} }
update() update()
} else { // A one-to-one chat } else { // A one-to-one chat
hasTappableProfilePicture = OWSProfileManager.shared().profileAvatar(forRecipientId: thread.contactIdentifier()!) != nil
update(for: thread.contactIdentifier()!) update(for: thread.contactIdentifier()!)
} }
} }
@ -93,7 +94,6 @@ public final class ProfilePictureView : UIView {
func getProfilePicture(of size: CGFloat, for publicKey: String) -> UIImage? { func getProfilePicture(of size: CGFloat, for publicKey: String) -> UIImage? {
guard !publicKey.isEmpty else { return nil } guard !publicKey.isEmpty else { return nil }
if let profilePicture = OWSProfileManager.shared().profileAvatar(forRecipientId: publicKey) { if let profilePicture = OWSProfileManager.shared().profileAvatar(forRecipientId: publicKey) {
isUsingPlaceholder = false
return profilePicture return profilePicture
} else { } else {
let displayName = OWSProfileManager.shared().profileNameForRecipient(withID: publicKey) ?? publicKey let displayName = OWSProfileManager.shared().profileNameForRecipient(withID: publicKey) ?? publicKey
@ -149,6 +149,6 @@ public final class ProfilePictureView : UIView {
} }
@objc public func getProfilePicture() -> UIImage? { @objc public func getProfilePicture() -> UIImage? {
return isUsingPlaceholder ? nil : imageView.image return hasTappableProfilePicture ? imageView.image : nil
} }
} }