From 9a04c7a4fe167ceee1dbab4907b4bd1b8e3217f9 Mon Sep 17 00:00:00 2001 From: Ryan Zhao Date: Tue, 8 Mar 2022 13:17:01 +1100 Subject: [PATCH 1/2] mark current user as approved on preregistering --- Session/Onboarding/Onboarding.swift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Session/Onboarding/Onboarding.swift b/Session/Onboarding/Onboarding.swift index 924536923..f5e0ff7af 100644 --- a/Session/Onboarding/Onboarding.swift +++ b/Session/Onboarding/Onboarding.swift @@ -12,6 +12,9 @@ enum Onboarding { TSAccountManager.sharedInstance().phoneNumberAwaitingVerification = x25519PublicKey Storage.writeSync { transaction in let user = Contact(sessionID: x25519PublicKey) + user.isApproved = true + user.didApproveMe = true + user.isTrusted = true Storage.shared.setContact(user, using: transaction) } switch self { From b1fb202eab1f2bc30be92ba19f3c9f8f1ad3ccd6 Mon Sep 17 00:00:00 2001 From: Ryan Zhao Date: Tue, 8 Mar 2022 13:55:34 +1100 Subject: [PATCH 2/2] mark current user as approved in message request migration --- Session/Onboarding/Onboarding.swift | 1 - .../Database/Migrations/MessageRequestsMigration.swift | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Session/Onboarding/Onboarding.swift b/Session/Onboarding/Onboarding.swift index f5e0ff7af..dc89f53b5 100644 --- a/Session/Onboarding/Onboarding.swift +++ b/Session/Onboarding/Onboarding.swift @@ -14,7 +14,6 @@ enum Onboarding { let user = Contact(sessionID: x25519PublicKey) user.isApproved = true user.didApproveMe = true - user.isTrusted = true Storage.shared.setContact(user, using: transaction) } switch self { diff --git a/SignalUtilitiesKit/Database/Migrations/MessageRequestsMigration.swift b/SignalUtilitiesKit/Database/Migrations/MessageRequestsMigration.swift index e22c31aaa..d1fe7cf24 100644 --- a/SignalUtilitiesKit/Database/Migrations/MessageRequestsMigration.swift +++ b/SignalUtilitiesKit/Database/Migrations/MessageRequestsMigration.swift @@ -41,6 +41,13 @@ public class MessageRequestsMigration : OWSDatabaseMigration { threads.append(thread) } + if let user = Storage.shared.getUser() { + user.isApproved = true + user.didApproveMe = true + contacts.insert(user) + } + + Storage.write(with: { transaction in contacts.forEach { contact in Storage.shared.setContact(contact, using: transaction)