Commit Graph

57 Commits

Author SHA1 Message Date
JanNiklas Grabowski b298dedc22 chore: update from foss 1.11.19 (MESSENGER-6656)
Merge commit 'f823ab9aae70e8d15ed7cc079210dd9bbbb6c8e1' into feature/foss_update_1_11_19

* commit 'f823ab9aae70e8d15ed7cc079210dd9bbbb6c8e1':
  finish version++
  version++
  comments
  update submodule
  remove obsolete tests
  removed unused code
  update submodule
  fix
  Libolm removal
  update license macro
  update license
  Prepare for new sprint

# Conflicts:
#	Config/AppVersion.xcconfig
#	IDETemplateMacros.plist
#	LICENSE
#	README.md
#	Riot/Categories/MXSession+Riot.m
#	Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
#	Riot/Managers/KeyValueStorage/Extensions/Keychain.swift
#	Riot/Managers/KeyValueStorage/KeyValueStore.swift
#	Riot/Managers/KeyValueStorage/KeychainStore.swift
#	Riot/Managers/KeyValueStorage/MemoryStore.swift
#	Riot/Managers/PushNotification/PushNotificationService.m
#	Riot/Managers/Settings/RiotSettings.swift
#	Riot/Managers/Settings/Shared/RiotSharedSettings.swift
#	Riot/Modules/Analytics/AnalyticsUIElement.swift
#	Riot/Modules/Application/AppCoordinator.swift
#	Riot/Modules/Application/LegacyAppDelegate.h
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Authentication/Legacy/AuthenticationViewController.h
#	Riot/Modules/Authentication/Legacy/AuthenticationViewController.m
#	Riot/Modules/Authentication/Legacy/Views/AuthInputsView.h
#	Riot/Modules/Authentication/Legacy/Views/AuthInputsView.m
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Common/WebViewController/WebViewViewController.m
#	Riot/Modules/Contacts/Details/ContactDetailsViewController.m
#	Riot/Modules/Contacts/Views/ContactTableViewCell.m
#	Riot/Modules/Favorites/FavouritesViewController.h
#	Riot/Modules/Favorites/FavouritesViewController.m
#	Riot/Modules/GlobalSearch/UnifiedSearchViewController.m
#	Riot/Modules/People/PeopleViewController.h
#	Riot/Modules/People/PeopleViewController.m
#	Riot/Modules/Room/ContextualMenu/ReactionsMenu/ReactionsMenuViewModel.swift
#	Riot/Modules/Room/DataSources/RoomDataSource.m
#	Riot/Modules/Room/Files/RoomFilesViewController.m
#	Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/Room/Settings/RoomSettingsViewController.m
#	Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroCell.swift
#	Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroCellContentView.swift
#	Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroViewData.swift
#	Riot/Modules/Room/TimelineCells/RoomTimelineCellIdentifier.h
#	Riot/Modules/Rooms/RoomsViewController.h
#	Riot/Modules/Rooms/ShowDirectory/Cells/Network/DirectoryNetworkTableHeaderFooterView.swift
#	Riot/Modules/Rooms/ShowDirectory/Cells/Room/DirectoryRoomTableViewCell.swift
#	Riot/Modules/Rooms/ShowDirectory/PublicRoomsDirectoryViewModel.swift
#	Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyCoordinator.swift
#	Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyViewController.swift
#	Riot/Modules/Secrets/Recover/RecoverWithPassphrase/SecretsRecoveryWithPassphraseCoordinator.swift
#	Riot/Modules/Secrets/Recover/RecoverWithPassphrase/SecretsRecoveryWithPassphraseViewController.swift
#	Riot/Modules/Secrets/Recover/SecretsRecoveryCoordinator.swift
#	Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.swift
#	Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewModel.swift
#	Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewModelType.swift
#	Riot/Modules/SetPinCode/PinCodePreferences.swift
#	Riot/Modules/SetPinCode/SetupBiometrics/BiometricsAuthenticationPresenter.swift
#	Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m
#	Riot/Modules/Settings/Security/SecurityViewController.m
#	Riot/Modules/Settings/SettingsViewController.m
#	Riot/Modules/SplitView/SplitViewCoordinator.swift
#	Riot/Modules/SplitView/SplitViewCoordinatorType.swift
#	Riot/Modules/StartChat/StartChatViewController.m
#	Riot/Modules/TabBar/MasterTabBarController.h
#	Riot/Modules/TabBar/MasterTabBarController.m
#	Riot/Utils/EventFormatter.m
#	Riot/Utils/HTMLFormatter.swift
#	Riot/Utils/Tools.m
#	RiotNSE/NotificationService.swift
2024-10-18 15:45:54 +02:00
Mauro Romito 12837d4b89 update license 2024-09-25 12:24:52 +02:00
Frank Rotermund 02bb97687d Feature/5308 sso on internal browser 2023-12-08 11:42:02 +00:00
Arnfried Griesert 3c2c021287 Merged element 1.11.3 into bum 2023-09-29 05:24:53 +02:00
Hugh Nimmo-Smith dde602beac Use ASWebAuthenticationSession to display OIDC account management URL (#7671)
Co-authored-by: Doug <douglase@element.io>
2023-09-12 18:05:52 +01:00
Doug a7c8905b10 Hide sign out x/all buttons in the Device Manager when using OIDC. (#7674) 2023-09-12 13:46:36 +01:00
JanNiklas Grabowski d4ab5f4bad MESSENGER 5004 add oidc flag 2023-08-31 12:13:03 +02:00
JanNiklas Grabowski ccdbd400d2 Merge commit 'f6b85b8f9a0b4ce162616e79045fb015a21b27da' into feature/5004_basis_update_element
* commit 'f6b85b8f9a0b4ce162616e79045fb015a21b27da': (40 commits)
  finish version++
  version++
  changelog.d: Upgrade MatrixSDK version ([v0.27.1](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.1)).
  completed
  code improvement
  fix 7646
  opening the safari web view externally so that it will be able to share the cookies
  web view opened on tap + changelog
  added the cell, now I just need to implement the navigation to the web view
  completed
  Hide deactivate account if the auth property is present on the WK.
  Add changelogs
  Prevent mention crashes when room members are missing display names (objc interop)
  Prevent pill crashes when room members are missing display names (objc interop)
  Update introspect to the latest version, remove now duplicate `introspectCollectionView`
  Prepare for new sprint
  finish version++
  Add missing changelog entry.
  version++
  changelog.d: Upgrade MatrixSDK version ([v0.27.0](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.0)).
  ...

# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile
#	Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
#	Riot/Modules/SecureBackup/Setup/SecureBackupSetupCoordinator.swift
#	Riot/Modules/Settings/SettingsViewController.m
#	Riot/target.yml
2023-08-29 17:00:19 +02:00
Mauro Romito d1445fc698 completed 2023-08-28 12:20:26 +02:00
Mauro Romito 2a7e0562f1 code improvement 2023-08-25 19:39:55 +02:00
Mauro Romito 2b93d8f03a fix 7646 2023-08-25 17:22:11 +02:00
Arnfried Griesert d9f9798643 MESSENGER-4516 device manager anpassungen 2023-04-28 06:28:47 +00:00
Alfonso Grillo fdffd24a46 Update copies 2022-12-05 17:20:20 +01:00
Alfonso Grillo 30d7509f73 Fix verification state algorithm 2022-11-16 10:29:04 +01:00
Alfonso Grillo 1538a3b6ac Add intrinsic sized bottom sheet 2022-11-09 12:05:47 +01:00
Alfonso Grillo 1405ea0940 Merge branch 'develop' into alfogrillo/learn_more_sheet
# Conflicts:
#	RiotSwiftUI/Modules/UserSessions/Coordinator/UserSessionsFlowCoordinator.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/Coordinator/UserOtherSessionsCoordinator.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/Test/UI/UserOtherSessionsUITests.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsModels.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsViewModel.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/View/UserOtherSessions.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/Test/UI/UserSessionOverviewUITests.swift
2022-11-03 09:22:47 +01:00
paleksandrs 1fa2ab1604 Renamed sign out to logout 2022-10-31 14:44:03 +02:00
paleksandrs 6ba50d3225 Renamed sign out to logout 2022-10-31 14:26:22 +02:00
Alfonso Grillo 79e25d2351 Fix memory leak 2022-10-28 16:44:34 +02:00
Aleksandrs Proskurins cde6312964 Refresh fix 2022-10-28 17:26:22 +03:00
Alfonso Grillo 7b434063e5 Show rename sheet 2022-10-28 16:17:19 +02:00
Alfonso Grillo 7fd958be86 Show bottom sheet in rename session screen 2022-10-28 15:55:46 +02:00
Alfonso Grillo b5b6154a39 Show bottom sheet in other sessions screen 2022-10-28 15:50:35 +02:00
Alfonso Grillo da07f67573 Add MVVM-C for InfoSheet 2022-10-28 15:14:42 +02:00
Alfonso Grillo f5162834ea Add .viewSessionInfo view action 2022-10-28 12:06:56 +02:00
Aleksandrs Proskurins c19cb59604 Sing out filtering 2022-10-27 17:35:39 +03:00
Aleksandrs Proskurins 66fa9fb37f Removed warnings 2022-10-27 16:00:58 +03:00
Aleksandrs Proskurins 807a18af6e Separator fix 2022-10-27 15:57:10 +03:00
Aleksandrs Proskurins c4641f1f00 Multi session logut 2022-10-27 10:04:42 +03:00
Aleksandrs Proskurins 8a0d3ffcba Sign out menu button 2022-10-25 08:41:05 +03:00
Aleksandrs Proskurins 0be57c5541 Merge pull request #6878 from vector-im/aleksandrs/6877_navigation_fix
Device Manager: Navigating to session overview goes to session details
2022-10-14 11:01:42 +03:00
Aleksandrs Proskurins 5d217e5ba3 Navigating to session overview goes to session details 2022-10-14 09:21:17 +03:00
Doug 8a284bf4ae 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
Aleksandrs Proskurins 20be525f16 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 401e35f4d6 Renamed OtherUserSessionsFilter to UserOtherSessionsFilter 2022-10-12 09:30:41 +03:00
Doug 3279f58ec4 Device Manager: Verify session (#6832)
* Initial implementation
* Add verificationState to UserSessionInfo
* Listen for changes device changes in the service.
2022-10-11 16:11:52 +01:00
Doug efaf98fe6a Device Manager: Rename Session (#6826)
* Publish the user sessions overview data.
* Add UserSessionName screen.
* Update logout action to match Figma more closely.
2022-10-11 13:11:15 +01:00
Aleksandrs Proskurins 90360a5eb3 Fixed swiftformat warnings 2022-10-07 17:00:15 +03:00
Aleksandrs Proskurins c471c815c5 Merge from develop 2022-10-07 14:51:30 +03:00
ismailgulek 09124c2243 QR login from device manager (#6818)
* Add link device button into the sessions overview screen

* Run Swift format

* Fix tests

* Fix a crash in tests

* Fix PR remark
2022-10-07 12:58:26 +03:00
Aleksandrs Proskurins d189bad4a9 'View all' button in other sessions list 2022-10-07 09:45:45 +03:00
Aleksandrs Proskurins 0ba4e7ed12 Merge branch 'develop' into aleksandrs/6801_unverified_sessions_screen 2022-10-06 10:49:48 +03:00
Doug 86671a61cc Fix review comments
Also fix a crash on iPad.
2022-10-05 16:48:51 +01:00
Doug 50d974884b Session Manager: Single session logout 2022-10-05 16:48:51 +01:00
Aleksandrs Proskurins 430ad84346 Renamed sessionsInfo to sessionInfos 2022-10-05 16:59:15 +03:00
Aleksandrs Proskurins d050568670 Formating fixes 2022-10-04 15:44:09 +03:00
Aleksandrs Proskurins 1bdd58a7d6 Renamed session to sessionInfo 2022-10-04 15:34:31 +03:00
Aleksandrs Proskurins a964707630 Merge branch 'develop' into aleksandrs/6786_inactive_sessions_screen
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	RiotSwiftUI/Modules/UserSessions/Coordinator/UserSessionsFlowCoordinator.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/Test/Unit/UserSessionOverviewViewModelTests.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/Coordinator/UserSessionsOverviewCoordinator.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/Service/Mock/MockUserSessionsOverviewService.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/UserSessionsOverviewModels.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/View/UserSessionListItemViewData.swift
2022-10-04 15:14:59 +03:00
Aleksandrs Proskurins e14f9960ba Added translation strings, cleanup 2022-10-04 10:07:04 +03:00
Aleksandrs Proskurins 8b8f0ca556 Cleanup 2022-10-04 09:38:53 +03:00