nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-22 18:49:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reworked DatabaseSettings to be cancelable

Browse Source 
Moved Password edit to Database settings
This commit is contained in:
michael starke
2013-07-06 04:18:10 +02:00
parent 005bab7380
commit f55e78349e
20 changed files with 816 additions and 825 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MacPass/MPDocument+Attachments.m
View File

@@ -34,11 +34,10 @@
}
if( [anEntry isKindOfClass:[Kdb4Entry class]]) {
Kdb4Entry *entry = (Kdb4Entry *)anEntry;
NSStringEncoding encoding;
NSString *fileContents = [NSString stringWithContentsOfURL:location usedEncoding:&encoding error:&error];
if(!fileContents) {
NSData *fileData = [NSData dataWithContentsOfURL:location options:NSDataReadingMappedIfSafe error:&error];
if(!fileData) {
[NSApp presentError:error];
fileContents = nil;
fileData = nil;
error = nil;
return; // failed
}
@@ -51,7 +50,6 @@
binary.binaryId = nextId;
binary.compressed = (self.treeV4.compressionAlgorithm != KPLCompressionNone);
NSData *encodedData;
NSData *fileData = [fileContents dataUsingEncoding:encoding];
if(binary.compressed) {
switch(self.treeV4.compressionAlgorithm) {
case KPLCompressionGzip: {