Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Import bug fixed

  • Loading branch information...
commit b90dc4af2975ce5149e6c243498668fdcbef244e 1 parent d79f2a9
@Mento Mento authored
View
6 Source/GPGController.m
@@ -1056,9 +1056,11 @@ - (NSString *)importFromData:(NSData *)data fullImport:(BOOL)fullImport {
[self operationDidStart];
[self registerUndoForKeys:keys withName:@"Undo_Import"];
-
+ GPGTaskOrder *order = [GPGTaskOrder orderWithNoToAll];
+
gpgTask = [GPGTask gpgTask];
[self addArgumentsForOptions];
+ //gpgTask.userInfo = [NSDictionary dictionaryWithObject:order forKey:@"order"];
[gpgTask addInData:data];
[gpgTask addArgument:@"--import"];
if (fullImport) {
@@ -2044,6 +2046,8 @@ - (id)gpgTask:(GPGTask *)task statusCode:(NSInteger)status prompt:(NSString *)pr
cmd = [cmd stringByAppendingString:@"\n"];
}
return cmd;
+ } else {
+ return @"\n";
}
break; }
case GPG_STATUS_GOODSIG:
View
4 Source/GPGPacket.m
@@ -609,11 +609,11 @@ + (NSData *)unArmorFrom:(GPGStream *)input clearText:(NSData **)clearText
free(binaryBuffer);
- readPos += armorTypeStrings[armorType][0];
+ readPos += armorTypeStrings[armorType][0] - 1;
state = state_searchStart;
break; }
}
- }
+ } //for
endOfBuffer:
free(mutableBytes);
View
2  Source/GPGTask.m
@@ -411,7 +411,7 @@ - (NSInteger)start {
- (NSData *)processStatusWithKeyword:(NSString *)keyword value:(NSString *)value {
- NSArray *parts = [value isEqualToString:@""] ? [NSArray array] : [value componentsSeparatedByString:@""];
+ NSArray *parts = [value isEqualToString:@""] ? [NSArray array] : [value componentsSeparatedByString:@" "];
NSInteger statusCode = [[statusCodes objectForKey:keyword] integerValue];
// No status code available, we're out of here.
if(!statusCode)
View
4 Source/GPGWatcher.m
@@ -16,8 +16,8 @@ @implementation GPGWatcher
@synthesize toleranceBefore;
@synthesize toleranceAfter;
-#define TOLERANCE_BEFORE 1.0
-#define TOLERANCE_AFTER 1.0
+#define TOLERANCE_BEFORE 10.0
+#define TOLERANCE_AFTER 10.0
#define DW_LATENCY 5.0
static NSString * const kWatcherLastFoundChange = @"lastFoundChange";
Please sign in to comment.
Something went wrong with that request. Please try again.