Skip to content
Snippets Groups Projects
Commit d3ece001 authored by Dariusz Rybicki's avatar Dariusz Rybicki
Browse files

Remove fact params from NewUdManagerFromBackup

parent 0f814d6f
No related branches found
No related tags found
2 merge requests!106Update Bindings,!102Release 1.0.0
......@@ -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,
......
......@@ -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()
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment