mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-28 23:32:41 +00:00
Device Verification: MXUser.displayname and avatar can be nil
This commit is contained in:
parent
bcacc78b3c
commit
771444573d
3 changed files with 5 additions and 5 deletions
|
@ -147,7 +147,7 @@ final class DeviceVerificationIncomingViewController: UIViewController {
|
|||
avatarImageView.clipsToBounds = true
|
||||
}
|
||||
|
||||
self.userDisplaynameLabel.text = self.viewModel.userDisplayName
|
||||
self.userDisplaynameLabel.text = self.viewModel.userDisplayName ?? self.viewModel.userId
|
||||
self.deviceIdLabel.text = self.viewModel.deviceId
|
||||
}
|
||||
|
||||
|
|
|
@ -30,8 +30,8 @@ final class DeviceVerificationIncomingViewModel: DeviceVerificationIncomingViewM
|
|||
// MARK: Public
|
||||
|
||||
var userId: String
|
||||
var userDisplayName: String
|
||||
var avatarUrl: String
|
||||
var userDisplayName: String?
|
||||
var avatarUrl: String?
|
||||
var deviceId: String
|
||||
|
||||
var mediaManager: MXMediaManager
|
||||
|
|
|
@ -31,8 +31,8 @@ protocol DeviceVerificationIncomingViewModelCoordinatorDelegate: class {
|
|||
protocol DeviceVerificationIncomingViewModelType {
|
||||
|
||||
var userId: String { get }
|
||||
var userDisplayName: String { get }
|
||||
var avatarUrl: String { get }
|
||||
var userDisplayName: String? { get }
|
||||
var avatarUrl: String? { get }
|
||||
var deviceId: String { get }
|
||||
|
||||
var mediaManager: MXMediaManager { get }
|
||||
|
|
Loading…
Reference in a new issue