Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 07:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Device Verification: MXUser.displayname and avatar can be nil

Browse source
This commit is contained in:
manuroe 2019-04-17 13:54:51 +02:00
parent bcacc78b3c
commit 771444573d
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Riot/Modules/DeviceVerification/Incoming/DeviceVerificationIncomingViewController.swift
View file

@ -147,7 +147,7 @@ final class DeviceVerificationIncomingViewController: UIViewController {
avatarImageView.clipsToBounds = true avatarImageView.clipsToBounds = true
} }
self.userDisplaynameLabel.text = self.viewModel.userDisplayName self.userDisplaynameLabel.text = self.viewModel.userDisplayName ?? self.viewModel.userId
self.deviceIdLabel.text = self.viewModel.deviceId self.deviceIdLabel.text = self.viewModel.deviceId
} }

4
Riot/Modules/DeviceVerification/Incoming/DeviceVerificationIncomingViewModel.swift
View file

@ -30,8 +30,8 @@ final class DeviceVerificationIncomingViewModel: DeviceVerificationIncomingViewM
// MARK: Public // MARK: Public
var userId: String var userId: String
var userDisplayName: String var userDisplayName: String?
var avatarUrl: String var avatarUrl: String?
var deviceId: String var deviceId: String
var mediaManager: MXMediaManager var mediaManager: MXMediaManager

4
Riot/Modules/DeviceVerification/Incoming/DeviceVerificationIncomingViewModelType.swift
View file

@ -31,8 +31,8 @@ protocol DeviceVerificationIncomingViewModelCoordinatorDelegate: class {
protocol DeviceVerificationIncomingViewModelType { protocol DeviceVerificationIncomingViewModelType {
var userId: String { get } var userId: String { get }
var userDisplayName: String { get } var userDisplayName: String? { get }
var avatarUrl: String { get } var avatarUrl: String? { get }
var deviceId: String { get } var deviceId: String { get }
var mediaManager: MXMediaManager { get } var mediaManager: MXMediaManager { get }