adium 5649:991f62ac6f10: This function is now also unnecessary. ...

commits at adium.im commits at adium.im
Tue Jul 9 21:03:46 UTC 2013


details:	http://hg.adium.im/adium/rev/991f62ac6f10
revision:	5649:991f62ac6f10
branch:		libotr4.0.0
author:		Thijs Alkemade <me at thijsalkema.de>
date:		Tue Jul 09 23:02:41 2013 +0200

This function is now also unnecessary. And change wording, "verifiably correct" is needlessly complicated.

diffs (62 lines):

diff -r a1d6eedadab9 -r 991f62ac6f10 Source/ESOTRUnknownFingerprintController.h
--- a/Source/ESOTRUnknownFingerprintController.h	Tue Jul 09 19:01:42 2013 +0200
+++ b/Source/ESOTRUnknownFingerprintController.h	Tue Jul 09 23:02:41 2013 +0200
@@ -18,7 +18,6 @@
 
 }
 
-+ (void)showUnknownFingerprintPromptWithResponseInfo:(NSDictionary *)responseInfo;
 + (void)showVerifyFingerprintPromptWithResponseInfo:(NSDictionary *)responseInfo;;
 
 @end
diff -r a1d6eedadab9 -r 991f62ac6f10 Source/ESOTRUnknownFingerprintController.m
--- a/Source/ESOTRUnknownFingerprintController.m	Tue Jul 09 19:01:42 2013 +0200
+++ b/Source/ESOTRUnknownFingerprintController.m	Tue Jul 09 23:02:41 2013 +0200
@@ -25,38 +25,11 @@
 #import "AdiumOTREncryption.h"
 
 @interface ESOTRUnknownFingerprintController ()
-+ (void)showFingerprintPromptWithMessageString:(NSString *)messageString 
-								  acceptButton:(NSString *)acceptButton
-									denyButton:(NSString *)denyButton
-								  responseInfo:(NSDictionary *)responseInfo;
 + (void)unknownFingerprintResponseInfo:(NSDictionary *)responseInfo wasAccepted:(BOOL)fingerprintAccepted;
 @end
 
 @implementation ESOTRUnknownFingerprintController
 
-+ (void)showUnknownFingerprintPromptWithResponseInfo:(NSDictionary *)responseInfo
-{
-	NSString	*messageString;
-	AIAccount	*account = [responseInfo objectForKey:@"AIAccount"];
-	NSString	*who = [responseInfo objectForKey:@"who"];
-	NSString	*theirHash = [responseInfo objectForKey:@"Their Fingerprint"];
-	
-	messageString = [NSString stringWithFormat:
-		AILocalizedString(@"%@ wants to start an encrypted conversation with you (%@).\n\n"
-						  @"However, for this chat to be securely encrypted, you should verify their identity by checking their fingerprint. For the best security, it is recommended to use a different form of communication to do this.\n\n"
-						  @"Purported fingerprint for %@:\n\n%@\n\n"
-						  @"Have you verified this fingerprint to be correct?",nil),
-		who,
-		account.formattedUID,
-		who,
-		theirHash];
-	
-	[self showFingerprintPromptWithMessageString:messageString
-									acceptButton:AILocalizedString(@"Yes",nil)
-									  denyButton:AILocalizedString(@"Verify Later",nil)
-									responseInfo:responseInfo];
-}
-
 + (void)showVerifyFingerprintPromptWithResponseInfo:(NSDictionary *)responseInfo
 {
 	NSString	*messageString;
@@ -68,7 +41,7 @@
 	messageString = [NSString stringWithFormat:
 		AILocalizedString(@"Fingerprint for you (%@): %@\n\n"
 						  "Purported fingerprint for %@: %@\n\n"
-						  "Is this the verifiably correct fingerprint for %@?",nil),
+						  "Have you verified this is %@'s fingerprint?",nil),
 		account.formattedUID,
 		ourHash,
 		who,




More information about the commits mailing list