Commit Graph

312 Commits

Author SHA1 Message Date
JanNiklas Grabowski 03c79fc8eb MESSENGER-6019 fix permalink bugs 2024-05-28 16:56:48 +02:00
Frank Rotermund 2724bb9c83 MESSENGER-5950 be aware of none Matrix erros 2024-04-24 08:04:36 +02:00
JanNiklas Grabowski 571a1a2d00 MESSENGER-5806 bugfix location view shown after deletion 2024-03-27 16:31:11 +01:00
Frank Rotermund 4aaf86e41e MESSENGER-5570 acl status events up to collapsability 2024-02-21 16:50:20 +01:00
JanNiklas Grabowski d6da4e7f75 MESSENGER-5208 and 5220 us09 and us04 2023-11-13 17:33:21 +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 6ad39f6fcb Device dehydration v2
- add support for device dehydration v2 i.e. `org.matrix.msc3814`
- run dehydration flows after successfully recovering or creating secrets
- enable said flows based on .well-known `org.matrix.msc3814` config key
- delete previous implementation and helper methods
2023-08-11 13:52:10 +03:00
JanNiklas Grabowski 485f944c6c revert '5bc3255dfe7b0a56aa3ce4b8056015b438653fed' 4889_deactivate_rust_for_prod 2023-07-17 08:54:43 +00:00
JanNiklas Grabowski a22c234e82 Feature/4889 deactivate rust for prod 2023-06-28 05:59:03 +00:00
Arnfried Griesert 1c0ef0ca52 merged element 1.10.12 into bum 2023-06-07 15:45:59 +02:00
Nicolas Mauri b6811fd99b Fix a flickering issue when the timeline datasource is reloaded. 2023-04-28 16:23:48 +02:00
aringenbach 92286ecb88 Fix typo 2023-04-21 13:47:15 +02:00
aringenbach 2048e2f085 Fix comment typo 2023-04-20 17:12:09 +02:00
aringenbach 787967a8e4 Rework MXKSlashCommands to a more Swift-friendly form and use it in suggestion module 2023-04-20 16:45:08 +02:00
Nicolas Mauri 6179453c57 Fix: Calculation of the frame for a bubble component 2023-04-20 10:14:51 +02:00
Andy Uhnak 7b728c14f8 Deprecate MXLegacyCrypto 2023-04-18 12:45:39 +01:00
Arnfried Griesert 6068b228a7 Merged element 1.10.9 into bum 2023-04-11 11:46:44 +02:00
Andy Uhnak 28f26de5f6 No event decoration if no decryption result 2023-04-03 17:36:45 +01:00
Andy Uhnak 16f74e84c8 Simplify event encryption decoration 2023-03-27 14:58:10 +01:00
Andy Uhnak ef31ad428b Revert "Merge pull request #7430 from vector-im/andy/user_trust"
This reverts commit 7f5d3b46eb02a7801d4a7c781762eea3d16ee0e6, reversing
changes made to 5a3adde8f70daec795ac1bee17c5159a155c6106.
2023-03-22 15:57:25 +00:00
Andy Uhnak db771d2508 Refactor encryption trust level 2023-03-16 14:56:50 +00:00
Arnfried Griesert e5d97ed154 merged element-ios 1.10.5 into 4409_basis_update_1_10_5 2023-03-16 12:19:26 +01:00
Mauro Romito fc1c22c08c refactor completed 2023-03-06 14:59:03 +01:00
Flescio 99b8e8de42 fix issue on timeline bubbles not showing proper content after decrypt (#7397)
* fix issue on timeline bubbles not showing proper content after decrypt

* Update Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSourceManager.m
2023-03-02 11:30:26 +01:00
JanNiklas Grabowski 1768fb5eee Merge commit 'aaadcc73674cc8886e363693a7d7c08ac9b4f516' into feature/4260_merge_foss_1_10_2
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile
#	Podfile.lock
#	Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
#	Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift
#	Riot/Modules/Home/AllChats/AllChatsViewController.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
#	Riot/Modules/Room/Settings/RoomSettingsViewController.m
#	fastlane/Fastfile
2023-02-15 14:56:55 +01:00
Anderas f4fd2cc381 Merge pull request #7369 from vector-im/andy/crypto_fixes
Do not reset device keys if migrating to CryptoSDK
2023-02-13 13:01:39 +00:00
Andy Uhnak e535a0112d Do not reset device keys if migrating to CryptoSDK 2023-02-13 11:14:26 +00:00
Doug a46d884b05 Merge branch 'master' into develop 2023-02-10 13:39:22 +00:00
Andy Uhnak d203630795 Fix some crashes 2023-02-09 08:44:31 +00:00
Flescio 9ecfe523aa "Mark as unread" dot appears on rooms that are actually unread, not marked as such (#7352)
* fix green dot only to appear for marked action
2023-02-09 09:01:16 +01:00
Alfonso Grillo f6dfd2cc51 Sync with matrix feature branch 2023-02-08 17:29:30 +01:00
Arnfried Griesert 66b2259f7c MESSENGER-4034 app icon name 2023-02-08 14:53:45 +00:00
Alfonso Grillo 475c53b2fa Fix last message for m.poll.end events 2023-02-08 15:30:05 +01:00
Flavio Alescio 7ba73cfc85 Merge branch 'develop' into flescio/7253-Add_mar_kas_unread_option_for_rooms 2023-01-25 10:28:37 +01:00
Alfonso Grillo ce9a982244 Add new localisation for ended poll replies 2023-01-18 16:35:39 +01:00
Frank Rotermund 9f6deb9110 Merge commit '2e9bb7067e9f1596f29b986729822184145906db' into feature/4068_merge_foss_1_9_15
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Assets/de.lproj/Localizable.strings
#	Riot/Modules/Room/RoomViewController.m
#	RiotNSE/NotificationService.swift
#	fastlane/Fastfile
2023-01-16 12:11:51 +01:00
Nicolas Mauri 36188fdcf3 Code cleanup 2023-01-13 15:29:51 +01:00
Nicolas Mauri 3aefcd579f Fix how is resent a voice broadcast chunk 2023-01-13 08:33:30 +01:00
Flavio Alescio 8fd6baa3c9 Add mark as unread option for rooms 2023-01-10 16:13:14 +01:00
Alfonso Grillo 8596b36257 Cleanup code 2023-01-10 12:20:34 +01:00
Alfonso Grillo 4bc37ba146 Fix reactions layout 2023-01-10 12:19:39 +01:00
Alfonso Grillo 562f36775d Remove filter for poll.end events 2023-01-10 12:17:15 +01:00
Nicolas Mauri 9845d161a5 Ensures that we only support reactions for a start event 2023-01-09 14:46:26 +01:00
Nicolas Mauri 315bed3fe6 add support for reactions on VB (#7179) 2023-01-06 12:18:19 +01:00
Frank Rotermund 0fca000b8d Merge commit '3d672a05b2a7117ade2e4e87bd2b5762063d7922' into feature/3977_merge_element_1_9_13
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
#	Riot/Modules/LaunchLoading/LaunchLoadingView.swift
#	Riot/Modules/LaunchLoading/LaunchLoadingView.xib
#	Riot/Modules/MatrixKit/Models/Account/MXKAccount.m
#	Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellData.m
#	Riot/Modules/Room/TimelineCells/Styles/Bubble/BubbleRoomTimelineCellProvider.m
#	Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
#	Riot/Modules/TabBar/MasterTabBarController.m
#	fastlane/Fastfile
2022-12-19 14:36:30 +01:00
Andy Uhnak 556176606b Fix Sentry errors 2022-12-14 17:25:27 +00:00
Gil Eluard 720d74b428 Merge pull request #7152 from vector-im/gil/7151-Thread_preview_doesnt_update_in_main_timeline
Thread preview doesn't update in main timeline
2022-12-09 15:55:59 +01:00
Gil Eluard 79bd2c0ef1 Thread preview doesn't update in main timeline
- Fixed
2022-12-09 14:58:07 +01:00
Anderas 073a175388 Merge pull request #7115 from vector-im/andy/mandatory_crypto
Do not retry initial sync on fatal errors
2022-12-05 17:48:42 +00:00
Andy Uhnak cb26a5f3f3 Change fatal error range 2022-12-05 16:29:14 +00:00