diff --git a/Sources/XXClient/Functions/NewUdManagerFromBackup.swift b/Sources/XXClient/Functions/NewUdManagerFromBackup.swift index 14f2b0e494c64ee5a7adaeffe9d3fb1c8d7ee699..7b68fb8a2faa41d53eaa01879e74a4442b13d3ec 100644 --- a/Sources/XXClient/Functions/NewUdManagerFromBackup.swift +++ b/Sources/XXClient/Functions/NewUdManagerFromBackup.swift @@ -5,26 +5,17 @@ public struct NewUdManagerFromBackup { public struct Params: Equatable { public init( e2eId: Int, - username: Fact, - email: Fact?, - phone: Fact?, cert: Data, contact: Data, address: String ) { self.e2eId = e2eId - self.username = username - self.email = email - self.phone = phone self.cert = cert self.contact = contact self.address = address } public var e2eId: Int - public var username: Fact - public var email: Fact? - public var phone: Fact? public var cert: Data public var contact: Data public var address: String @@ -46,9 +37,6 @@ extension NewUdManagerFromBackup { let bindingsUD = BindingsNewUdManagerFromBackup( params.e2eId, follower.makeBindingsUdNetworkStatus(), - try params.username.encode(), - try params.email?.encode(), - try params.phone?.encode(), params.cert, params.contact, params.address, diff --git a/Sources/XXMessengerClient/Messenger/Functions/MessengerRestoreBackup.swift b/Sources/XXMessengerClient/Messenger/Functions/MessengerRestoreBackup.swift index e32e6324cb1eeebc7dce54b8cc3769d830f4d43e..66f50dd550930409dd164315095b7517fd34acca 100644 --- a/Sources/XXMessengerClient/Messenger/Functions/MessengerRestoreBackup.swift +++ b/Sources/XXMessengerClient/Messenger/Functions/MessengerRestoreBackup.swift @@ -42,6 +42,9 @@ extension MessengerRestoreBackup { sessionPassword: password, backupFileContents: backupData ) + let decoder = JSONDecoder() + let paramsData = report.params.data(using: .utf8)! + let params = try decoder.decode(BackupParams.self, from: paramsData) let cMix = try env.loadCMix( storageDir: storageDir, password: password, @@ -57,15 +60,9 @@ extension MessengerRestoreBackup { ) env.e2e.set(e2e) env.isListeningForMessages.set(false) - let decoder = JSONDecoder() - let paramsData = report.params.data(using: .utf8)! - let params = try decoder.decode(BackupParams.self, from: paramsData) let ud = try env.newUdManagerFromBackup( params: NewUdManagerFromBackup.Params( e2eId: e2e.getId(), - username: Fact(type: .username, value: params.username), - email: params.email.map { Fact(type: .email, value: $0) }, - phone: params.phone.map { Fact(type: .phone, value: $0) }, cert: env.udCert ?? e2e.getUdCertFromNdf(), contact: env.udContact ?? (try e2e.getUdContactFromNdf()), address: env.udAddress ?? e2e.getUdAddressFromNdf() diff --git a/Tests/XXMessengerClientTests/Messenger/Functions/MessengerRestoreBackupTests.swift b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerRestoreBackupTests.swift index 3e2dc1f2b8ea333fd1155a06b2010d7f3faeee13..67663feebde5554f9810dc36260bd2055c15a66f 100644 --- a/Tests/XXMessengerClientTests/Messenger/Functions/MessengerRestoreBackupTests.swift +++ b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerRestoreBackupTests.swift @@ -155,9 +155,6 @@ final class MessengerRestoreBackupTests: XCTestCase { ), .didNewUdManagerFromBackup(params: .init( e2eId: e2eId, - username: Fact(type: .username, value: backupParams.username), - email: Fact(type: .email, value: backupParams.email!), - phone: Fact(type: .phone, value: backupParams.phone!), cert: udCertFromNdf, contact: udContactFromNdf, address: udAddressFromNdf