adium 5136:e32c04b139d0: Added (still non-workin) menu items for...
commits at adium.im
commits at adium.im
Wed Oct 17 22:32:34 UTC 2012
details: http://hg.adium.im/adium/rev/e32c04b139d0
revision: 5136:e32c04b139d0
branch: libotr4.0.0
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Thu Oct 18 00:03:51 2012 +0200
Added (still non-workin) menu items for shared secret/secret question verification.
Subject: adium 5137:47659145332e: Implemented the initiating part of SMP.
details: http://hg.adium.im/adium/rev/47659145332e
revision: 5137:47659145332e
branch: libotr4.0.0
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Thu Oct 18 00:32:21 2012 +0200
Implemented the initiating part of SMP.
diffs (truncated from 1137 to 1000 lines):
diff -r ad85e7ac1b05 -r 47659145332e Frameworks/Adium Framework/Source/AIAccount.h
--- a/Frameworks/Adium Framework/Source/AIAccount.h Wed Oct 17 23:50:52 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIAccount.h Thu Oct 18 00:32:21 2012 +0200
@@ -281,7 +281,6 @@
@property (readonly, nonatomic) NSString *aboutEncryption;
- (void)requestSecureMessaging:(BOOL)inSecureMessaging
inChat:(AIChat *)inChat;
-- (void)promptToVerifyEncryptionIdentityInChat:(AIChat *)inChat;
/*!
* @brief Can the account send images inline within a chat?
diff -r ad85e7ac1b05 -r 47659145332e Frameworks/Adium Framework/Source/AIAccount.m
--- a/Frameworks/Adium Framework/Source/AIAccount.m Wed Oct 17 23:50:52 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIAccount.m Thu Oct 18 00:32:21 2012 +0200
@@ -929,18 +929,6 @@
inChat:inChat];
}
-/*!
- * @brief Allow the user to verify (or unverify) the identity being used for encryption in a chat
- *
- * It is an error to call this on a chat which is not currently encrypted.
- *
- * @param inChat The chat
- */
-- (void)promptToVerifyEncryptionIdentityInChat:(AIChat *)inChat
-{
- [adium.contentController promptToVerifyEncryptionIdentityInChat:inChat];
-}
-
#pragma mark Image sending
/*!
* @brief Can the account send images inline within a chat?
diff -r ad85e7ac1b05 -r 47659145332e Frameworks/Adium Framework/Source/AIContentControllerProtocol.h
--- a/Frameworks/Adium Framework/Source/AIContentControllerProtocol.h Wed Oct 17 23:50:52 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIContentControllerProtocol.h Thu Oct 18 00:32:21 2012 +0200
@@ -139,6 +139,8 @@
- (void)setEncryptor:(id<AdiumMessageEncryptor>)inEncryptor;
- (void)requestSecureOTRMessaging:(BOOL)inSecureMessaging inChat:(AIChat *)inChat;
- (void)promptToVerifyEncryptionIdentityInChat:(AIChat *)inChat;
+- (void)questionVerifyEncryptionIdentityInChat:(AIChat *)inChat;
+- (void)sharedVerifyEncryptionIdentityInChat:(AIChat *)inChat;
@end
diff -r ad85e7ac1b05 -r 47659145332e Plugins/Secure Messaging/ESSecureMessagingPlugin.h
--- a/Plugins/Secure Messaging/ESSecureMessagingPlugin.h Wed Oct 17 23:50:52 2012 +0200
+++ b/Plugins/Secure Messaging/ESSecureMessagingPlugin.h Thu Oct 18 00:32:21 2012 +0200
@@ -24,7 +24,10 @@
AISecureMessagingMenu_ShowDetails,
AISecureMessagingMenu_Verify,
AISecureMessagingMenu_Options,
- AISecureMessagingMenu_ShowAbout
+ AISecureMessagingMenu_ShowAbout,
+ AISecureMessagingMenu_VerifyManually,
+ AISecureMessagingMenu_VerifyQuestion,
+ AISecureMessagingMenu_VerifySharedSecret
} AISecureMessagingMenuTag;
@interface ESSecureMessagingPlugin : AIPlugin <AIChatObserver> {
diff -r ad85e7ac1b05 -r 47659145332e Plugins/Secure Messaging/ESSecureMessagingPlugin.m
--- a/Plugins/Secure Messaging/ESSecureMessagingPlugin.m Wed Oct 17 23:50:52 2012 +0200
+++ b/Plugins/Secure Messaging/ESSecureMessagingPlugin.m Thu Oct 18 00:32:21 2012 +0200
@@ -32,12 +32,16 @@
#import <Adium/AIAccount.h>
#import <Adium/AIChat.h>
#import <Adium/AIListContact.h>
+#import <Adium/AIContentControllerProtocol.h>
#define TITLE_MAKE_SECURE AILocalizedString(@"Initiate Encrypted OTR Chat",nil)
#define TITLE_MAKE_INSECURE AILocalizedString(@"Cancel Encrypted Chat",nil)
#define TITLE_SHOW_DETAILS [AILocalizedString(@"Show Details",nil) stringByAppendingEllipsis]
-#define TITLE_VERIFY [AILocalizedString(@"Verify",nil) stringByAppendingEllipsis]
-#define TITLE_ENCRYPTION_OPTIONS AILocalizedString(@"Encryption Settings",nil)
+#define TITLE_VERIFY AILocalizedString(@"Verify",nil)
+#define TITLE_VERIFY_MANUALLY [AILocalizedString(@"Manually",nil) stringByAppendingEllipsis]
+#define TITLE_VERIFY_SHARED_SECRET [AILocalizedString(@"Using Shared Secret",nil) stringByAppendingEllipsis]
+#define TITLE_VERIFY_SECRET_QUESTION [AILocalizedString(@"Using Secret Question",nil) stringByAppendingEllipsis]
+#define TITLE_ENCRYPTION_OPTIONS AILocalizedString(@"Encryption Settings",nil)
#define TITLE_ABOUT_ENCRYPTION [AILocalizedString(@"About Encryption",nil) stringByAppendingEllipsis]
#define TITLE_ENCRYPTION AILocalizedString(@"Encryption",nil)
@@ -313,7 +317,21 @@
{
AIChat *chat = adium.interfaceController.activeChat;
- [chat.account promptToVerifyEncryptionIdentityInChat:chat];
+ [adium.contentController promptToVerifyEncryptionIdentityInChat:chat];
+}
+
+- (IBAction)verifyQuestion:(id)sender
+{
+ AIChat *chat = adium.interfaceController.activeChat;
+
+ [adium.contentController questionVerifyEncryptionIdentityInChat:chat];
+}
+
+- (IBAction)verifyShared:(id)sender
+{
+ AIChat *chat = adium.interfaceController.activeChat;
+
+ [adium.contentController sharedVerifyEncryptionIdentityInChat:chat];
}
- (IBAction)showAbout:(id)sender
@@ -416,7 +434,9 @@
break;
case AISecureMessagingMenu_ShowDetails:
- case AISecureMessagingMenu_Verify:
+ case AISecureMessagingMenu_VerifyManually:
+ case AISecureMessagingMenu_VerifyQuestion:
+ case AISecureMessagingMenu_VerifySharedSecret:
//Only enable show details if the chat is secure
return [chat isSecure];
break;
@@ -458,11 +478,38 @@
[_secureMessagingMenu addItem:item];
item = [[[NSMenuItem alloc] initWithTitle:TITLE_VERIFY
+ target:nil
+ action:nil
+ keyEquivalent:@""] autorelease];
+ [item setTag:AISecureMessagingMenu_Verify];
+ NSMenu *verifySubmenu = [[NSMenu allocWithZone:[NSMenu menuZone]] init];
+ [item setSubmenu:verifySubmenu];
+
+ [_secureMessagingMenu addItem:item];
+
+ item = [[[NSMenuItem alloc] initWithTitle:TITLE_VERIFY_MANUALLY
target:self
action:@selector(verify:)
keyEquivalent:@""] autorelease];
- [item setTag:AISecureMessagingMenu_Verify];
- [_secureMessagingMenu addItem:item];
+ [item setTag:AISecureMessagingMenu_VerifyManually];
+
+ [verifySubmenu addItem:item];
+
+ item = [[[NSMenuItem alloc] initWithTitle:TITLE_VERIFY_SECRET_QUESTION
+ target:self
+ action:@selector(verifyQuestion:)
+ keyEquivalent:@""] autorelease];
+ [item setTag:AISecureMessagingMenu_VerifyQuestion];
+
+ [verifySubmenu addItem:item];
+
+ item = [[[NSMenuItem alloc] initWithTitle:TITLE_VERIFY_SHARED_SECRET
+ target:self
+ action:@selector(verifyShared:)
+ keyEquivalent:@""] autorelease];
+ [item setTag:AISecureMessagingMenu_VerifySharedSecret];
+
+ [verifySubmenu addItem:item];
item = [[[NSMenuItem alloc] initWithTitle:TITLE_ENCRYPTION_OPTIONS
target:nil
diff -r ad85e7ac1b05 -r 47659145332e Resources/AIOTRSMPSecretAnswerWindowController.xib
--- a/Resources/AIOTRSMPSecretAnswerWindowController.xib Wed Oct 17 23:50:52 2012 +0200
+++ b/Resources/AIOTRSMPSecretAnswerWindowController.xib Thu Oct 18 00:32:21 2012 +0200
@@ -52,17 +52,17 @@
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
- <object class="NSTextField" id="837886627">
+ <object class="NSTextField" id="126593570">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 226}, {480, 34}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="429430086"/>
+ <reference key="NSNextKeyView" ref="683836775"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSAntiCompressionPriority">{250, 750}</string>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="774069600">
+ <object class="NSTextFieldCell" key="NSCell" id="517677039">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">272760832</int>
<string key="NSContents">%@ asks you to answer the following secret question to confirm your identity:</string>
@@ -72,21 +72,21 @@
<int key="NSfFlags">3100</int>
</object>
<string key="NSCellIdentifier">_NS:9</string>
- <reference key="NSControlView" ref="837886627"/>
- <object class="NSColor" key="NSBackgroundColor" id="477747429">
+ <reference key="NSControlView" ref="126593570"/>
+ <object class="NSColor" key="NSBackgroundColor" id="787472392">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlColor</string>
- <object class="NSColor" key="NSColor" id="147743138">
+ <object class="NSColor" key="NSColor" id="496301184">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
</object>
</object>
- <object class="NSColor" key="NSTextColor" id="558625577">
+ <object class="NSColor" key="NSTextColor" id="786994808">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlTextColor</string>
- <object class="NSColor" key="NSColor" id="37775174">
+ <object class="NSColor" key="NSColor" id="382288645">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MAA</bytes>
</object>
@@ -95,30 +95,30 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSControlAutosetMaxLayoutWidth">YES</bool>
</object>
- <object class="NSTextField" id="382632265">
+ <object class="NSTextField" id="481576503">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">300</int>
- <string key="NSFrame">{{17, 132}, {87, 14}}</string>
+ <string key="NSFrame">{{17, 132}, {480, 14}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="162055316"/>
+ <reference key="NSNextKeyView" ref="352712109"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSAntiCompressionPriority">{250, 750}</string>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="578022018">
+ <object class="NSTextFieldCell" key="NSCell" id="757236960">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">272760832</int>
<string key="NSContents">Your answer:</string>
<reference key="NSSupport" ref="26"/>
<string key="NSCellIdentifier">_NS:9</string>
- <reference key="NSControlView" ref="382632265"/>
- <reference key="NSBackgroundColor" ref="477747429"/>
- <reference key="NSTextColor" ref="558625577"/>
+ <reference key="NSControlView" ref="481576503"/>
+ <reference key="NSBackgroundColor" ref="787472392"/>
+ <reference key="NSTextColor" ref="786994808"/>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSControlAutosetMaxLayoutWidth">YES</bool>
</object>
- <object class="NSButton" id="172806535">
+ <object class="NSButton" id="1682760">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{409, 13}, {91, 32}}</string>
@@ -127,20 +127,20 @@
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="132894834">
+ <object class="NSButtonCell" key="NSCell" id="1034106210">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">OK</string>
- <object class="NSFont" key="NSSupport" id="238409996">
+ <object class="NSFont" key="NSSupport" id="315292737">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">16</int>
</object>
<string key="NSCellIdentifier">_NS:9</string>
- <reference key="NSControlView" ref="172806535"/>
+ <reference key="NSControlView" ref="1682760"/>
<int key="NSButtonFlags">-2034876416</int>
<int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="238409996"/>
+ <reference key="NSAlternateImage" ref="315292737"/>
<string key="NSAlternateContents"/>
<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
<int key="NSPeriodicDelay">200</int>
@@ -148,25 +148,25 @@
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
- <object class="NSButton" id="383682548">
+ <object class="NSButton" id="348455558">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{318, 13}, {91, 32}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="172806535"/>
+ <reference key="NSNextKeyView" ref="1682760"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="129755863">
+ <object class="NSButtonCell" key="NSCell" id="127771989">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Cancel</string>
- <reference key="NSSupport" ref="238409996"/>
+ <reference key="NSSupport" ref="315292737"/>
<string key="NSCellIdentifier">_NS:9</string>
- <reference key="NSControlView" ref="383682548"/>
+ <reference key="NSControlView" ref="348455558"/>
<int key="NSButtonFlags">-2034876416</int>
<int key="NSButtonFlags2">1</int>
- <reference key="NSAlternateImage" ref="238409996"/>
+ <reference key="NSAlternateImage" ref="315292737"/>
<string key="NSAlternateContents"/>
<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
<int key="NSPeriodicDelay">200</int>
@@ -174,23 +174,42 @@
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
- <object class="NSScrollView" id="429430086">
+ <object class="NSScrollView" id="683836775">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
- <object class="NSClipView" id="165275199">
- <reference key="NSNextResponder" ref="429430086"/>
+ <object class="NSClipView" id="137003467">
+ <reference key="NSNextResponder" ref="683836775"/>
<int key="NSvFlags">2304</int>
<array class="NSMutableArray" key="NSSubviews">
- <object class="NSTextView" id="46351932">
- <reference key="NSNextResponder" ref="165275199"/>
+ <object class="NSTextView" id="740472288">
+ <reference key="NSNextResponder" ref="137003467"/>
<int key="NSvFlags">2322</int>
+ <set class="NSMutableSet" key="NSDragTypes">
+ <string>Apple HTML pasteboard type</string>
+ <string>Apple PDF pasteboard type</string>
+ <string>Apple PICT pasteboard type</string>
+ <string>Apple PNG pasteboard type</string>
+ <string>Apple URL pasteboard type</string>
+ <string>CorePasteboardFlavorType 0x6D6F6F76</string>
+ <string>NSColor pasteboard type</string>
+ <string>NSFilenamesPboardType</string>
+ <string>NSStringPboardType</string>
+ <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
+ <string>NeXT RTFD pasteboard type</string>
+ <string>NeXT Rich Text Format v1.0 pasteboard type</string>
+ <string>NeXT TIFF v4.0 pasteboard type</string>
+ <string>NeXT font pasteboard type</string>
+ <string>NeXT ruler pasteboard type</string>
+ <string>WebURLsWithTitlesPboardType</string>
+ <string>public.url</string>
+ </set>
<string key="NSFrameSize">{457, 62}</string>
- <reference key="NSSuperview" ref="165275199"/>
+ <reference key="NSSuperview" ref="137003467"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="145085447"/>
+ <reference key="NSNextKeyView" ref="234578328"/>
<string key="NSReuseIdentifierKey">_NS:13</string>
- <object class="NSTextContainer" key="NSTextContainer" id="536284811">
+ <object class="NSTextContainer" key="NSTextContainer" id="887900834">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
<object class="NSMutableString" key="NSString">
@@ -199,44 +218,44 @@
<nil key="NSDelegate"/>
</object>
<array class="NSMutableArray" key="NSTextContainers">
- <reference ref="536284811"/>
+ <reference ref="887900834"/>
</array>
<int key="NSLMFlags">166</int>
<nil key="NSDelegate"/>
</object>
- <reference key="NSTextView" ref="46351932"/>
+ <reference key="NSTextView" ref="740472288"/>
<double key="NSWidth">457</double>
<int key="NSTCFlags">1</int>
</object>
<object class="NSTextViewSharedData" key="NSSharedData">
- <int key="NSFlags">11521</int>
+ <int key="NSFlags">11523</int>
<int key="NSTextCheckingTypes">0</int>
<nil key="NSMarkedAttributes"/>
- <object class="NSColor" key="NSBackgroundColor" id="334593264">
+ <object class="NSColor" key="NSBackgroundColor" id="227845268">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
<dictionary key="NSSelectedAttributes">
- <object class="NSColor" key="NSBackgroundColor" id="714345531">
+ <object class="NSColor" key="NSBackgroundColor" id="280566794">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">selectedTextBackgroundColor</string>
- <reference key="NSColor" ref="147743138"/>
+ <reference key="NSColor" ref="496301184"/>
</object>
- <object class="NSColor" key="NSColor" id="329671286">
+ <object class="NSColor" key="NSColor" id="473280375">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">selectedTextColor</string>
- <reference key="NSColor" ref="37775174"/>
+ <reference key="NSColor" ref="382288645"/>
</object>
</dictionary>
- <reference key="NSInsertionColor" ref="37775174"/>
+ <reference key="NSInsertionColor" ref="382288645"/>
<dictionary key="NSLinkAttributes">
- <object class="NSColor" key="NSColor" id="898913896">
+ <object class="NSColor" key="NSColor" id="676512003">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MCAwIDEAA</bytes>
</object>
- <object class="NSCursor" key="NSCursor" id="1003110455">
+ <object class="NSCursor" key="NSCursor" id="555782294">
<string key="NSHotSpot">{8, -8}</string>
<int key="NSCursorType">13</int>
</object>
@@ -252,12 +271,12 @@
</object>
</array>
<string key="NSFrame">{{1, 1}, {457, 62}}</string>
- <reference key="NSSuperview" ref="429430086"/>
+ <reference key="NSSuperview" ref="683836775"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="46351932"/>
+ <reference key="NSNextKeyView" ref="740472288"/>
<string key="NSReuseIdentifierKey">_NS:11</string>
- <reference key="NSDocView" ref="46351932"/>
- <reference key="NSBGColor" ref="334593264"/>
+ <reference key="NSDocView" ref="740472288"/>
+ <reference key="NSBGColor" ref="227845268"/>
<object class="NSCursor" key="NSCursor">
<string key="NSHotSpot">{4, 5}</string>
<object class="NSImage" key="NSImage">
@@ -405,7 +424,7 @@
</object>
</array>
</array>
- <object class="NSColor" key="NSColor" id="550795022">
+ <object class="NSColor" key="NSColor" id="591829695">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
</object>
@@ -413,31 +432,31 @@
</object>
<int key="NScvFlags">4</int>
</object>
- <object class="NSScroller" id="145085447">
- <reference key="NSNextResponder" ref="429430086"/>
+ <object class="NSScroller" id="234578328">
+ <reference key="NSNextResponder" ref="683836775"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{458, 1}, {15, 62}}</string>
- <reference key="NSSuperview" ref="429430086"/>
+ <reference key="NSSuperview" ref="683836775"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="382632265"/>
+ <reference key="NSNextKeyView" ref="481576503"/>
<string key="NSReuseIdentifierKey">_NS:83</string>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- <reference key="NSTarget" ref="429430086"/>
+ <reference key="NSTarget" ref="683836775"/>
<string key="NSAction">_doScroller:</string>
<double key="NSCurValue">1</double>
<double key="NSPercent">0.85256409645080566</double>
</object>
- <object class="NSScroller" id="65177492">
- <reference key="NSNextResponder" ref="429430086"/>
+ <object class="NSScroller" id="344476855">
+ <reference key="NSNextResponder" ref="683836775"/>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
- <reference key="NSSuperview" ref="429430086"/>
+ <reference key="NSSuperview" ref="683836775"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="165275199"/>
+ <reference key="NSNextKeyView" ref="137003467"/>
<string key="NSReuseIdentifierKey">_NS:33</string>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int>
- <reference key="NSTarget" ref="429430086"/>
+ <reference key="NSTarget" ref="683836775"/>
<string key="NSAction">_doScroller:</string>
<double key="NSCurValue">1</double>
<double key="NSPercent">0.94565218687057495</double>
@@ -446,26 +465,26 @@
<string key="NSFrame">{{20, 154}, {474, 64}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="65177492"/>
+ <reference key="NSNextKeyView" ref="344476855"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<int key="NSsFlags">133138</int>
- <reference key="NSVScroller" ref="145085447"/>
- <reference key="NSHScroller" ref="65177492"/>
- <reference key="NSContentView" ref="165275199"/>
+ <reference key="NSVScroller" ref="234578328"/>
+ <reference key="NSHScroller" ref="344476855"/>
+ <reference key="NSContentView" ref="137003467"/>
<double key="NSMinMagnification">0.25</double>
<double key="NSMaxMagnification">4</double>
<double key="NSMagnification">1</double>
</object>
- <object class="NSScrollView" id="162055316">
+ <object class="NSScrollView" id="352712109">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
- <object class="NSClipView" id="913030572">
- <reference key="NSNextResponder" ref="162055316"/>
+ <object class="NSClipView" id="406928026">
+ <reference key="NSNextResponder" ref="352712109"/>
<int key="NSvFlags">2304</int>
<array class="NSMutableArray" key="NSSubviews">
- <object class="NSTextView" id="146923924">
- <reference key="NSNextResponder" ref="913030572"/>
+ <object class="NSTextView" id="743970013">
+ <reference key="NSNextResponder" ref="406928026"/>
<int key="NSvFlags">2322</int>
<set class="NSMutableSet" key="NSDragTypes">
<string>Apple HTML pasteboard type</string>
@@ -487,11 +506,11 @@
<string>public.url</string>
</set>
<string key="NSFrameSize">{457, 61}</string>
- <reference key="NSSuperview" ref="913030572"/>
+ <reference key="NSSuperview" ref="406928026"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="474285222"/>
+ <reference key="NSNextKeyView" ref="180038208"/>
<string key="NSReuseIdentifierKey">_NS:13</string>
- <object class="NSTextContainer" key="NSTextContainer" id="450854443">
+ <object class="NSTextContainer" key="NSTextContainer" id="205784424">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
<object class="NSMutableString" key="NSString">
@@ -500,12 +519,12 @@
<nil key="NSDelegate"/>
</object>
<array class="NSMutableArray" key="NSTextContainers">
- <reference ref="450854443"/>
+ <reference ref="205784424"/>
</array>
<int key="NSLMFlags">166</int>
<nil key="NSDelegate"/>
</object>
- <reference key="NSTextView" ref="146923924"/>
+ <reference key="NSTextView" ref="743970013"/>
<double key="NSWidth">457</double>
<int key="NSTCFlags">1</int>
</object>
@@ -513,15 +532,15 @@
<int key="NSFlags">67120387</int>
<int key="NSTextCheckingTypes">0</int>
<nil key="NSMarkedAttributes"/>
- <reference key="NSBackgroundColor" ref="334593264"/>
+ <reference key="NSBackgroundColor" ref="227845268"/>
<dictionary key="NSSelectedAttributes">
- <reference key="NSBackgroundColor" ref="714345531"/>
- <reference key="NSColor" ref="329671286"/>
+ <reference key="NSBackgroundColor" ref="280566794"/>
+ <reference key="NSColor" ref="473280375"/>
</dictionary>
- <reference key="NSInsertionColor" ref="37775174"/>
+ <reference key="NSInsertionColor" ref="382288645"/>
<dictionary key="NSLinkAttributes">
- <reference key="NSColor" ref="898913896"/>
- <reference key="NSCursor" ref="1003110455"/>
+ <reference key="NSColor" ref="676512003"/>
+ <reference key="NSCursor" ref="555782294"/>
<integer value="1" key="NSUnderline"/>
</dictionary>
<nil key="NSDefaultParagraphStyle"/>
@@ -534,12 +553,12 @@
</object>
</array>
<string key="NSFrame">{{1, 1}, {457, 61}}</string>
- <reference key="NSSuperview" ref="162055316"/>
+ <reference key="NSSuperview" ref="352712109"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="146923924"/>
+ <reference key="NSNextKeyView" ref="743970013"/>
<string key="NSReuseIdentifierKey">_NS:11</string>
- <reference key="NSDocView" ref="146923924"/>
- <reference key="NSBGColor" ref="334593264"/>
+ <reference key="NSDocView" ref="743970013"/>
+ <reference key="NSBGColor" ref="227845268"/>
<object class="NSCursor" key="NSCursor">
<string key="NSHotSpot">{4, 5}</string>
<object class="NSImage" key="NSImage">
@@ -687,36 +706,36 @@
</object>
</array>
</array>
- <reference key="NSColor" ref="550795022"/>
+ <reference key="NSColor" ref="591829695"/>
</object>
</object>
<int key="NScvFlags">4</int>
</object>
- <object class="NSScroller" id="474285222">
- <reference key="NSNextResponder" ref="162055316"/>
+ <object class="NSScroller" id="180038208">
+ <reference key="NSNextResponder" ref="352712109"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{458, 1}, {15, 61}}</string>
- <reference key="NSSuperview" ref="162055316"/>
+ <reference key="NSSuperview" ref="352712109"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="383682548"/>
+ <reference key="NSNextKeyView" ref="348455558"/>
<string key="NSReuseIdentifierKey">_NS:83</string>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- <reference key="NSTarget" ref="162055316"/>
+ <reference key="NSTarget" ref="352712109"/>
<string key="NSAction">_doScroller:</string>
<double key="NSCurValue">1</double>
<double key="NSPercent">0.85256409645080566</double>
</object>
- <object class="NSScroller" id="824381539">
- <reference key="NSNextResponder" ref="162055316"/>
+ <object class="NSScroller" id="1016952571">
+ <reference key="NSNextResponder" ref="352712109"/>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
- <reference key="NSSuperview" ref="162055316"/>
+ <reference key="NSSuperview" ref="352712109"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="913030572"/>
+ <reference key="NSNextKeyView" ref="406928026"/>
<string key="NSReuseIdentifierKey">_NS:33</string>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int>
- <reference key="NSTarget" ref="162055316"/>
+ <reference key="NSTarget" ref="352712109"/>
<string key="NSAction">_doScroller:</string>
<double key="NSCurValue">1</double>
<double key="NSPercent">0.94565218687057495</double>
@@ -725,12 +744,12 @@
<string key="NSFrame">{{20, 61}, {474, 63}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="824381539"/>
+ <reference key="NSNextKeyView" ref="1016952571"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<int key="NSsFlags">133138</int>
- <reference key="NSVScroller" ref="474285222"/>
- <reference key="NSHScroller" ref="824381539"/>
- <reference key="NSContentView" ref="913030572"/>
+ <reference key="NSVScroller" ref="180038208"/>
+ <reference key="NSHScroller" ref="1016952571"/>
+ <reference key="NSContentView" ref="406928026"/>
<double key="NSMinMagnification">0.25</double>
<double key="NSMaxMagnification">4</double>
<double key="NSMagnification">1</double>
@@ -739,7 +758,7 @@
<string key="NSFrameSize">{514, 280}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="837886627"/>
+ <reference key="NSNextKeyView" ref="126593570"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
@@ -752,7 +771,7 @@
<object class="IBOutletConnection" key="connection">
<string key="label">label_intro</string>
<reference key="source" ref="1001"/>
- <reference key="destination" ref="837886627"/>
+ <reference key="destination" ref="126593570"/>
</object>
<int key="connectionID">19</int>
</object>
@@ -760,7 +779,7 @@
<object class="IBActionConnection" key="connection">
<string key="label">cancel:</string>
<reference key="source" ref="1001"/>
- <reference key="destination" ref="383682548"/>
+ <reference key="destination" ref="348455558"/>
</object>
<int key="connectionID">22</int>
</object>
@@ -768,7 +787,7 @@
<object class="IBActionConnection" key="connection">
<string key="label">okay:</string>
<reference key="source" ref="1001"/>
- <reference key="destination" ref="172806535"/>
+ <reference key="destination" ref="1682760"/>
</object>
<int key="connectionID">23</int>
</object>
@@ -776,7 +795,7 @@
<object class="IBOutletConnection" key="connection">
<string key="label">field_question</string>
<reference key="source" ref="1001"/>
- <reference key="destination" ref="46351932"/>
+ <reference key="destination" ref="740472288"/>
</object>
<int key="connectionID">40</int>
</object>
@@ -784,10 +803,18 @@
<object class="IBOutletConnection" key="connection">
<string key="label">field_answer</string>
<reference key="source" ref="1001"/>
- <reference key="destination" ref="146923924"/>
+ <reference key="destination" ref="743970013"/>
</object>
<int key="connectionID">41</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">label_answer</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="481576503"/>
+ </object>
+ <int key="connectionID">42</int>
+ </object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
@@ -827,116 +854,116 @@
<int key="objectID">2</int>
<reference key="object" ref="1006"/>
<array class="NSMutableArray" key="children">
- <reference ref="837886627"/>
- <reference ref="172806535"/>
- <reference ref="383682548"/>
- <reference ref="429430086"/>
- <reference ref="162055316"/>
- <reference ref="382632265"/>
+ <reference ref="126593570"/>
+ <reference ref="1682760"/>
+ <reference ref="348455558"/>
+ <reference ref="683836775"/>
+ <reference ref="352712109"/>
+ <reference ref="481576503"/>
</array>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5</int>
- <reference key="object" ref="837886627"/>
+ <reference key="object" ref="126593570"/>
<array class="NSMutableArray" key="children">
- <reference ref="774069600"/>
+ <reference ref="517677039"/>
</array>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">6</int>
- <reference key="object" ref="774069600"/>
- <reference key="parent" ref="837886627"/>
+ <reference key="object" ref="517677039"/>
+ <reference key="parent" ref="126593570"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">9</int>
- <reference key="object" ref="382632265"/>
+ <reference key="object" ref="481576503"/>
<array class="NSMutableArray" key="children">
- <reference ref="578022018"/>
+ <reference ref="757236960"/>
</array>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">10</int>
- <reference key="object" ref="578022018"/>
- <reference key="parent" ref="382632265"/>
+ <reference key="object" ref="757236960"/>
+ <reference key="parent" ref="481576503"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">13</int>
- <reference key="object" ref="172806535"/>
+ <reference key="object" ref="1682760"/>
<array class="NSMutableArray" key="children">
- <reference ref="132894834"/>
+ <reference ref="1034106210"/>
</array>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">14</int>
- <reference key="object" ref="132894834"/>
- <reference key="parent" ref="172806535"/>
+ <reference key="object" ref="1034106210"/>
+ <reference key="parent" ref="1682760"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">17</int>
- <reference key="object" ref="383682548"/>
+ <reference key="object" ref="348455558"/>
<array class="NSMutableArray" key="children">
- <reference ref="129755863"/>
+ <reference ref="127771989"/>
</array>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">18</int>
- <reference key="object" ref="129755863"/>
- <reference key="parent" ref="383682548"/>
+ <reference key="object" ref="127771989"/>
+ <reference key="parent" ref="348455558"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">32</int>
- <reference key="object" ref="429430086"/>
+ <reference key="object" ref="683836775"/>
<array class="NSMutableArray" key="children">
- <reference ref="46351932"/>
- <reference ref="65177492"/>
- <reference ref="145085447"/>
+ <reference ref="740472288"/>
+ <reference ref="344476855"/>
+ <reference ref="234578328"/>
</array>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">33</int>
- <reference key="object" ref="46351932"/>
- <reference key="parent" ref="429430086"/>
+ <reference key="object" ref="740472288"/>
+ <reference key="parent" ref="683836775"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">34</int>
- <reference key="object" ref="65177492"/>
- <reference key="parent" ref="429430086"/>
+ <reference key="object" ref="344476855"/>
+ <reference key="parent" ref="683836775"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">35</int>
- <reference key="object" ref="145085447"/>
- <reference key="parent" ref="429430086"/>
+ <reference key="object" ref="234578328"/>
+ <reference key="parent" ref="683836775"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">36</int>
- <reference key="object" ref="162055316"/>
+ <reference key="object" ref="352712109"/>
<array class="NSMutableArray" key="children">
- <reference ref="474285222"/>
- <reference ref="824381539"/>
- <reference ref="146923924"/>
+ <reference ref="180038208"/>
+ <reference ref="1016952571"/>
+ <reference ref="743970013"/>
</array>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">37</int>
- <reference key="object" ref="474285222"/>
- <reference key="parent" ref="162055316"/>
+ <reference key="object" ref="180038208"/>
+ <reference key="parent" ref="352712109"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">38</int>
- <reference key="object" ref="824381539"/>
- <reference key="parent" ref="162055316"/>
+ <reference key="object" ref="1016952571"/>
+ <reference key="parent" ref="352712109"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">39</int>
- <reference key="object" ref="146923924"/>
- <reference key="parent" ref="162055316"/>
+ <reference key="object" ref="743970013"/>
+ <reference key="parent" ref="352712109"/>
</object>
</array>
</object>
@@ -973,7 +1000,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">41</int>
+ <int key="maxID">42</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1029,6 +1056,7 @@
<dictionary class="NSMutableDictionary" key="outlets">
<string key="field_answer">NSTextView</string>
<string key="field_question">NSTextView</string>
+ <string key="label_answer">NSTextField</string>
<string key="label_intro">NSTextField</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -1040,6 +1068,10 @@
<string key="name">field_question</string>
<string key="candidateClassName">NSTextView</string>
</object>
+ <object class="IBToOneOutletInfo" key="label_answer">
+ <string key="name">label_answer</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
<object class="IBToOneOutletInfo" key="label_intro">
<string key="name">label_intro</string>
<string key="candidateClassName">NSTextField</string>
diff -r ad85e7ac1b05 -r 47659145332e Source/AIContentController.m
--- a/Source/AIContentController.m Wed Oct 17 23:50:52 2012 +0200
+++ b/Source/AIContentController.m Thu Oct 18 00:32:21 2012 +0200
@@ -807,6 +807,16 @@
[adiumEncryptor promptToVerifyEncryptionIdentityInChat:inChat];
}
+- (void)questionVerifyEncryptionIdentityInChat:(AIChat *)inChat
+{
+ [adiumEncryptor questionVerifyEncryptionIdentityInChat:inChat];
+}
+
+- (void)sharedVerifyEncryptionIdentityInChat:(AIChat *)inChat
+{
+ [adiumEncryptor sharedVerifyEncryptionIdentityInChat:inChat];
+}
+
#pragma mark -
/*!
* @brief Is the passed chat currently receiving content?
diff -r ad85e7ac1b05 -r 47659145332e Source/AIOTRSMPSecretAnswerWindowController.h
--- a/Source/AIOTRSMPSecretAnswerWindowController.h Wed Oct 17 23:50:52 2012 +0200
+++ b/Source/AIOTRSMPSecretAnswerWindowController.h Thu Oct 18 00:32:21 2012 +0200
@@ -12,16 +12,18 @@
@interface AIOTRSMPSecretAnswerWindowController : AIWindowController {
IBOutlet NSTextField *label_intro;
+ IBOutlet NSTextField *label_answer;
IBOutlet NSTextView *field_question;
IBOutlet NSTextView *field_answer;
+ BOOL isInitiator;
NSString *secretQuestion;
AIListContact *contact;
- void(^handler)(NSString *answer);
+ void(^handler)(NSString *answer, NSString *question);
}
- (IBAction)okay:(id)sender;
- (IBAction)cancel:(id)sender;
-- (id)initWithQuestion:(NSString *)inQuestion from:(AIListContact *)inContact completionHandler:(void(^)(NSString *answer))inHandler;
+- (id)initWithQuestion:(NSString *)inQuestion from:(AIListContact *)inContact completionHandler:(void(^)(NSString *answer, NSString *question))inHandler isInitiator:(BOOL)inInitiator;
@end
diff -r ad85e7ac1b05 -r 47659145332e Source/AIOTRSMPSecretAnswerWindowController.m
--- a/Source/AIOTRSMPSecretAnswerWindowController.m Wed Oct 17 23:50:52 2012 +0200
+++ b/Source/AIOTRSMPSecretAnswerWindowController.m Thu Oct 18 00:32:21 2012 +0200
@@ -10,12 +10,13 @@
@implementation AIOTRSMPSecretAnswerWindowController
-- (id)initWithQuestion:(NSString *)inQuestion from:(AIListContact *)inContact completionHandler:(void(^)(NSString *answer))inHandler
+- (id)initWithQuestion:(NSString *)inQuestion from:(AIListContact *)inContact completionHandler:(void(^)(NSString *answer, NSString *question))inHandler isInitiator:(BOOL)inInitiator
{
if (self = [super initWithWindowNibName:@"AIOTRSMPSecretAnswerWindowController"]) {
secretQuestion = [inQuestion retain];
contact = [inContact retain];
handler = Block_copy(inHandler);
+ isInitiator = inInitiator;
}
return self;
@@ -25,6 +26,7 @@
{
[secretQuestion release];
[contact release];
+ Block_release(handler);
[super dealloc];
}
@@ -33,16 +35,22 @@
{
[super windowDidLoad];
- [label_intro setStringValue:[NSString stringWithFormat:AILocalizedString(@"%@ asks you to answer the following secret question to confirm your identity:", nil), contact.UID]];
-
- NSAttributedString *question = [[[NSAttributedString alloc] initWithString:secretQuestion ?: @""] autorelease];
-
- [[field_question textStorage] setAttributedString:question];
+ if (isInitiator) {
+ [label_intro setStringValue:[NSString stringWithFormat:AILocalizedString(@"Enter a question to use to verify %@'s identity:", nil), contact.UID]];
+ [label_answer setStringValue:AILocalizedString(@"Correct answer:", nil)];
+ } else {
+ [label_intro setStringValue:[NSString stringWithFormat:AILocalizedString(@"%@ asks you to answer the following secret question to confirm your identity:", nil), contact.UID]];
+
+ NSAttributedString *question = [[[NSAttributedString alloc] initWithString:secretQuestion ?: @""] autorelease];
+
+ [[field_question textStorage] setAttributedString:question];
+ [field_question setEditable:NO];
+ }
}
- (IBAction)okay:(id)sender
{
- handler([[field_answer textStorage] string]);
+ handler([[field_answer textStorage] string], [[field_question textStorage] string]);
[self close];
[self release];
More information about the commits
mailing list