kiwix/kiwix-apple
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-apple.git synced 2025-09-24 04:03:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update Managed Obj Context Merge policy

Browse Source
This commit is contained in:
Chris Li 2016-07-25 17:06:52 -04:00
parent 6a966c6bd4
commit dff2471087
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Kiwix-iOS/AppDelegate.swift
View File

@ -178,6 +178,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, OperationQueueDelegate {
let coordinator = self.persistentStoreCoordinator let coordinator = self.persistentStoreCoordinator
var managedObjectContext = NSManagedObjectContext(concurrencyType: .MainQueueConcurrencyType) var managedObjectContext = NSManagedObjectContext(concurrencyType: .MainQueueConcurrencyType)
managedObjectContext.persistentStoreCoordinator = coordinator managedObjectContext.persistentStoreCoordinator = coordinator
managedObjectContext.mergePolicy = NSMergeByPropertyObjectTrumpMergePolicy
return managedObjectContext return managedObjectContext
}() }()

2
Kiwix-iOS/Info.plist
View File

@ -49,7 +49,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.7.541</string> <string>1.7.544</string>
<key>ITSAppUsesNonExemptEncryption</key> <key>ITSAppUsesNonExemptEncryption</key>
<false/> <false/>
<key>LSRequiresIPhoneOS</key> <key>LSRequiresIPhoneOS</key>

2
Kiwix/Operations/RefreshLibraryOperation.swift
View File

@ -60,7 +60,7 @@ class ParseLibraryOperation: Operation, NSXMLParserDelegate {
override init() { override init() {
self.context = NSManagedObjectContext(concurrencyType: .PrivateQueueConcurrencyType) self.context = NSManagedObjectContext(concurrencyType: .PrivateQueueConcurrencyType)
context.parentContext = NSManagedObjectContext.mainQueueContext context.parentContext = NSManagedObjectContext.mainQueueContext
context.mergePolicy = NSOverwriteMergePolicy context.mergePolicy = NSMergeByPropertyObjectTrumpMergePolicy
super.init() super.init()
name = String(ParseLibraryOperation) name = String(ParseLibraryOperation)
} }