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

Merge branch 'riot_2924' of github.com:vector-im/riot-ios into riot_2924

Browse source
This commit is contained in:
SBiOSoftWhare 2020-01-30 21:37:39 +01:00
commit 93c7f8e155
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Riot/AppDelegate.m
View file

@ -4901,7 +4901,7 @@ NSString *const AppDelegateDidValidateEmailNotificationClientSecretKey = @"AppDe
deviceVerificationCoordinatorBridgePresenter = [[DeviceVerificationCoordinatorBridgePresenter alloc] initWithSession:mxSession];
deviceVerificationCoordinatorBridgePresenter.delegate = self;
[deviceVerificationCoordinatorBridgePresenter presentFrom:presentingViewController roomMember:roomMember animated:mxSession];
[deviceVerificationCoordinatorBridgePresenter presentFrom:presentingViewController roomMember:roomMember animated:YES];
presented = YES;
}

2
Riot/Modules/UserVerification/Start/UserVerificationStartViewModelType.swift
View file

@ -24,7 +24,7 @@ protocol UserVerificationStartViewModelViewDelegate: class {
protocol UserVerificationStartViewModelCoordinatorDelegate: class {
func userVerificationStartViewModel(_ viewModel: UserVerificationStartViewModelType, didCompleteWithOutgoingTransaction transaction: MXSASTransaction)
func userVerificationStartViewModel(_ viewModel: UserVerificationStartViewModelType, didCompleteWithIncomingTransaction transaction: MXSASTransaction)
func userVerificationStartViewModel(_ viewModel: UserVerificationStartViewModelType, didTransactionCancelled transaction: MXSASTransaction)