14 Commits

Author	SHA1	Message	Date
JanNiklas Grabowski	b4d4330109	Merge commit '8b96dce52c015ca629dea38c32307cddbcd2577c' 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
Andy Uhnak	9d80b9e341	Generate crypto store key	2023-02-02 16:42:45 +00:00
Arnfried Griesert	4f407e6923	MESSENGER-3352 build settings	2022-10-27 09:06:24 +00:00
Frank Rotermund	99c73185be	MESSENGER-3344 undecrypted contactsv2	2022-09-19 12:45:39 +02:00
Frank Rotermund	37d97d09db	MESSENGER-2762 Initial Merge	2022-03-17 15:51:23 +01:00
SBiOSoftWhare	fe84f0d862	Remove MatrixKit import from Swift files.	2021-11-29 17:50:30 +01:00
ismailgulek	8d81e45497	Create keys for room last message data type	2021-06-03 15:48:01 +03:00
Stefan Ceriu	b00d07ffca	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
manuroe	8ca05ad2d8	EncryptionKeyManager: Enable key for e2e DB	2021-02-18 16:37:58 +01:00
Gil Eluard	2200aa2fa3	Merge branch 'develop' into element_3867 ... # Conflicts: # CHANGES.rst # Riot.xcodeproj/project.pbxproj	2021-01-11 11:58:53 +01:00
ismailgulek	11272620f7	Use key provider delegate in common configuration	2020-12-16 16:06:07 +03:00
Gil Eluard	75a26118a2	Code updated after code review	2020-12-15 16:55:34 +01:00
Gil Eluard	9a451e4814	Code updated after code review	2020-12-15 16:47:07 +01:00
Gil Eluard	97922d0d2b	Implementation of the MXKeyProviderDelegate to enable encryption of contacts, accounts, and crypto DB	2020-12-14 23:05:57 +01:00