Commit Graph

20 Commits

Author SHA1 Message Date
Stefan Ceriu 313e666017 vector-im/element-ios/issues/4899 - Fixed various localization issues. 2021-09-30 09:40:12 +03:00
Doug 2bd59ab326 Merge branch 'develop' into doug/fix_warnings
# Conflicts:
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
2021-07-12 17:54:34 +01:00
Doug e7371325d7 Fix typo in comments. 2021-07-09 17:58:27 +01:00
Doug 29d7262e38 Fix class keyword deprecation warnings everywhere!
Using 'class' keyword for protocol inheritance is deprecated; use 'AnyObject' instead
2021-07-09 17:05:43 +01:00
David Baker d1e7173383 Don't show dialog on cancel if self-verifying
The user should know they cancelled in if they're self verifying since
they're the one who cancelled, from their other device (the copy referred
to 'the other party', so was inaccurate, so we may as well just remove it).
2021-07-09 16:38:25 +01:00
David Baker 5dbd7f1f5a Use different title for scan button for self verification
Because it's not 'their' device, it's your own device.
2021-07-02 17:38:12 +01:00
Stefan Ceriu a8b0e8700e Adopt consolidated logging mechanism (#4370)
* Adopted the new MXLog and replaced NSLog throughout the application - vector-im/element-ios/issues/4351
* Replaced NSLog() and print() usages with MXLog.debug()
* Added swiftlint rules for NSLog(), print(), println() and os_log()
* Escape paths used to run script build phases for swiftlint and swiftgen
2021-06-03 11:30:07 +03:00
SBiOSoftWhare bc7ae2f8ce Key verification: Update QR code scan screen UI and update title when scanning own sessions. 2020-05-05 15:45:00 +02:00
manuroe ecebafd95d Verification: Do not talk about QR code if only emoji is possible
#3035
2020-04-28 18:16:37 +02:00
SBiOSoftWhare 9e7293b1de KeyVerificationVerifyByScanningCoordinator: Remove a useless delegate method. 2020-04-28 11:16:01 +02:00
SBiOSoftWhare cd6611801f Key verification: Update key verification screens title. Update SAS screen wordings. 2020-04-27 19:54:57 +02:00
SBiOSoftWhare e86c530e9e QR code verification: Remove other scan my code alert. 2020-04-21 18:57:05 +02:00
SBiOSoftWhare 8fee72694e KeyVerificationVerifyByScanningViewController: Handle transaction cancel when QR code scanning is on screen. 2020-04-21 17:01:04 +02:00
SBiOSoftWhare 0ca213fab2 KeyVerificationVerifyByScanningViewModel: Unregister transaction change when needed. 2020-04-21 17:00:24 +02:00
SBiOSoftWhare 9c82869754 KeyVerification: Update scanning screen to handle new QR code confirmation state. 2020-04-16 18:45:46 +02:00
SBiOSoftWhare 74351d2eee Merge branch 'develop' into riot_2918
# Conflicts:
#	Riot/Modules/KeyVerification/Common/Verify/Scanning/KeyVerificationVerifyByScanningViewModel.swift
2020-03-30 09:55:40 +02:00
SBiOSoftWhare 9217ea13f9 KeyVerificationVerifyByScanningViewModel: Improve cancelation. 2020-03-27 14:30:58 +01:00
SBiOSoftWhare 1d83d09b2d KeyVerificationVerifyByScanningViewModel: Support to_device request. 2020-03-26 12:09:17 +01:00
manuroe a91f7e2e6e BF: Self verification is broken
#3040
The screen was stuck on the request step in case of self verification (to_device events)
2020-03-24 09:14:01 +01:00
SBiOSoftWhare d6296b3150 Refactor DeviceVerification prefix classes to KeyVerification where needed. And move key verification related classes into the same module KeyVerification. 2020-03-18 17:39:26 +01:00