Skip to content

Commit d9bdd76

Browse files
committed
Fix
1 parent 7eb3cba commit d9bdd76

File tree

2 files changed

+19
-8
lines changed

2 files changed

+19
-8
lines changed

EncryptedDATAStack/Classes/DATAStack.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Foundation
2-
import CoreData
2+
import EncryptedCoreData
33

44
@objc public enum DATAStackStoreType: Int {
55
case InMemory, SQLite
@@ -16,7 +16,7 @@ import CoreData
1616

1717
internal var containerURL = NSURL.directoryURL()
1818

19-
private var _mainContext: NSManagedObjectContext?
19+
internal var _mainContext: NSManagedObjectContext?
2020

2121
/**
2222
The context for the main queue. Please do not use this to mutate data, use `performInNewBackgroundContext`

EncryptedDATAStack/Classes/EncryptedDATAStack.swift

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,23 @@ import EncryptedCoreData
1010

1111
public class EncryptedDATAStack: DATAStack {
1212
private var hashKey: String
13+
14+
override public var mainContext: NSManagedObjectContext {
15+
get {
16+
if _mainContext == nil {
17+
let context = NSManagedObjectContext(concurrencyType: .MainQueueConcurrencyType)
18+
context.undoManager = nil
19+
context.mergePolicy = NSMergeByPropertyStoreTrumpMergePolicy
20+
context.persistentStoreCoordinator = self.persistentStoreCoordinator
21+
22+
NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(DATAStack.mainContextDidSave(_:)), name: NSManagedObjectContextDidSaveNotification, object: context)
23+
24+
_mainContext = context
25+
}
26+
27+
return _mainContext!
28+
}
29+
}
1330

1431
override internal var persistentStoreCoordinator: NSPersistentStoreCoordinator {
1532
get {
@@ -27,12 +44,6 @@ public class EncryptedDATAStack: DATAStack {
2744
}
2845
}
2946

30-
public init(hashKey:String) {
31-
self.hashKey = hashKey
32-
super.init()
33-
}
34-
35-
3647
public init(modelName: String, hashKey: String) {
3748
self.hashKey = hashKey
3849

0 commit comments

Comments
 (0)