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
Andy Uhnak
72ab421f3a
Generate crypto store key
2023-02-02 16:42:45 +00:00
Arnfried Griesert
86aa5365bb
MESSENGER-3352 build settings
2022-10-27 09:06:24 +00:00
Frank Rotermund
0d546702c3
MESSENGER-3344 undecrypted contactsv2
2022-09-19 12:45:39 +02:00
Frank Rotermund
c2108a2178
MESSENGER-2762 Initial Merge
2022-03-17 15:51:23 +01:00
SBiOSoftWhare
6677622eb0
Remove MatrixKit import from Swift files.
2021-11-29 17:50:30 +01:00
SBiOSoftWhare
90627cdb4a
Remove MatrixKit import from Swift files.
2021-11-29 17:50:30 +01:00
ismailgulek
c6b1ae6e0b
Create keys for room last message data type
2021-06-03 15:48:01 +03:00
ismailgulek
f41f07c9dc
Create keys for room last message data type
2021-06-03 15:48:01 +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
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
manuroe
71ab877451
EncryptionKeyManager: Enable key for e2e DB
2021-02-18 16:37:58 +01:00
manuroe
ecef8cab98
EncryptionKeyManager: Enable key for e2e DB
2021-02-18 16:37:58 +01:00
Gil Eluard
c20ce2b0b8
Merge branch 'develop' into element_3867
...
# Conflicts:
# CHANGES.rst
# Riot.xcodeproj/project.pbxproj
2021-01-11 11:58:53 +01:00
Gil Eluard
81c8828a98
Merge branch 'develop' into element_3867
...
# Conflicts:
# CHANGES.rst
# Riot.xcodeproj/project.pbxproj
2021-01-11 11:58:53 +01:00
ismailgulek
20b7ca45f9
Use key provider delegate in common configuration
2020-12-16 16:06:07 +03:00
ismailgulek
4de7c8562a
Use key provider delegate in common configuration
2020-12-16 16:06:07 +03:00
Gil Eluard
eb07c9ec8e
Code updated after code review
2020-12-15 16:55:34 +01:00
Gil Eluard
efa17efb57
Code updated after code review
2020-12-15 16:55:34 +01:00
Gil Eluard
2740f14973
Code updated after code review
2020-12-15 16:47:07 +01:00
Gil Eluard
5cc3d047cb
Code updated after code review
2020-12-15 16:47:07 +01:00
Gil Eluard
bf5b3ef7b7
Implementation of the MXKeyProviderDelegate to enable encryption of contacts, accounts, and crypto DB
2020-12-14 23:05:57 +01:00
Gil Eluard
b686231db7
Implementation of the MXKeyProviderDelegate to enable encryption of contacts, accounts, and crypto DB
2020-12-14 23:05:57 +01:00