From d3ece0019dc65d3991ac205edfe88c0d78113c72 Mon Sep 17 00:00:00 2001
From: Dariusz Rybicki <dariusz@elixxir.io>
Date: Mon, 26 Sep 2022 22:30:39 +0200
Subject: [PATCH] Remove fact params from NewUdManagerFromBackup
---
.../XXClient/Functions/NewUdManagerFromBackup.swift | 12 ------------
.../Messenger/Functions/MessengerRestoreBackup.swift | 9 +++------
.../Functions/MessengerRestoreBackupTests.swift | 3 ---
3 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/Sources/XXClient/Functions/NewUdManagerFromBackup.swift b/Sources/XXClient/Functions/NewUdManagerFromBackup.swift
index 14f2b0e4..7b68fb8a 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 e32e6324..66f50dd5 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 3e2dc1f2..67663fee 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
--
GitLab