Commit Graph

59 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
Frank Rotermund 7d794bef4a chore: Update from FOSS 1.18.0 (MESSENGER-6440) 2024-09-26 07:39:37 +02:00
Mauro Romito 12837d4b89 update license 2024-09-25 12:24:52 +02:00
Mauro Romito 841a694f8a fixed some swiftlint errors 2024-09-13 16:49:38 +02:00
JanNiklas Grabowski 2716b8f15d fix: display permalink to message as pill (MESSENGER-6393) 2024-08-26 16:36:30 +02:00
JanNiklas Grabowski 8c3d53b984 MESSENGER-5158 fix permalink prefix 2023-12-13 17:25:39 +01: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
Stefan Ceriu 686932c995 Prevent pill crashes when room members are missing display names (objc interop) 2023-08-21 10:03:23 +03:00
Frank Rotermund 242e35fdc7 Merge commit 'ab5f501c2daf60d26f41b1a15d7e97bfe5679228' into feature/4884_merge_foss_1.10.14
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Modules/Home/AllChats/AllChatsCoordinator.swift
#	fastlane/.env.default
#	fastlane/Fastfile
2023-07-04 08:24:05 +02:00
Stefan Ceriu ac072f261c Fix crashes when mentioning users without display names 2023-06-06 19:53:01 +03:00
JanNiklas Grabowski b76b4e0803 Merge branch 'feature/4699_basis_update_element' into develop
# Conflicts:
#	Podfile
#	Riot/Modules/MatrixKit/Utils/MXKTools.m
#	Riot/Modules/Pills/PillType.swift
2023-05-23 14:51:49 +02:00
Frank Rotermund 929d70877d MESSENGER-4697 enable SessionManager in Prod, fix peralink pills fix Matomo config bug when login out 2023-05-15 17:06:25 +02:00
aringenbach 76e2aadc26 Merge branch 'develop' into aringenbach/enable_rte_user_mentions 2023-04-12 15:04:15 +02:00
aringenbach 46b39e739d Unit tests for insertPills and markdownLinks 2023-04-12 14:55:59 +02:00
aringenbach 67c768f8fc Bump composer version to 2.0.0 and fix PillAttachmentViewProvider 2023-04-11 14:45:44 +02:00
aringenbach 38ae3cd3a8 Merge branch 'develop' into aringenbach/enable_rte_user_mentions 2023-04-11 14:21:31 +02:00
Nicolas Mauri 33e6280f31 Fix: Continue to display pills for matrix.to permalinks if a custom permalinkBaseUrl is set. 2023-04-07 16:40:34 +02:00
Nicolas Mauri 1fa825874a Fix: do not encode the maximum width of a Pill 2023-03-30 10:09:27 +02:00
Nicolas Mauri 2fdb811a1c Fix: truncate pills if they are too long 2023-03-28 11:59:52 +02:00
aringenbach b26e0ccea3 Fix wrong condition for highlight test 2023-03-23 17:16:57 +01:00
aringenbach b9faccf6c1 Use PillProvider for RTE Pills creation 2023-03-23 17:16:57 +01:00
aringenbach 000d8465d0 Use textDefaultFont in all variants of the InputToolbarView 2023-03-23 17:16:57 +01:00
aringenbach 935e61e1bb Enable user mentions in Rich Text Editor 2023-03-23 17:16:57 +01:00
Nicolas Mauri d09181d531 Fix: prevent a crash if we don’t have a display name for the user mentionned by the pill 2023-03-21 16:49:47 +01:00
Nicolas Mauri 3f68748bd5 Fix: Unit tests 2023-03-21 14:17:52 +01:00
Nicolas Mauri 4f2020b680 Fix: an issue where we display the default user icon for a known user 2023-03-21 10:48:17 +01:00
Nicolas Mauri 68918ea21b Fix: Message pill when the room is an alias 2023-03-21 10:30:19 +01:00
Nicolas Mauri 0066fcedbc Fix: the avatar was incorrect for the pill of a message if the event is not loaded. 2023-03-21 09:27:48 +01:00
Nicolas Mauri a875274972 Fix: implement the changes discussed in the PR 2023-03-21 09:17:34 +01:00
Nicolas Mauri 605c4972a1 Fix: restore the height of the pill to its original value 2023-03-20 10:50:25 +01:00
Nicolas Mauri 406fcac64e Fix: default pill icon for an unknown user 2023-03-20 10:42:21 +01:00
Nicolas Mauri 18a2360296 Turning permalinks into pills
#7409: Permalinks to a room/space are pillified
#7411: Permalinks to a matrix user are pillified
#7412: Permalinks to messages are pillified
2023-03-17 16:58:59 +01:00
aringenbach ca6e56d004 Fix slash commands from room composer 2022-07-11 18:17:12 +02:00
aringenbach 4c8bed38c2 Use latest user data for mention pills 2022-06-16 17:07:47 +02:00
aringenbach 0615975909 Fix issue with mention pill avatar consuming tap gestures 2022-05-30 15:20:03 +02:00
aringenbach 98fd77af65 Weakify message text view reference 2022-05-13 14:00:06 +02:00
aringenbach 783ad8fc13 Flush pills on text view updates 2022-05-13 13:52:46 +02:00
aringenbach 9d7dc4817f Replace magic number for pill offset 2022-05-11 09:45:16 +02:00
aringenbach 69b7eae92f Use font from context and store it in pill data 2022-05-10 17:19:52 +02:00
aringenbach d06ba2d11b Use media manager & avatar view 2022-05-09 17:49:05 +02:00
aringenbach 4111ebd067 Fix minor comment & @objc 2022-05-09 17:14:32 +02:00
aringenbach 0b5685a4e8 Move size computations to PillAttachmentViewProvider 2022-05-09 16:53:38 +02:00
aringenbach 42a5574d4f Move tools funcs 2022-05-09 15:55:24 +02:00
aringenbach dd07d597a8 Rename StringPillsUtils to PillsFormatter 2022-05-09 15:32:53 +02:00
aringenbach 16ea479a76 Add dedicated PillTextAttachmentData codable 2022-05-09 15:25:47 +02:00
aringenbach 07b2ddc4a9 Rename isCurrentUser to isHighlighted 2022-05-05 15:28:04 +02:00
aringenbach c8a9f90007 Handle empty displayname & fix iOS 14 mentions 2022-05-05 15:12:59 +02:00
aringenbach 0c813338e3 Set property for UTType & add missing iOS 15 availabilities 2022-05-04 15:58:42 +02:00
aringenbach 8077b8058d Fix fonts and edition on replies 2022-05-04 12:17:21 +02:00
aringenbach f26fb6e569 Remove link in composer 2022-05-03 16:51:47 +02:00