From bd37a26ddbc13312b2f4cea5616065e25a161f52 Mon Sep 17 00:00:00 2001
From: GRMrGecko <GRMrGecko@gmail.com>
Date: Sat, 26 Mar 2011 21:15:39 -0500
Subject: [PATCH] Changed iPhone photo size to 60 as 120 was making scrolling
 slow. Added 2 step verification to the account setup.

---
 Classes/VoiceBase/AddressBook/MGMContactsProtocol.m | 2 +-
 Classes/VoiceMac/MGMAccountSetup.h                  | 3 ++-
 Classes/VoiceMac/MGMAccountSetup.m                  | 9 +++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Classes/VoiceBase/AddressBook/MGMContactsProtocol.m b/Classes/VoiceBase/AddressBook/MGMContactsProtocol.m
index e783f9a..6ae9707 100644
--- a/Classes/VoiceBase/AddressBook/MGMContactsProtocol.m
+++ b/Classes/VoiceBase/AddressBook/MGMContactsProtocol.m
@@ -34,7 +34,7 @@ NSString * const MGMCContactID = @"contactid";
 NSString * const MGMCGoogleContactsUser = @"MGMCGoogleContactsUser";
 
 #if TARGET_OS_IPHONE
-const float MGMABPhotoSizePX = 120.0;
+const float MGMABPhotoSizePX = 60.0;
 #else
 const float MGMABPhotoSizePX = 64.0;
 #endif
\ No newline at end of file
diff --git a/Classes/VoiceMac/MGMAccountSetup.h b/Classes/VoiceMac/MGMAccountSetup.h
index 682cb65..7b13d61 100644
--- a/Classes/VoiceMac/MGMAccountSetup.h
+++ b/Classes/VoiceMac/MGMAccountSetup.h
@@ -19,7 +19,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-@class WebView, MGMUser, MGMInstance, MGMURLConnectionManager, MGMSIPAccount;
+@class WebView, MGMUser, MGMInstance, MGMVoiceVerify, MGMURLConnectionManager, MGMSIPAccount;
 
 extern NSString * const MGMSGoogleVoice;
 extern NSString * const MGMSGoogleContacts;
@@ -68,6 +68,7 @@ extern NSString * const MGMSIPDefaultDomain;
 	IBOutlet NSTextField *S7StatusField;
 	MGMUser *S7CheckUser;
 	MGMInstance *S7CheckInstance;
+	MGMVoiceVerify *S7VerifyWindow;
 	MGMURLConnectionManager *S7ConnectionManager;
 #if MGMSIPENABLED
 	MGMSIPAccount *S7CheckSIPAccount;
diff --git a/Classes/VoiceMac/MGMAccountSetup.m b/Classes/VoiceMac/MGMAccountSetup.m
index 919c499..f0ea23d 100644
--- a/Classes/VoiceMac/MGMAccountSetup.m
+++ b/Classes/VoiceMac/MGMAccountSetup.m
@@ -19,6 +19,7 @@
 
 #import "MGMAccountSetup.h"
 #import "MGMVoiceUser.h"
+#import "MGMVoiceVerify.h"
 #import "MGMSIPUser.h"
 #import <VoiceBase/VoiceBase.h>
 #import <MGMUsers/MGMUsers.h>
@@ -326,6 +327,8 @@ NSString * const MGMSIPDefaultDomain = @"proxy01.sipphone.com";
 	S7CheckInstance = [[MGMInstance instanceWithUser:S7CheckUser delegate:self isCheck:YES] retain];
 }
 - (void)loginError:(NSError *)theError {
+	[S7VerifyWindow release];
+	S7VerifyWindow = nil;
 	[S7CheckUser remove];
 	[S7CheckUser release];
 	S7CheckUser = nil;
@@ -336,7 +339,13 @@ NSString * const MGMSIPDefaultDomain = @"proxy01.sipphone.com";
 	step = 8;
 	[self displayStep];
 }
+- (void)loginVerificationRequested {
+	[S7VerifyWindow release];
+	S7VerifyWindow = [[MGMVoiceVerify verifyWithInstance:S7CheckInstance] retain];
+}
 - (void)loginSuccessful {
+	[S7VerifyWindow release];
+	S7VerifyWindow = nil;
 	if (S7CheckUser!=nil) {
 		[accountsCreated addObject:S7CheckUser];
 		MGMUser *contactsUser = [MGMUser createUserWithName:[S4EmailField stringValue] password:[S4PasswordField stringValue]];