From b1fb202eab1f2bc30be92ba19f3c9f8f1ad3ccd6 Mon Sep 17 00:00:00 2001
From: Ryan Zhao <ryanzhaors@qq.com>
Date: Tue, 8 Mar 2022 13:55:34 +1100
Subject: [PATCH] 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)