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

Merge pull request #6782 from vector-im/andy/6791_manual_verification

Browse source 
Manual device verification with Crypto V2
This commit is contained in:
Anderas 2022-09-29 16:00:44 +01:00 committed by GitHub
commit eb045e4d6c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Riot/Modules/KeyVerification/User/UserVerificationCoordinator.swift
View file

@ -209,6 +209,7 @@ extension UserVerificationCoordinator: KeyVerificationManuallyVerifyCoordinatorD
self.presenter.toPresentable().dismiss(animated: true) {
self.remove(childCoordinator: coordinator)
}
delegate?.userVerificationCoordinatorDidComplete(self)
}
func keyVerificationManuallyVerifyCoordinatorDidCancel(_ coordinator: KeyVerificationManuallyVerifyCoordinatorType) {

8
Riot/Modules/KeyVerification/User/UserVerificationCoordinatorBridgePresenter.swift
View file

@ -77,8 +77,14 @@ final class UserVerificationCoordinatorBridgePresenter: NSObject {
} else {
userVerificationCoordinator = UserVerificationCoordinator(presenter: self.presenter, session: self.session, userId: self.userId, userDisplayName: self.userDisplayName)
}
userVerificationCoordinator.delegate = self
userVerificationCoordinator.start()
self.coordinator = userVerificationCoordinator
}
}
extension UserVerificationCoordinatorBridgePresenter: UserVerificationCoordinatorDelegate {
func userVerificationCoordinatorDidComplete(_ coordinator: UserVerificationCoordinatorType) {
delegate?.userVerificationCoordinatorBridgePresenterDelegateDidComplete(self)
}
}

10
Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
View file

@ -32,7 +32,7 @@
#define TABLEVIEW_ROW_CELL_HEIGHT 46
#define TABLEVIEW_SECTION_HEADER_HEIGHT 28
@interface RoomMemberDetailsViewController () <UIGestureRecognizerDelegate, DeviceTableViewCellDelegate, RoomMemberTitleViewDelegate, KeyVerificationCoordinatorBridgePresenterDelegate>
@interface RoomMemberDetailsViewController () <UIGestureRecognizerDelegate, DeviceTableViewCellDelegate, RoomMemberTitleViewDelegate, KeyVerificationCoordinatorBridgePresenterDelegate, UserVerificationCoordinatorBridgePresenterDelegate>
{
RoomMemberTitleView* memberTitleView;
@ -449,6 +449,7 @@
session:self.mxRoom.mxSession
userId:self.mxRoomMember.userId
userDisplayName:self.mxRoomMember.displayname];
userVerificationCoordinatorBridgePresenter.delegate = self;
[userVerificationCoordinatorBridgePresenter start];
self.userVerificationCoordinatorBridgePresenter = userVerificationCoordinatorBridgePresenter;
}
@ -1345,4 +1346,11 @@
keyVerificationCoordinatorBridgePresenter = nil;
}
#pragma mark - UserVerificationCoordinatorBridgePresenterDelegate
- (void)userVerificationCoordinatorBridgePresenterDelegateDidComplete:(UserVerificationCoordinatorBridgePresenter *)coordinatorBridgePresenter
{
[self refreshUserEncryptionTrustLevel];
}
@end

10
Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m
View file

@ -45,7 +45,7 @@ enum {
};
@interface ManageSessionViewController ()
@interface ManageSessionViewController () <UserVerificationCoordinatorBridgePresenterDelegate>
{
// The device to display
MXDevice *device;
@ -649,6 +649,7 @@ enum {
userId:self.mainSession.myUser.userId
userDisplayName:nil
deviceId:device.deviceId];
userVerificationCoordinatorBridgePresenter.delegate = self;
[userVerificationCoordinatorBridgePresenter start];
self.userVerificationCoordinatorBridgePresenter = userVerificationCoordinatorBridgePresenter;
}
@ -701,4 +702,11 @@ enum {
self.reauthenticationCoordinatorBridgePresenter = reauthenticationPresenter;
}
#pragma mark - UserVerificationCoordinatorBridgePresenterDelegate
- (void)userVerificationCoordinatorBridgePresenterDelegateDidComplete:(UserVerificationCoordinatorBridgePresenter *)coordinatorBridgePresenter
{
[self reloadDeviceWithCompletion:^{}];
}
@end

1
changelog.d/6781.change Normal file
View file

@ -0,0 +1 @@
CryptoV2: Manual device verification