Commit Graph

695 Commits

Author SHA1 Message Date
Stefan Ceriu 68461d5fd5 Check login intents match between QR code and current flow 2022-10-13 20:49:32 +03:00
Stefan Ceriu 6cc9accf72 Remove unnecessary private key requests as it already happens automatically when marking the existing device as verified 2022-10-13 20:49:32 +03:00
Stefan Ceriu 5d65dd6f4b Fixed various SwiftFormat warnings 2022-10-13 20:49:32 +03:00
Stefan Ceriu 51e71f2d46 Added E2EE support on sessions created through QR code login 2022-10-13 20:49:32 +03:00
David Langley c03420bf4c Merge pull request #6831 from vector-im/langleyd/6830_wysiwyg_core_formatting
Wysiwyg: Core Formatting
2022-10-13 16:03:27 +01:00
Doug 7023196ec3 Add a SignOutFlowPresenter. (#6854)
Used in AllChats, UserSessions and Settings.
(TabBarCoordinator is unnecessary as signout will be removed from there).
2022-10-13 14:36:30 +01:00
David Langley 23365e56ae Merge branch 'langleyd/6830_wysiwyg_core_formatting' of github.com:vector-im/element-ios into langleyd/6830_wysiwyg_core_formatting 2022-10-13 12:19:55 +01:00
Mauro Romito 3d4288803b improved UI tests 2022-10-13 13:06:20 +02:00
Mauro Romito f268b7ecdf unit tests improved! 2022-10-13 13:01:29 +02:00
David Langley 7cab1eaef0 more comment updates 2022-10-13 11:46:00 +01:00
David Langley ca8467e7b0 Updates based on comments. 2022-10-13 11:12:14 +01:00
Aleksandrs Proskurins 923e720e50 Formating fixes 2022-10-13 10:57:45 +03:00
Aleksandrs Proskurins 57185fcf69 Correct label for other verified session 2022-10-13 10:51:58 +03:00
Aleksandrs Proskurins 3ff8b427b4 Merge branch 'develop' into aleksandrs/6864_fixes_from_testing
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	RiotSwiftUI/Modules/UserSessions/Common/View/UserSessionCardViewData.swift
2022-10-13 10:42:53 +03:00
Aleksandrs Proskurins 1b2cb638f2 Correct verificationStatusAdditionalInfoText for other session 2022-10-13 09:46:11 +03:00
Mauro Romito 3c73f8cc9c ui test improvements 2022-10-13 03:10:25 +02:00
Mauro Romito 27583b9975 ui tests fix on ci 2022-10-13 02:28:56 +02:00
Mauro Romito f7cf4b515b ui test should work now 2022-10-13 02:16:02 +02:00
Mauro Romito c35f91026a ui tests should now work on CI 2022-10-13 01:27:14 +02:00
Mauro Romito b55fd7a8fe code improvement 2022-10-13 00:23:30 +02:00
Mauro Romito 8057c5766c code improvement 2022-10-13 00:21:03 +02:00
Mauro Romito 8da2486c82 Tests completed! The only doubt I have left is about testing the string content considering the localisations in tests 2022-10-12 20:06:15 +02:00
Mauro Romito a9369c56f9 unit tests 2022-10-12 18:39:10 +02:00
Mauro Romito 7f8e6e21a8 improving code 2022-10-12 16:55:35 +02:00
Mauro Romito a0057e4d4e composer code improvement 2022-10-12 16:52:12 +02:00
Mauro Romito c543f04561 Merge branch 'langleyd/6830_wysiwyg_core_formatting' into mauroromito/wysiwyg_edit_reply_UI
# Conflicts:
#	RiotSwiftUI/Modules/Room/Composer/View/Composer.swift
2022-10-12 16:48:43 +02:00
Stefan Ceriu 7b4c971a92 Fix UI tests for features currently disabled 2022-10-12 17:27:25 +03:00
Stefan Ceriu 1e03508a89 Remove now unnecessary creator public key publishing. Rebuilt flows and fixed tests 2022-10-12 17:27:25 +03:00
Hugh Nimmo-Smith 114a0f68a4 Remove extra step as no longer required 2022-10-12 17:27:25 +03:00
Stefan Ceriu 56bfde2a1d Fix initiator flows and e2e tests 2022-10-12 17:27:25 +03:00
Stefan Ceriu fa3866ea76 Implement login with scanned QR code flows 2022-10-12 17:27:25 +03:00
Aleksandrs Proskurins e78cf8be1d Remove verify session button for other sessions when the current session is unverified 2022-10-12 17:22:10 +03:00
David Langley c73a3304ca wiftlint 2022-10-12 15:08:50 +01:00
Doug 9855eaa12d Update strings for unknown sessions. 2022-10-12 14:42:24 +01:00
David Langley b335de33aa More comments 2022-10-12 14:32:48 +01:00
Mauro Romito f7aa8822dd Merge branch 'langleyd/6830_wysiwyg_core_formatting' into mauroromito/wysiwyg_edit_reply_UI
# Conflicts:
#	Riot/Modules/Room/Views/WYSIWYGInputToolbar/WysiwygInputToolbarView.swift
2022-10-12 15:25:27 +02:00
Aleksandrs Proskurins 45cc87d8f1 Added last activity item to session details screen 2022-10-12 16:21:07 +03:00
Mauro Romito 5e810b44a1 legacy sendMode code separation to have RiotSwiftUI be able to build. 2022-10-12 15:14:41 +02:00
David Langley f8da168065 get rid of additional UIHostingController. Cleanup and comments. 2022-10-12 14:14:25 +01:00
Aleksandrs Proskurins 854f61c6eb Merge pull request #6860 from vector-im/aleksandrs/6838_filter_sessions
Device Manager: Filter sessions
2022-10-12 15:27:42 +03:00
Mauro Romito b18810f196 should now be aligned to the designs 2022-10-12 14:26:38 +02:00
Mauro Romito d08a1d17f5 pr comment + some design improvements 2022-10-12 13:58:44 +02:00
Aleksandrs Proskurins 4b21f7276d Added accessibility label to filter menu 2022-10-12 14:34:26 +03:00
David Langley 8abeae5060 Merge branch 'develop' of github.com:vector-im/element-ios into langleyd/6830_wysiwyg_core_formatting 2022-10-12 11:46:24 +01:00
Aleksandrs Proskurins 5329a03477 Renamed filerWasChanged to filterWasChanged 2022-10-12 13:18:33 +03:00
Aleksandrs Proskurins 2d0a38ae1b Update RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsModels.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2022-10-12 13:11:43 +03:00
Mauro Romito ed55944b85 some UI tweaks 2022-10-12 11:06:01 +02:00
Aleksandrs Proskurins 5b78cf3745 Formating 2022-10-12 11:00:38 +03:00
Aleksandrs Proskurins 49dac51ec6 Merge branch 'develop' into aleksandrs/6838_filter_sessions
# Conflicts:
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/Test/Unit/UserOtherSessionsViewModelTests.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsViewModel.swift
2022-10-12 10:58:04 +03:00
Aleksandrs Proskurins c031dbb4de Renamed OtherUserSessionsFilter to UserOtherSessionsFilter 2022-10-12 09:30:41 +03:00