Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adopt SelfVerification path from Element if cross-signing is activated #728

Merged
merged 3 commits into from
Feb 1, 2023
Merged

Adopt SelfVerification path from Element if cross-signing is activated #728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79ae57b
Adopt KeyVerification path from Element if cross-signing is activated
Jan 31, 2023
95b9113
Add changelog file
Feb 1, 2023
e387b2f
Update changelog description
Feb 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions Riot/Modules/KeyVerification/Common/KeyVerificationCoordinator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,17 @@ final class KeyVerificationCoordinator: KeyVerificationCoordinatorType {
case .verifyUser(let roomMember):
rootCoordinator = self.createUserVerificationStartCoordinator(with: roomMember)
case .verifyDevice(let userId, let deviceId):
// Tchap: self verification is not supported yet
// if userId == self.session.myUser.userId {
// rootCoordinator = self.createSelfVerificationCoordinator(otherDeviceId: deviceId)
// } else {
// Tchap: activate self verification only if cross-signing is activated
#if CROSS_SIGNING
if userId == self.session.myUser.userId {
rootCoordinator = self.createSelfVerificationCoordinator(otherDeviceId: deviceId)
} else {
rootCoordinator = self.createDataLoadingScreenCoordinator(otherUserId: userId, otherDeviceId: deviceId)
// }
}
#else
rootCoordinator = self.createDataLoadingScreenCoordinator(otherUserId: userId, otherDeviceId: deviceId)
#endif

case .incomingRequest(let incomingKeyVerificationRequest):
rootCoordinator = self.createDataLoadingScreenCoordinator(with: incomingKeyVerificationRequest)
case .incomingSASTransaction(let incomingSASTransaction):
Expand Down
1 change: 1 addition & 0 deletions changelog.d/698.change
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Adopt SelfVerification path from Element if cross-signing is activated