Commit Graph

121 Commits

Author SHA1 Message Date
Arnfried Griesert
585f4a852d Feature/7555 migration part 3 2026-03-17 13:55:15 +00:00
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
Arnfried Griesert
86aa5365bb MESSENGER-3352 build settings 2022-10-27 09:06:24 +00:00
Frank Rotermund
f9409804b1 Merge commit 'a7b7fffd00663340f1684fa8d096dc20b4c9719e' into feature/basis_update_192
# Conflicts:
#	Config/AppVersion.xcconfig
#	Config/BuildSettings.swift
#	DesignKit/Source/ColorsSwiftUI.swift
#	DesignKit/Source/FontsSwiftUI.swift
#	DesignKit/Source/ThemeV2.swift
#	DesignKit/Variants/Colors/Dark/DarkColors.swift
#	DesignKit/Variants/Colors/Light/LightColors.swift
#	Podfile.lock
#	Riot/Assets/de.lproj/InfoPlist.strings
#	Riot/Assets/de.lproj/Vector.strings
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Images.swift
#	Riot/Generated/Strings.swift
#	Riot/Managers/PushNotification/PushNotificationService.m
#	Riot/Managers/Settings/RiotSettings.swift
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.h
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Communities/Home/GroupHomeViewController.m
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/SetPinCode/PinCodePreferences.swift
#	Riot/Modules/Settings/SettingsViewController.m
#	Riot/Modules/TabBar/MasterTabBarController.h
#	Riot/Modules/TabBar/MasterTabBarController.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
#	fastlane/Fastfile
#	project.yml
2022-09-19 14:42:25 +02:00
Doug
c643b2aefb Add notification centre to in-app notification delivery options. 2022-08-01 16:48:47 +01:00
Doug
dcd5fad1b9 Add support for in-app notifications. (#6341) 2022-07-07 15:31:37 +01:00
Arnfried Griesert
990962285a merged element 1.8.10 2022-05-03 12:48:01 +02:00
Gil Eluard
2a2650a9a1 Can't view space invitations from system notifications #5915
- Fixed
2022-03-28 13:45:03 +03:00
Gil Eluard
583c1636e2 Can't view space invitations from system notifications #5915
- Fixed
2022-03-27 23:52:56 +02:00
Frank Rotermund
c2108a2178 MESSENGER-2762 Initial Merge 2022-03-17 15:51:23 +01:00
ismailgulek
b63ccddc45 Open & reply to thread only if threads enabled 2022-03-08 17:09:29 +03:00
ismailgulek
49683e11d3 Open & reply to thread only if threads enabled 2022-03-08 17:09:29 +03:00
ismailgulek
ca8eb8352a Reply to thread from notification 2022-03-08 13:54:49 +03:00
ismailgulek
3a4d1d62dd Reply to thread from notification 2022-03-08 13:54:49 +03:00
ismailgulek
067c42c67b Navigate to thread from notification 2022-03-08 12:58:13 +03:00
ismailgulek
26b8afeace Navigate to thread from notification 2022-03-08 12:58:13 +03:00
SBiOSoftWhare
d4e8d9400f Merge develop into steve/5020_matrixkit_merge 2021-11-30 16:16:52 +01:00
SBiOSoftWhare
090e17c3f9 Merge develop into steve/5020_matrixkit_merge 2021-11-30 16:16:52 +01:00
SBiOSoftWhare
e8d4af46d2 Update all Objective-C MatrixKit imports to handle new location. 2021-11-30 16:09:53 +01:00
SBiOSoftWhare
56a51da9f9 Update all Objective-C MatrixKit imports to handle new location. 2021-11-30 16:09:53 +01:00
David Langley
0e43b2ac04 Update Riot/Managers/PushNotification/PushNotificationService.m
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
2021-11-26 14:57:58 +00:00
David Langley
7c56c87d3e Update Riot/Managers/PushNotification/PushNotificationService.m
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
2021-11-26 14:57:58 +00:00
David Langley
907a61765f Restore the pushkit token after login/logout when configuring PushKit 2021-11-26 12:52:40 +00:00
David Langley
235b4aa8fc Restore the pushkit token after login/logout when configuring PushKit 2021-11-26 12:52:40 +00:00
Philippe Loriaux
216924165d Improve the Obj-C Generated Interface Header Name definition 2021-10-26 17:42:33 +02:00
Philippe Loriaux
eaa2450be7 Improve the Obj-C Generated Interface Header Name definition 2021-10-26 17:42:33 +02:00
Stefan Ceriu
8b80b3f4c7 vector-im/element-ios/issues/4899 - Replaced (*almost*) all NSLocalizedString calls with newly generated ObjC methods. 2021-09-30 09:40:12 +03:00
Stefan Ceriu
7b75dec011 vector-im/element-ios/issues/4899 - Replaced (*almost*) all NSLocalizedString calls with newly generated ObjC methods. 2021-09-30 09:40:12 +03:00
Gil Eluard
019b21d805 App may not start in 1.6.0 #4919
- Update after review
2021-09-28 15:22:30 +02:00
Gil Eluard
137da63d8b App may not start in 1.6.0 #4919
- Update after review
2021-09-28 15:22:30 +02:00
Gil Eluard
287121511d App may not start in 1.6.0 #4919
- Update after review
2021-09-28 14:45:34 +02:00
Gil Eluard
a42af21f2d App may not start in 1.6.0 #4919
- Update after review
2021-09-28 14:45:34 +02:00
Gil Eluard
990def5c22 App may not start in 1.6.0 #4919
- Fixed
2021-09-28 13:07:10 +02:00
Gil Eluard
5a22063e81 App may not start in 1.6.0 #4919
- Fixed
2021-09-28 13:07:10 +02:00
ismailgulek
70ed4850dd Enhance logs 2021-06-11 14:38:07 +03:00
ismailgulek
77c367a3e3 Enhance logs 2021-06-11 14:38:07 +03:00
ismailgulek
bae3a6a1ea Handle app state better 2021-06-11 14:37:53 +03:00
ismailgulek
b25d102400 Handle app state better 2021-06-11 14:37:53 +03:00
ismailgulek
6e519d9c5d Handle app inactive state too 2021-06-10 11:43:08 +03:00
ismailgulek
ebefdbf517 Handle app inactive state too 2021-06-10 11:43:08 +03:00
Stefan Ceriu
43f6c44c78 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
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
ismailgulek
93bd3c1ac8 Update store mechanism for call invites 2021-05-10 17:28:59 +03:00
ismailgulek
f132070fc7 Update store mechanism for call invites 2021-05-10 17:28:59 +03:00
ismailgulek
b22f51c8d5 No need to check session state twice 2021-05-10 15:51:26 +03:00
ismailgulek
ac11b5a4ef No need to check session state twice 2021-05-10 15:51:26 +03:00
ismailgulek
39b9781dbd Use model class to read call id 2021-05-07 11:05:37 +03:00
ismailgulek
d789bde498 Use model class to read call id 2021-05-07 11:05:37 +03:00
ismailgulek
203eb41462 Do not display group call notification when in the related room 2021-04-20 15:51:46 +03:00