From 477fbe494df7bb4d937bf8201667bc3b4017cd22 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Fri, 24 Jan 2020 11:03:45 +1100 Subject: [PATCH] Fix build --- Signal.xcodeproj/project.pbxproj | 2 +- .../{Messaging => Components}/SessionRestoreBannerView.swift | 0 Signal/src/Loki/View Controllers/RestoreVC.swift | 1 + SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.m | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) rename Signal/src/Loki/{Messaging => Components}/SessionRestoreBannerView.swift (100%) diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 8786ae6d8..35c09f8df 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -2785,6 +2785,7 @@ B85357BE23A1AE0800AAF6CD /* SeedReminderView.swift */, B85357C023A1B81900AAF6CD /* SeedReminderViewDelegate.swift */, B8BB82B82394911B00BA5194 /* Separator.swift */, + 2400888D239F30A600305217 /* SessionRestoreBannerView.swift */, B8CCF638239721E20091D419 /* TabBar.swift */, B8BB82B423947F2D00BA5194 /* TextField.swift */, ); @@ -2824,7 +2825,6 @@ B82B408B239A068800A248E7 /* RegisterVC.swift */, B82B408F239DD75000A248E7 /* RestoreVC.swift */, B893063E2383961A005EAA8E /* ScanQRCodeWrapperVC.swift */, - 2400888D239F30A600305217 /* SessionRestoreBannerView.swift */, B86BD08523399CEF000F5AE3 /* SeedModal.swift */, B85357C223A1BD1200AAF6CD /* SeedVCV2.swift */, B8CCF6422397711F0091D419 /* SettingsVC.swift */, diff --git a/Signal/src/Loki/Messaging/SessionRestoreBannerView.swift b/Signal/src/Loki/Components/SessionRestoreBannerView.swift similarity index 100% rename from Signal/src/Loki/Messaging/SessionRestoreBannerView.swift rename to Signal/src/Loki/Components/SessionRestoreBannerView.swift diff --git a/Signal/src/Loki/View Controllers/RestoreVC.swift b/Signal/src/Loki/View Controllers/RestoreVC.swift index b6157326d..6b0b07cbc 100644 --- a/Signal/src/Loki/View Controllers/RestoreVC.swift +++ b/Signal/src/Loki/View Controllers/RestoreVC.swift @@ -176,6 +176,7 @@ final class RestoreVC : UIViewController { databaseConnection.setObject(seed.toHexString(), forKey: "LKLokiSeed", inCollection: OWSPrimaryStorageIdentityKeyStoreCollection) databaseConnection.setObject(keyPair, forKey: OWSPrimaryStorageIdentityKeyStoreIdentityKey, inCollection: OWSPrimaryStorageIdentityKeyStoreCollection) TSAccountManager.sharedInstance().phoneNumberAwaitingVerification = keyPair.hexEncodedPublicKey + OWSPrimaryStorage.shared().setRestorationTime(Date().timeIntervalSince1970) mnemonicTextField.resignFirstResponder() Timer.scheduledTimer(withTimeInterval: 0.25, repeats: false) { _ in let displayNameVC = DisplayNameVC() diff --git a/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.m b/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.m index 1a71d58d7..9b9e9e7cf 100644 --- a/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.m +++ b/SignalServiceKit/src/Loki/Database/OWSPrimaryStorage+Loki.m @@ -196,5 +196,6 @@ - (NSTimeInterval)getRestorationTime { return [self.dbReadConnection doubleForKey:@"restoration_time" inCollection:LKGeneralCollection defaultValue:0]; +} @end