Use long instead of short key ID.

[#246 state:fixed]
GPGTools · Jun 15, 2018 · 2675695 · 2675695
1 parent 34559b6
commit 2675695
Show file tree

Hide file tree

Showing 7 changed files with 1,751 additions and 9,225 deletions.
diff --git a/Resources/de.lproj/RecipientWindow.xib b/Resources/de.lproj/RecipientWindow.xib
diff --git a/Resources/en.lproj/RecipientWindow.xib b/Resources/en.lproj/RecipientWindow.xib
diff --git a/Resources/it.lproj/RecipientWindow.xib b/Resources/it.lproj/RecipientWindow.xib
diff --git a/Resources/old/en.lproj/RecipientWindow.xib b/Resources/old/en.lproj/RecipientWindow.xib
diff --git a/Source/FileVerificationDataSource.m b/Source/FileVerificationDataSource.m
@@ -92,7 +92,7 @@ - (void)addResultFromSigOnMain:(NSArray *)args {
         }
 
 
-		NSString *string1 = [NSString stringWithFormat:@"Signed by: %@ (%@) – ", sig.userIDDescription, sig.fingerprint.shortKeyID];
+		NSString *string1 = [NSString stringWithFormat:@"Signed by: %@ (%@) – ", sig.userIDDescription, sig.fingerprint.keyID];
 		NSMutableAttributedString *resultString = [[NSMutableAttributedString alloc] initWithString:string1 attributes:nil];
 
 		NSDictionary *attributes = @{NSFontAttributeName: [NSFont boldSystemFontOfSize:[NSFont systemFontSize]], NSBackgroundColorAttributeName: bgColor};

diff --git a/Source/GPGServices.m b/Source/GPGServices.m
@@ -299,8 +299,8 @@ - (NSString *)myKey {
 		NSData *keyData = [ctx exportKeys:[NSArray arrayWithObject:selectedPrivateKey] allowSecret:NO fullExport:NO];
 
 		if (keyData == nil) {
-			NSString *msg = [NSString stringWithFormat:NSLocalizedString(@"Could not export key %@", @"arg:shortKeyID"),
-							 selectedPrivateKey.keyID.shortKeyID];
+			NSString *msg = [NSString stringWithFormat:NSLocalizedString(@"Could not export key %@", @"arg:keyID"),
+							 selectedPrivateKey.keyID];
 			[self displayOperationFailedNotificationWithTitle:NSLocalizedString(@"Export failed", nil)
 													  message:msg];
 			return nil;
@@ -453,7 +453,7 @@ - (NSString *)decryptTextString:(NSString *)inputString {
 						break;
 					case GPGErrorNoPublicKey:
 						errorMessage = [NSString stringWithFormat:NSLocalizedString(@"Unable to verify signature! Missing public key: %@", nil),
-										sig.fingerprint.shortKeyID];
+										sig.fingerprint];
 						break;
 					default:
 						errorMessage = [NSString stringWithFormat:NSLocalizedString(@"Unexpected GPG signature status %i", @"arg:GPGSignature status"), status ];
@@ -586,7 +586,7 @@ - (void)verifyTextString:(NSString *)inputString {
 						break;
 					case GPGErrorNoPublicKey:
 						errorMessage = [NSString stringWithFormat:NSLocalizedString(@"Unable to verify signature! Missing public key: %@", nil),
-										sig.fingerprint.shortKeyID];
+										sig.fingerprint];
 						break;
 					default:
 						errorMessage = [NSString stringWithFormat:NSLocalizedString(@"Unexpected GPG signature status %i", @"arg:GPGSignature status"), status ];

diff --git a/Source/KeyChooserDataSource.m b/Source/KeyChooserDataSource.m
@@ -106,9 +106,9 @@ - (void)updateDescriptions {
 			description = email;
 		}
 		if (description) {
-			description = [NSString stringWithFormat:@"%@ (%@)", description, key.shortKeyID];
+			description = [NSString stringWithFormat:@"%@ (%@)", description, key.keyID];
 		} else {
-			description = key.shortKeyID;
+			description = key.keyID;
 		}
 
 		[arr addObject:description];