Merge branch 'master' into xftp

This commit is contained in:
Evgeny Poberezkin 2023-03-27 18:57:14 +01:00
commit 1f15cf54af
112 changed files with 7406 additions and 989 deletions

View file

@ -204,7 +204,7 @@ var xftpConfig: XFTPFileConfig? = getXFTPCfg()
func startChat() -> DBMigrationResult? {
hs_init(0, nil)
if chatStarted { return .ok }
let (_, dbStatus) = chatMigrateInit()
let (_, dbStatus) = chatMigrateInit(confirmMigrations: defaultMigrationConfirmation())
if dbStatus != .ok {
resetChatCtrl()
return dbStatus