Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui

Classes/CallDelegate.m

@@ -1,68 +0,0 @@
-/* LinphoneManager.h
- *
- * Copyright (C) 2011  Belledonne Comunications, Grenoble, France
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or   
- *  (at your option) any later version.                                 
- *                                                                      
- *  This program is distributed in the hope that it will be useful,     
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of      
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the       
- *  GNU General Public License for more details.                
- *                                                                      
- *  You should have received a copy of the GNU General Public License   
- *  along with this program; if not, write to the Free Software         
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#import "CallDelegate.h"
-#import "Utils.h"
-
-@implementation CallDelegate
-
-@synthesize eventType;
-@synthesize call;
-@synthesize delegate;
-@synthesize timeout;
-
--(void) actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger)buttonIndex {
-    if (timeout) {
-        [timeout invalidate];
-        timeout = nil;
-    }
-    if (eventType == CD_UNDEFINED) {
-        [LinphoneLogger logc:LinphoneLoggerError format:"Incorrect usage of CallDelegate/ActionSheet: eventType must be set"];
-    }
-    [delegate actionSheet:actionSheet ofType:eventType clickedButtonAtIndex:buttonIndex withUserDatas:call];
-}
-
--(void) actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger)buttonIndex {
-	
-		
-    if (timeout) {
-        [timeout invalidate];
-        timeout = nil;
-    }
-	if (buttonIndex != actionSheet.cancelButtonIndex) return;
-	
-    if (eventType == CD_UNDEFINED) {
-        [LinphoneLogger logc:LinphoneLoggerError format:"Incorrect usage of CallDelegate/ActionSheet: eventType must be set"];
-    }
-	
-    [delegate actionSheet:actionSheet ofType:eventType clickedButtonAtIndex:buttonIndex withUserDatas:call];    
-}
-
--(void) actionSheetCancel:(UIActionSheet *)actionSheet {
-    if (timeout) {
-        [timeout invalidate];
-        timeout = nil;
-    }
-    if (eventType == CD_UNDEFINED) {
-        [LinphoneLogger logc:LinphoneLoggerError format:"Incorrect usage of CallDelegate/ActionSheet: eventType must be set"];
-    }
-    [delegate actionSheet:actionSheet ofType:eventType clickedButtonAtIndex:actionSheet.cancelButtonIndex withUserDatas:call];
-}
-
-@end

Classes/ChatRoomTableViewController.m

@@ -45,7 +45,9 @@
         data = nil;
     }
 }
-
+- (void)viewWillAppear:(BOOL)animated {
+	[self loadData];
+}
 
 #pragma mark -
 
@@ -81,7 +83,7 @@
 		[LinphoneLogger logc:LinphoneLoggerWarning format:"chat entries diesn not exixt"];
 		return;
 	}
-	[[self tableView] reloadData]; //just reload
+	[self.tableView reloadRowsAtIndexPaths:[NSArray arrayWithObject:[NSIndexPath indexPathForRow:index inSection:0]] withRowAnimation:FALSE];; //just reload
 	return;
 }
 - (void)scrollToLastUnread:(BOOL)animated {
@@ -147,7 +149,6 @@
     return cell;
 }
 
-
 - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath  {
     if(editingStyle == UITableViewCellEditingStyleDelete) {
         [tableView beginUpdates];

Classes/ChatRoomViewController.h

@@ -18,19 +18,23 @@
  */ 
 
 #import <UIKit/UIKit.h>
+#import <AssetsLibrary/ALAssetsLibrary.h>
 
 #import "UIToggleButton.h"
 #import "UICompositeViewController.h"
 #import "ChatRoomTableViewController.h"
 #import "HPGrowingTextView.h"
 #import "ChatModel.h"
+#import "ImagePickerViewController.h"
+#import "ImageSharing.h"
 
 #include "linphonecore.h"
 
-@interface ChatRoomViewController : UIViewController<UITextFieldDelegate, UICompositeViewDelegate, HPGrowingTextViewDelegate> {
+@interface ChatRoomViewController : UIViewController<HPGrowingTextViewDelegate, UICompositeViewDelegate, ImagePickerDelegate, ImageSharingDelegate> {
     @private
     LinphoneChatRoom *chatRoom;
-	NSString *_remoteAddress;
+    ImageSharing *imageSharing;
+    ALAssetsLibrary *photoLibrary;
 }
 
 
@@ -49,11 +53,18 @@
 @property (nonatomic, retain) IBOutlet UITapGestureRecognizer *listTapGestureRecognizer;
 
 @property (nonatomic, copy) NSString *remoteAddress;
+@property (nonatomic, retain) IBOutlet UIButton* pictureButton;
+@property (nonatomic, retain) IBOutlet UIButton* cancelTransferButton;
+@property (nonatomic, retain) IBOutlet UIProgressView* imageTransferProgressBar;
+@property (nonatomic, retain) IBOutlet UIView* transferView;
+
 
 - (IBAction)onBackClick:(id)event;
 - (IBAction)onEditClick:(id)event;
 - (IBAction)onMessageChange:(id)sender;
 - (IBAction)onSendClick:(id)event;
+- (IBAction)onPictureClick:(id)event;
+- (IBAction)onTransferCancelClick:(id)event;
 - (IBAction)onListTap:(id)sender;
 
 @end

Classes/ChatRoomViewController.m

@@ -19,16 +19,18 @@
 
 #import "ChatRoomViewController.h"
 #import "PhoneMainView.h"
+#import "DTActionSheet.h"
 
 #import <NinePatch.h>
 
+
 @implementation ChatRoomViewController
 
 @synthesize tableController;
 @synthesize sendButton;
 @synthesize messageField;
 @synthesize editButton;
-@synthesize remoteAddress = _remoteAddress;
+@synthesize remoteAddress;
 @synthesize addressLabel;
 @synthesize avatarImage;
 @synthesize headerView;
@@ -38,6 +40,10 @@
 @synthesize messageBackgroundImage;
 @synthesize footerBackgroundImage;
 @synthesize listTapGestureRecognizer;
+@synthesize pictureButton;
+@synthesize imageTransferProgressBar;
+@synthesize cancelTransferButton;
+@synthesize transferView;
 
 
 #pragma mark - Lifecycle Functions
@@ -46,6 +52,8 @@
     self = [super initWithNibName:@"ChatRoomViewController" bundle:[NSBundle mainBundle]];
     if (self != nil) {
         self->chatRoom = NULL;
+        self->imageSharing = NULL;
+        self->photoLibrary = [[ALAssetsLibrary alloc] init];
     }
     return self;
 }
@@ -56,7 +64,7 @@
     [messageField release];
     [sendButton release];
     [editButton release];
-    [_remoteAddress release];
+    [remoteAddress release];
     [addressLabel release];
     [avatarImage release];
     [headerView release];
@@ -64,7 +72,16 @@
     [messageView release];
     [messageBackgroundImage release];
     [footerBackgroundImage release];
+    
     [listTapGestureRecognizer release];
+    
+	[transferView release];
+	[pictureButton release];
+	[imageTransferProgressBar release];
+	[cancelTransferButton release];
+    
+    [photoLibrary release];
+    
     [super dealloc];
 }
 
@@ -91,7 +108,6 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 #pragma mark - ViewController Functions
 
-
 - (void)viewDidLoad {
     [super viewDidLoad];
     
@@ -105,6 +121,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 	messageField.font = [UIFont systemFontOfSize:18.0f];
     messageField.contentInset = UIEdgeInsetsZero;
     messageField.backgroundColor = [UIColor clearColor];
+    [sendButton setEnabled:FALSE];
 }
 
 
@@ -136,11 +153,32 @@ static UICompositeViewDescription *compositeDescription = nil;
     
     [footerBackgroundImage setImage:[TUNinePatchCache imageOfSize:[footerBackgroundImage bounds].size
                                                forNinePatchNamed:@"chat_background"]];
+	BOOL fileSharingEnabled = [[LinphoneManager instance] lpConfigStringForKey:@"file_upload_url_preference"] != NULL 
+								&& [[[LinphoneManager instance] lpConfigStringForKey:@"file_upload_url_preference"] length]>0;
+    
+    CGRect pictureFrame = pictureButton.frame;
+	CGRect messageframe = messageView.frame;
+    CGRect sendFrame = sendButton.frame;
+	if (fileSharingEnabled) {
+        [pictureButton setHidden:FALSE];
+        messageframe.origin.x = pictureFrame.origin.x + pictureFrame.size.width;
+        messageframe.size.width = sendFrame.origin.x - messageframe.origin.x;
+	} else {
+        [pictureButton setHidden:TRUE];
+        messageframe.origin.x = pictureFrame.origin.x;
+        messageframe.size.width = sendFrame.origin.x - messageframe.origin.x;
+	}
+	[messageView setFrame:messageframe];
+	
 }
 
 - (void)viewWillDisappear:(BOOL)animated {
     [super viewWillDisappear:animated];
     
+    if(imageSharing) {
+        [imageSharing cancel];
+    }
+    
     [messageField resignFirstResponder];
     
     if(chatRoom != NULL) {
@@ -169,24 +207,24 @@ static UICompositeViewDescription *compositeDescription = nil;
 #pragma mark - 
 
 - (void)setRemoteAddress:(NSString*)aRemoteAddress {
-    if(_remoteAddress != nil) {
-        [_remoteAddress release];
+    if(remoteAddress != nil) {
+        [remoteAddress release];
     }
-    _remoteAddress = [aRemoteAddress copy];
+    remoteAddress = [aRemoteAddress copy];
     [messageField setText:@""];
     [self update];
-	[tableController setRemoteAddress: _remoteAddress];
+	[tableController setRemoteAddress: remoteAddress];
 }
 
 - (void)update {
-    if(_remoteAddress == NULL) {
+    if(remoteAddress == NULL) {
         [LinphoneLogger logc:LinphoneLoggerWarning format:"Cannot update chat room header: null contact"];
         return;
     }
     
     NSString *displayName = nil;
     UIImage *image = nil;
-	LinphoneAddress* linphoneAddress = linphone_core_interpret_url([LinphoneManager getLc], [_remoteAddress UTF8String]);
+	LinphoneAddress* linphoneAddress = linphone_core_interpret_url([LinphoneManager getLc], [remoteAddress UTF8String]);
 	if (linphoneAddress == NULL) {
         [[PhoneMainView instance] popCurrentView];
 		UIAlertView* error = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Invalid SIP address",nil)
@@ -207,8 +245,8 @@ static UICompositeViewDescription *compositeDescription = nil;
         displayName = [FastAddressBook getContactDisplayName:acontact];
         image = [FastAddressBook getContactImage:acontact thumbnail:true];
     }
-	[_remoteAddress release];
-    _remoteAddress = [normalizedSipAddress retain];
+	[remoteAddress release];
+    remoteAddress = [normalizedSipAddress retain];
     
     // Display name
     if(displayName == nil) {
@@ -229,28 +267,28 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
 	ChatRoomViewController* thiz = (ChatRoomViewController*)ud;
 	ChatModel *chat = (ChatModel *)linphone_chat_message_get_user_data(msg); 
 	[LinphoneLogger log:LinphoneLoggerLog 
-				 format:@"Delivery status for [%@] is [%s]", chat.message, linphone_chat_message_state_to_string(state)];
+				 format:@"Delivery status for [%@] is [%s]",(chat.message?chat.message:@""),linphone_chat_message_state_to_string(state)];
 	[chat setState:[NSNumber numberWithInt:state]];
 	[chat update];
 	[thiz.tableController updateChatEntry:chat];
 }
 
-- (BOOL)sendMessage:(NSString *)message {
+- (BOOL)sendMessage:(NSString *)message withExterlBodyUrl:(NSString*) url{
     if(![LinphoneManager isLcReady]) {
         [LinphoneLogger logc:LinphoneLoggerWarning format:"Cannot send message: Linphone core not ready"];
         return FALSE;
     }
-    if(_remoteAddress == nil) {
+    if(remoteAddress == nil) {
         [LinphoneLogger logc:LinphoneLoggerWarning format:"Cannot send message: Null remoteAddress"];
         return FALSE;
     }
     if(chatRoom == NULL) {
-		chatRoom = linphone_core_create_chat_room([LinphoneManager getLc], [_remoteAddress UTF8String]);
+		chatRoom = linphone_core_create_chat_room([LinphoneManager getLc], [remoteAddress UTF8String]);
     }
     
     // Save message in database
     ChatModel *chat = [[ChatModel alloc] init];
-    [chat setRemoteContact:_remoteAddress];
+    [chat setRemoteContact:remoteAddress];
     [chat setLocalContact:@""];
     [chat setMessage:message];
     [chat setDirection:[NSNumber numberWithInt:0]];
@@ -260,9 +298,13 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
     [chat create];
     [tableController addChatEntry:chat];
     [chat release];
+    
     LinphoneChatMessage* msg = linphone_chat_room_create_message(chatRoom, [message UTF8String]);
 	linphone_chat_message_set_user_data(msg, chat);
-    linphone_chat_room_send_message2(chatRoom, msg, message_status, self);
+    if (url) {
+		linphone_chat_message_set_external_body_url(msg, [url UTF8String]);
+	} 
+	linphone_chat_room_send_message2(chatRoom, msg, message_status, self);
     return TRUE;
 }
 
@@ -273,12 +315,13 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
     //LinphoneChatRoom *room = [[[notif userInfo] objectForKey:@"room"] pointerValue];
     //NSString *message = [[notif userInfo] objectForKey:@"message"];
     LinphoneAddress *from = [[[notif userInfo] objectForKey:@"from"] pointerValue];
-    ChatModel *chat = [[notif userInfo] objectForKey:@"chat"];
+    
+	ChatModel *chat = [[notif userInfo] objectForKey:@"chat"];
     if(from != NULL && chat != NULL) {
         char *fromStr = linphone_address_as_string_uri_only(from);
         if(fromStr != NULL) {
             if([[NSString stringWithUTF8String:fromStr] 
-                caseInsensitiveCompare:_remoteAddress] == NSOrderedSame) {
+                caseInsensitiveCompare:remoteAddress] == NSOrderedSame) {
                 [chat setRead:[NSNumber numberWithInt:1]];
                 [chat update];
                 [[NSNotificationCenter defaultCenter] postNotificationName:kLinphoneTextReceived object:self];
@@ -286,7 +329,20 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
             }
             ms_free(fromStr);
         }
-    } else {
+
+		if ([[notif userInfo] objectForKey:@"external_body_url"]) {
+			NSString *pendingFileUrl = [[[notif userInfo] objectForKey:@"external_body_url"] retain];
+            
+			DTActionSheet *sheet = [[[DTActionSheet alloc] initWithTitle:NSLocalizedString(@"Incoming file stored to your photo library",nil)] autorelease];
+            [sheet addButtonWithTitle:NSLocalizedString(@"Accept",nil) block:^(){
+                imageSharing = [ImageSharing imageSharingDownload:[NSURL URLWithString:pendingFileUrl] delegate:self];
+                [footerView setHidden:TRUE];
+                [transferView setHidden:FALSE];
+            }];
+            [sheet addCancelButtonWithTitle:NSLocalizedString(@"Ignore",nil)];
+            [sheet showInView:[PhoneMainView instance].view];
+		}
+	} else {
         [LinphoneLogger logc:LinphoneLoggerWarning format:"Invalid textReceivedEvent"];
     }
 }
@@ -327,6 +383,7 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
                                                 forNinePatchNamed:@"chat_background"]];
 }
 
+
 #pragma mark - Action Functions
 
 - (IBAction)onBackClick:(id)event {
@@ -340,8 +397,9 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
 }
 
 - (IBAction)onSendClick:(id)event {
-    if([self sendMessage:[messageField text]]) {
+    if([self sendMessage:[messageField text] withExterlBodyUrl:nil]) {
         [messageField setText:@""];
+        [self onMessageChange:nil];
     }
 }
 
@@ -357,6 +415,114 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
     }
 }
 
+- (IBAction)onPictureClick:(id)event {
+	[messageField resignFirstResponder];
+    
+    [ImagePickerViewController promptSelectSource:^(UIImagePickerControllerSourceType type) {
+        UICompositeViewDescription *description = [[[ImagePickerViewController compositeViewDescription] copy] autorelease];
+        description.tabBar = nil; // Disable default tarbar
+        description.tabBarEnabled = false;
+        ImagePickerViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:description push:TRUE], ImagePickerViewController);
+        if(controller != nil) {
+            controller.sourceType = type;
+            
+            // Displays a control that allows the user to choose picture or
+            // movie capture, if both are available:
+            controller.mediaTypes = [UIImagePickerController availableMediaTypesForSourceType:type];
+            
+            // Hides the controls for moving & scaling pictures, or for
+            // trimming movies. To instead show the controls, use YES.
+            controller.allowsEditing = NO;
+            controller.imagePickerDelegate = self;
+        }
+    }];
+}
+
+- (IBAction)onTransferCancelClick:(id)event {
+    if(imageSharing) {
+        [imageSharing cancel];
+    }
+}
+
+
+#pragma mark ImageSharingDelegate
+
+- (void)imageSharingProgress:(ImageSharing*)aimageSharing progress:(float)progress {
+    [imageTransferProgressBar setProgress:progress animated:FALSE];
+}
+
+- (void)imageSharingAborted:(ImageSharing*)aimageSharing {
+    [footerView setHidden:FALSE];
+	[transferView setHidden:TRUE];
+    imageSharing = NULL;
+}
+
+- (void)imageSharingError:(ImageSharing*)aimageSharing error:(NSError *)error {
+    [footerView setHidden:FALSE];
+	[transferView setHidden:TRUE];
+    NSString *url = [aimageSharing.connection.currentRequest.URL absoluteString];
+    if (aimageSharing.upload) {
+		[LinphoneLogger log:LinphoneLoggerError format:@"Cannot upload file to server [%@] because [%@]", url, [error localizedDescription]];
+        UIAlertView* errorAlert = [UIAlertView alloc];
+		[errorAlert	initWithTitle:NSLocalizedString(@"Transfer error", nil)
+						  message:NSLocalizedString(@"Cannot transfer file to remote contact", nil)
+						 delegate:nil
+				cancelButtonTitle:NSLocalizedString(@"Ok",nil)
+				otherButtonTitles:nil ,nil];
+		[errorAlert show];
+        [errorAlert release];
+	} else {
+		[LinphoneLogger log:LinphoneLoggerError format:@"Cannot dowanlod file from [%@] because [%@]", url, [error localizedDescription]];
+        UIAlertView* errorAlert = [UIAlertView alloc];
+		[errorAlert	initWithTitle:NSLocalizedString(@"Transfer error", nil)
+						  message:NSLocalizedString(@"Cannot transfer file from remote contact", nil)
+						 delegate:nil
+				cancelButtonTitle:NSLocalizedString(@"Continue", nil)
+				otherButtonTitles:nil, nil];
+		[errorAlert show];
+        [errorAlert release];
+	}
+    imageSharing = NULL;
+}
+
+- (void)imageSharingUploadDone:(ImageSharing*)aimageSharing url:(NSURL*)url{
+    [self sendMessage:NSLocalizedString(@"Image sent", nil) withExterlBodyUrl:[url absoluteString]];
+    
+    [footerView setHidden:FALSE];
+	[transferView setHidden:TRUE];
+    imageSharing = NULL;
+}
+
+- (void)imageSharingDownloadDone:(ImageSharing*)aimageSharing image:(UIImage *)image {
+    [footerView setHidden:FALSE];
+	[transferView setHidden:TRUE];
+    
+    [photoLibrary writeImageToSavedPhotosAlbum:(CGImageRef)image
+                                 metadata:nil
+                          completionBlock:^(NSURL *assetURL, NSError *error){
+                              if (error) {
+                                  [LinphoneLogger log:LinphoneLoggerError format:@"Cannot save image data downloaded [%@]",[error localizedDescription]];
+                              } else {
+                                  [LinphoneLogger log:LinphoneLoggerLog format:@"Image saved to [%@]",[assetURL absoluteString]];
+                              }
+                              ImageViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[ImageViewController compositeViewDescription] push:TRUE], ImageViewController);
+                              if(controller != nil) {
+                                  [controller setImage:image];
+                              }
+                          }];
+    imageSharing = NULL;
+}
+
+
+#pragma mark ImagePickerDelegate
+
+- (void)imagePickerDelegateImage:(UIImage*)image {
+    NSString *urlString = [[LinphoneManager instance] lpConfigStringForKey:@"file_upload_url_preference"];
+    imageSharing = [ImageSharing imageSharingUpload:[NSURL URLWithString:urlString] image:image delegate:self];
+    [footerView setHidden:TRUE];
+	[transferView setHidden:FALSE];
+}
+
 
 #pragma mark - Keyboard Event Functions
 

Classes/ChatViewController.m

@@ -39,6 +39,7 @@
     
     [tableController release];
     [editButton release];
+    [addressField release];
     
     [super dealloc];
 }

Classes/DialerViewController.h

@@ -22,6 +22,7 @@
 #import "UICompositeViewController.h"
 
 #import "UIEraseButton.h"
+#import "UICamSwitch.h"
 #import "UICallButton.h"
 #import "UITransferButton.h"
 #import "UIDigitButton.h"
@@ -55,6 +56,9 @@
 @property (nonatomic, retain) IBOutlet UIDigitButton* starButton;
 @property (nonatomic, retain) IBOutlet UIDigitButton* zeroButton;
 @property (nonatomic, retain) IBOutlet UIDigitButton* sharpButton;
+@property (nonatomic, retain) IBOutlet UIView* backgroundView;
+@property (nonatomic, retain) IBOutlet UIView* videoPreview;
+@property (nonatomic, retain) IBOutlet UICamSwitch* videoCameraSwitch;
 
 - (IBAction)onAddContactClick: (id) event;
 - (IBAction)onBackClick: (id) event;

Classes/DialerViewController.m

@@ -54,6 +54,10 @@
 @synthesize zeroButton;
 @synthesize sharpButton;
 
+@synthesize backgroundView;
+@synthesize videoPreview;
+@synthesize videoCameraSwitch;
+
 #pragma mark - Lifecycle Functions
 
 - (id)init {
@@ -86,6 +90,8 @@
 	[zeroButton release];
 	[sharpButton release];
     
+    [videoPreview release];
+    [videoCameraSwitch release];
     
     // Remove all observers
     [[NSNotificationCenter defaultCenter] removeObserver:self];
@@ -124,11 +130,27 @@ static UICompositeViewDescription *compositeDescription = nil;
                                              selector:@selector(callUpdateEvent:) 
                                                  name:kLinphoneCallUpdate
                                                object:nil];
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(coreUpdateEvent:)
+                                                 name:kLinphoneCoreUpdate
+                                               object:nil];
     // Update on show
     if([LinphoneManager isLcReady]) {
-        LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]);
+        LinphoneCore* lc = [LinphoneManager getLc];
+        LinphoneCall* call = linphone_core_get_current_call(lc);
         LinphoneCallState state = (call != NULL)?linphone_call_get_state(call): 0;
         [self callUpdate:call state:state];
+        
+        if([LinphoneManager runningOnIpad]) {
+            if(linphone_core_video_enabled(lc) && linphone_core_video_preview_enabled(lc)) {
+                linphone_core_set_native_preview_window_id(lc, (unsigned long)videoPreview);
+                [backgroundView setHidden:FALSE];
+            } else {
+                linphone_core_set_native_preview_window_id(lc, (unsigned long)NULL);
+                [backgroundView setHidden:TRUE];
+            }
+        }
     }
 } 
 
@@ -139,6 +161,11 @@ static UICompositeViewDescription *compositeDescription = nil;
     [[NSNotificationCenter defaultCenter] removeObserver:self 
                                                     name:kLinphoneCallUpdate
                                                   object:nil];
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                    name:kLinphoneCoreUpdate
+                                                  object:nil];
+    
 }
 
 - (void)viewDidLoad {
@@ -158,8 +185,42 @@ static UICompositeViewDescription *compositeDescription = nil;
 	[sharpButton   setDigit:'#'];
     
     [addressField setAdjustsFontSizeToFitWidth:TRUE]; // Not put it in IB: issue with placeholder size
+    
+    if([LinphoneManager runningOnIpad]) {
+        if ([LinphoneManager instance].frontCamId != nil) {
+            // only show camera switch button if we have more than 1 camera
+            [videoCameraSwitch setHidden:FALSE];
+        }
+    }
 }
 
+- (void)viewDidUnload {
+    [super viewDidUnload];
+}
+
+- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
+    [super willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration];
+    CGRect frame = [videoPreview frame];
+    switch (toInterfaceOrientation) {
+        case UIInterfaceOrientationPortrait:
+            [videoPreview setTransform: CGAffineTransformMakeRotation(0)];
+            break;
+        case UIInterfaceOrientationPortraitUpsideDown:
+            [videoPreview setTransform: CGAffineTransformMakeRotation(M_PI)];
+            break;
+        case UIInterfaceOrientationLandscapeLeft:
+            [videoPreview setTransform: CGAffineTransformMakeRotation(M_PI / 2)];
+            break;
+        case UIInterfaceOrientationLandscapeRight:
+            [videoPreview setTransform: CGAffineTransformMakeRotation(-M_PI / 2)];
+            break;
+        default:
+            break;
+    }
+    [videoPreview setFrame:frame];
+}
+
+
 #pragma mark - Event Functions
 
 - (void)callUpdateEvent:(NSNotification*)notif { 
@@ -168,6 +229,18 @@ static UICompositeViewDescription *compositeDescription = nil;
     [self callUpdate:call state:state];
 }
 
+- (void)coreUpdateEvent:(NSNotification*)notif {
+    if([LinphoneManager isLcReady] && [LinphoneManager runningOnIpad]) {
+        LinphoneCore* lc = [LinphoneManager getLc];
+        if(linphone_core_video_enabled(lc) && linphone_core_video_preview_enabled(lc)) {
+            linphone_core_set_native_preview_window_id(lc, (unsigned long)videoPreview);
+            [backgroundView setHidden:FALSE];
+        } else {
+            linphone_core_set_native_preview_window_id(lc, (unsigned long)NULL);
+            [backgroundView setHidden:TRUE];
+        }
+    }
+}
 
 #pragma mark -
 

Classes/ImagePickerViewController.h

@@ -1,4 +1,4 @@
-/* ContactDetailsImagePickerController.h
+/* ImagePickerViewController.h
  *
  * Copyright (C) 2012  Belledonne Comunications, Grenoble, France
  *
@@ -19,15 +19,17 @@
 
 #import "UICompositeViewController.h"
 
-@protocol ContactDetailsImagePickerDelegate <NSObject>
+@protocol ImagePickerDelegate <NSObject>
 
-- (void)changeContactImage:(UIImage*)image;
+- (void)imagePickerDelegateImage:(UIImage*)image;
 
 @end
 
-@interface ContactDetailsImagePickerController : UIImagePickerController <UICompositeViewDelegate, UINavigationControllerDelegate, UIImagePickerControllerDelegate> {
+@interface ImagePickerViewController : UIImagePickerController <UICompositeViewDelegate, UINavigationControllerDelegate, UIImagePickerControllerDelegate> {
 }
 
-@property (nonatomic, retain) id<ContactDetailsImagePickerDelegate> imagePickerDelegate;
+@property (nonatomic, retain) id<ImagePickerDelegate> imagePickerDelegate;
+
++ (void)promptSelectSource:(void (^)(UIImagePickerControllerSourceType))block;
 
 @end

Classes/ImagePickerViewController.m

@@ -1,4 +1,4 @@
-/* ContactDetailsImagePickerController.m
+/* ImagePickerViewController.m
  *
  * Copyright (C) 2012  Belledonne Comunications, Grenoble, France
  *
@@ -17,10 +17,11 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#import "ContactDetailsImagePickerController.h"
+#import "ImagePickerViewController.h"
 #import "PhoneMainView.h"
+#import "DTActionSheet.h"
 
-@implementation ContactDetailsImagePickerController
+@implementation ImagePickerViewController
 
 @synthesize imagePickerDelegate;
 
@@ -31,8 +32,8 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 + (UICompositeViewDescription *)compositeViewDescription {
     if(compositeDescription == nil) {
-        compositeDescription = [[UICompositeViewDescription alloc] init:@"ContactDetailsImage"
-                                                                content:@"ContactDetailsImagePickerController"
+        compositeDescription = [[UICompositeViewDescription alloc] init:@"ImagePicker"
+                                                                content:@"ImagePickerViewController"
                                                                stateBar:nil
                                                         stateBarEnabled:false
                                                                  tabBar:@"UIMainBar"
@@ -56,11 +57,28 @@ static UICompositeViewDescription *compositeDescription = nil;
 #pragma mark -
 
 - (void)dismiss {
-    if([[[PhoneMainView instance] currentView] equal:[ContactDetailsImagePickerController compositeViewDescription]]) {
+    if([[[PhoneMainView instance] currentView] equal:[ImagePickerViewController compositeViewDescription]]) {
         [[PhoneMainView instance] popCurrentView];
     }
 }
 
++ (void)promptSelectSource:(void (^)(UIImagePickerControllerSourceType))block {
+    DTActionSheet *sheet = [[[DTActionSheet alloc] initWithTitle:NSLocalizedString(@"Select picture source",nil)] autorelease];
+    if([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) {
+	    [sheet addButtonWithTitle:NSLocalizedString(@"Camera",nil) block:^(){
+            block(UIImagePickerControllerSourceTypeCamera);
+        }];
+	}
+	if([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypePhotoLibrary]) {
+	    [sheet addButtonWithTitle:NSLocalizedString(@"Photo library",nil) block:^(){
+            block(UIImagePickerControllerSourceTypePhotoLibrary);
+        }];
+	}
+    [sheet addCancelButtonWithTitle:NSLocalizedString(@"Cancel",nil)];
+    
+    [sheet showInView:[PhoneMainView instance].view];
+}
+
 
 #pragma mark - UIImagePickerControllerDelegate Functions
 
@@ -69,8 +87,8 @@ static UICompositeViewDescription *compositeDescription = nil;
     if(image == nil) {
         image = [info objectForKey:UIImagePickerControllerOriginalImage];
     }
-    if(image != nil) {
-        [imagePickerDelegate changeContactImage:image];
+    if(image != nil && imagePickerDelegate != nil) {
+        [imagePickerDelegate imagePickerDelegateImage:image];
     }
     [self dismiss];
 }

Classes/ImageSharing.h

@@ -0,0 +1,50 @@
+/* ImageSharing.h
+ *
+ * Copyright (C) 2012  Belledonne Comunications, Grenoble, France
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#import <Foundation/Foundation.h>
+
+@class ImageSharing;
+
+@protocol ImageSharingDelegate <NSObject>
+
+- (void)imageSharingProgress:(ImageSharing*)imageSharing progress:(float)progress;
+- (void)imageSharingAborted:(ImageSharing*)imageSharing;
+- (void)imageSharingError:(ImageSharing*)imageSharing error:(NSError *)error;
+- (void)imageSharingUploadDone:(ImageSharing*)imageSharing url:(NSURL*)url;
+- (void)imageSharingDownloadDone:(ImageSharing*)imageSharing image:(UIImage *)image;
+
+@end
+
+@interface ImageSharing : NSObject<NSURLConnectionDataDelegate> {
+@private
+    NSInteger totalBytesExpectedToRead;
+    id<ImageSharingDelegate> delegate;
+    int statusCode;
+}
+
++ (id)imageSharingUpload:(NSURL*)url image:(UIImage*)image delegate:(id<ImageSharingDelegate>)delegate;
++ (id)imageSharingDownload:(NSURL*)url delegate:(id<ImageSharingDelegate>)delegate;
+
+- (void)cancel;
+
+@property (nonatomic, readonly) BOOL upload;
+@property (nonatomic, readonly) NSMutableData* data;
+@property (nonatomic, readonly) NSURLConnection* connection;
+
+@end

Classes/ImageSharing.m

@@ -0,0 +1,183 @@
+/* ImageSharing.m
+ *
+ * Copyright (C) 2012  Belledonne Comunications, Grenoble, France
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#import "ImageSharing.h"
+#import "Utils.h"
+#import "LinphoneManager.h"
+
+@implementation ImageSharing
+
+@synthesize connection;
+@synthesize data;
+@synthesize upload;
+
+
+#pragma mark - Lifecycle Functions
+
++ (id)imageSharingUpload:(NSURL*)url image:(UIImage*)image delegate:(id<ImageSharingDelegate>)delegate {
+    ImageSharing *imgs = [[ImageSharing alloc] init];
+    if(imgs != nil) {
+        imgs->upload = TRUE;
+        imgs->delegate = [delegate retain];
+        imgs->data = [[NSMutableData alloc] init];
+        if(delegate) {
+            [delegate imageSharingProgress:imgs progress:0];
+        }
+        [imgs uploadImageTo:url image:image];
+    }
+    return imgs;
+}
+
++ (id)imageSharingDownload:(NSURL*)url delegate:(id<ImageSharingDelegate>)delegate {
+    ImageSharing *imgs = [[ImageSharing alloc] init];
+    if(imgs != nil) {
+        imgs->upload = FALSE;
+        imgs->delegate = [delegate retain];
+        imgs->data = [[NSMutableData alloc] init];
+        if(delegate) {
+            [delegate imageSharingProgress:imgs progress:0];
+        }
+        [imgs downloadImageFrom:url];
+    }
+    return imgs;
+}
+
+- (void)dealloc {
+    [connection release];
+    [data release];
+    [delegate release];
+    [super dealloc];
+}
+
+
+#pragma mark -
+
+- (void)cancel {
+    [connection cancel];
+    [LinphoneLogger log:LinphoneLoggerLog format:@"File transfer [%@] interrupted by user", [connection.currentRequest.URL absoluteString]];
+    if(delegate) {
+        [delegate imageSharingAborted:self];
+    }
+}
+
+
+- (void)downloadImageFrom:(NSURL*)url {
+	[LinphoneLogger log:LinphoneLoggerLog format:@"downloading [%@]", [url absoluteString]];
+    
+	NSURLRequest* request = [NSURLRequest requestWithURL:url
+											 cachePolicy:NSURLRequestUseProtocolCachePolicy
+										 timeoutInterval:60.0];
+    
+	connection = [[NSURLConnection alloc] initWithRequest:request delegate: self];
+}
+
+
+- (void)uploadImageTo:(NSURL*)url image:(UIImage*)image {
+    [LinphoneLogger log:LinphoneLoggerLog format:@"downloading [%@]", [url absoluteString]];
+	
+	// setting up the request object now
+	NSMutableURLRequest *request = [[[NSMutableURLRequest alloc] init] autorelease];
+	[request setURL:url];
+	[request setHTTPMethod:@"POST"];
+	
+	/*
+	 add some header info now
+	 we always need a boundary when we post a file
+	 also we need to set the content type
+	 
+	 You might want to generate a random boundary.. this is just the same
+	 as my output from wireshark on a valid html post
+	 */
+	NSString *boundary = @"---------------------------14737809831466499882746641449";
+	NSString *contentType = [NSString stringWithFormat:@"multipart/form-data; boundary=%@",boundary];
+	[request addValue:contentType forHTTPHeaderField: @"Content-Type"];
+	
+	/*
+	 now lets create the body of the post
+	 */
+	NSMutableData *body = [NSMutableData data];
+    NSString *imageName = [NSString stringWithFormat:@"%i.jpg", [image hash]];
+	[body appendData:[[NSString stringWithFormat:@"\r\n--%@\r\n",boundary] dataUsingEncoding:NSUTF8StringEncoding]];
+	[body appendData:[[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"userfile\"; filename=\"%@\"\r\n",imageName] dataUsingEncoding:NSUTF8StringEncoding]];
+	[body appendData:[@"Content-Type: application/octet-stream\r\n\r\n" dataUsingEncoding:NSUTF8StringEncoding]];
+	[body appendData:[NSData dataWithData:UIImageJPEGRepresentation(image, 1.0)]];
+	[body appendData:[[NSString stringWithFormat:@"\r\n--%@--\r\n",boundary] dataUsingEncoding:NSUTF8StringEncoding]];
+	[request setHTTPBody:body];
+	
+	connection = [[NSURLConnection alloc] initWithRequest:(NSURLRequest *)request delegate:self];
+}
+
+
+#pragma mark - NSURLConnectionDelegate
+
+- (void)connection:(NSURLConnection *)aconnection didFailWithError:(NSError *)error {
+    if(delegate) {
+        [delegate imageSharingError:self error:error];
+    }
+    [self release];
+}
+
+- (void)connection:(NSURLConnection *)connection didSendBodyData:(NSInteger)bytesWritten totalBytesWritten:(NSInteger)totalBytesWritten totalBytesExpectedToWrite:(NSInteger)totalBytesExpectedToWrite {
+    if(upload && delegate) {
+        [delegate imageSharingProgress:self progress:(float)totalBytesWritten/(float)totalBytesExpectedToWrite];
+    }
+}
+
+- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)adata {
+    [data appendData:adata];
+    if(!upload && delegate) {
+        [delegate imageSharingProgress:self progress:(float)data.length/(float)totalBytesExpectedToRead];
+    }
+}
+
+- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response {
+	NSHTTPURLResponse * httpResponse = (NSHTTPURLResponse *) response;
+	statusCode = httpResponse.statusCode;
+	[LinphoneLogger log:LinphoneLoggerLog format:@"File transfer status code [%i]",statusCode];
+    
+    if (statusCode == 200 && !upload) {
+        totalBytesExpectedToRead = [response expectedContentLength];
+    }
+}
+
+- (void)connectionDidFinishLoading:(NSURLConnection *)connection {
+    if(statusCode >= 400) {
+        NSError *error = [NSError errorWithDomain:@"ImageSharing" code:statusCode userInfo:nil];
+        if(delegate) {
+            [delegate imageSharingError:self error:error];
+        }
+        return;
+    }
+	if (upload) {
+        NSString* imageRemoteUrl = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+        [LinphoneLogger log:LinphoneLoggerLog format:@"File can be downloaded from [%@]", imageRemoteUrl];
+        if(delegate) {
+            [delegate imageSharingUploadDone:self url:[NSURL URLWithString:imageRemoteUrl]];
+        }
+	} else {
+		UIImage* image = [UIImage imageWithData:data];
+        [LinphoneLogger log:LinphoneLoggerLog format:@"File downloaded"];
+        if(delegate) {
+            [delegate imageSharingDownloadDone:self image:image];
+        }
+	}
+    [self release];
+}
+
+@end

Classes/ImageViewController.h

@@ -1,6 +1,6 @@
-/* LinphoneManager.h
+/* ImageViewController.h
  *
- * Copyright (C) 2011  Belledonne Comunications, Grenoble, France
+ * Copyright (C) 2012  Belledonne Comunications, Grenoble, France
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -10,37 +10,25 @@
  *  This program is distributed in the hope that it will be useful,     
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of      
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the       
- *  GNU General Public License for more details.                
+ *  GNU Library General Public License for more details.                
  *                                                                      
  *  You should have received a copy of the GNU General Public License   
  *  along with this program; if not, write to the Free Software         
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */ 
 
-#import <Foundation/Foundation.h>
-#include "linphonecore.h"
+#import <UIKit/UIKit.h>
 
-enum CallDelegateType {
-    CD_UNDEFINED = 0,
-    CD_ZRTP,
-    CD_VIDEO_UPDATE,
-    CD_STOP_VIDEO_ON_LOW_BATTERY
-};
+#import "UICompositeViewController.h"
 
-@protocol CallActionSheetDelegate
-- (void)actionSheet:(UIActionSheet *)actionSheet ofType:(enum CallDelegateType) type clickedButtonAtIndex:(NSInteger)buttonIndex withUserDatas:(void*) datas;
-@end
-
-@interface CallDelegate : NSObject<UIActionSheetDelegate> {
-    enum CallDelegateType eventType;
-    LinphoneCall* call;
-    id<CallActionSheetDelegate> delegate;
-    NSTimer* timeout;
+@interface ImageViewController : UIViewController<UICompositeViewDelegate> {
+	
 }
 
-@property (nonatomic) enum CallDelegateType eventType;
-@property (nonatomic) LinphoneCall* call;
-@property (nonatomic, retain) id delegate;
-@property (nonatomic, retain) NSTimer* timeout;
+@property (nonatomic, retain) IBOutlet UIImageView *imageView;
+@property (nonatomic, retain) UIImage  *image;
+@property (nonatomic, retain) IBOutlet UIButton *backButton;
 
-@end
+- (IBAction)onBackClick:(id)sender;
+
+@end

Classes/ImageViewController.m

@@ -0,0 +1,73 @@
+/* ImageViewController.m
+ *
+ * Copyright (C) 2012  Belledonne Comunications, Grenoble, France
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or   
+ *  (at your option) any later version.                                 
+ *                                                                      
+ *  This program is distributed in the hope that it will be useful,     
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of      
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the       
+ *  GNU Library General Public License for more details.                
+ *                                                                      
+ *  You should have received a copy of the GNU General Public License   
+ *  along with this program; if not, write to the Free Software         
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */ 
+
+#import "ImageViewController.h"
+#import "PhoneMainView.h"
+
+@interface ImageViewController ()
+
+@end
+
+@implementation ImageViewController
+
+@synthesize imageView;
+@synthesize backButton;
+@synthesize image;
+
+
+#pragma mark - UICompositeViewDelegate Functions
+
+static UICompositeViewDescription *compositeDescription = nil;
+
++ (UICompositeViewDescription *)compositeViewDescription {
+    if(compositeDescription == nil) {
+        compositeDescription = [[UICompositeViewDescription alloc] init:@"ImageView"
+                                                                content:@"ImageViewController"
+                                                               stateBar:nil
+                                                        stateBarEnabled:false
+                                                                 tabBar:nil
+                                                          tabBarEnabled:false
+                                                             fullscreen:false
+                                                          landscapeMode:[LinphoneManager runningOnIpad]
+                                                           portraitMode:true];
+    }
+    return compositeDescription;
+}
+
+
+#pragma mark - Property Functions
+
+- (void)setImage:(UIImage *)aimage {
+    imageView.image = aimage;
+}
+
+- (UIImage *)image {
+    return imageView.image;
+}
+
+
+#pragma mark - Action Functions
+
+- (IBAction)onBackClick:(id)sender {
+    if([[[PhoneMainView instance] currentView] equal:[ImageViewController compositeViewDescription]]) {
+        [[PhoneMainView instance] popCurrentView];
+    }
+}
+
+@end

Classes/InCallViewController.h

@@ -21,20 +21,18 @@
 
 #import "VideoZoomHandler.h"
 #import "UICamSwitch.h"
-#import "CallDelegate.h"
 
 #import "UICompositeViewController.h"
 #import "InCallTableViewController.h"
 
 @class VideoViewController;
 
-@interface InCallViewController : UIViewController <CallActionSheetDelegate, UIGestureRecognizerDelegate, UICompositeViewDelegate> {
+@interface InCallViewController : UIViewController <UIGestureRecognizerDelegate, UICompositeViewDelegate> {
     @private
     UITapGestureRecognizer* singleFingerTap;
     NSTimer* hideControlsTimer;
     BOOL videoShown;
     VideoZoomHandler* videoZoomHandler;
-    UIActionSheet* visibleActionSheet;
 }
 
 @property (nonatomic, retain) IBOutlet InCallTableViewController* callTableController;

Classes/InCallViewController.m

@@ -29,6 +29,7 @@
 #import "LinphoneManager.h"
 #import "PhoneMainView.h"
 #import "UILinphone.h"
+#import "DTActionSheet.h"
 
 #include "linphonecore.h"
 
@@ -119,9 +120,6 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 - (void)viewWillDisappear:(BOOL)animated {
     [super viewWillDisappear:animated];
-    if (visibleActionSheet != nil) {
-        [visibleActionSheet dismissWithClickedButtonIndex:visibleActionSheet.cancelButtonIndex animated:NO];
-    }
     if (hideControlsTimer != nil) {
         [hideControlsTimer invalidate];
         hideControlsTimer = nil;
@@ -153,11 +151,17 @@ static UICompositeViewDescription *compositeDescription = nil;
     LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]);
     LinphoneCallState state = (call != NULL)?linphone_call_get_state(call): 0;
     [self callUpdate:call state:state animated:FALSE];
-    [self orientationUpdate:[PhoneMainView instance].interfaceOrientation];
     
     if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
         [callTableController viewDidAppear:animated];
-    }  
+    }
+    
+    // Set windows (warn memory leaks)
+    linphone_core_set_native_video_window_id([LinphoneManager getLc], (unsigned long)videoView);
+    linphone_core_set_native_preview_window_id([LinphoneManager getLc], (unsigned long)videoPreview);
+    
+    // Enable tap
+    [singleFingerTap setEnabled:TRUE];
 }
 
 - (void)viewDidDisappear:(BOOL)animated {
@@ -169,16 +173,15 @@ static UICompositeViewDescription *compositeDescription = nil;
     
     if ([[UIDevice currentDevice].systemVersion doubleValue] < 5.0) {
         [callTableController viewDidDisappear:animated];
-    }  
+    }
+    
+    // Disable tap
+    [singleFingerTap setEnabled:FALSE];
 }
 
 - (void)viewDidLoad {
     [super viewDidLoad];
     
-    // Set windows (warn memory leaks)
-    linphone_core_set_native_video_window_id([LinphoneManager getLc],(unsigned long)videoView);	
-    linphone_core_set_native_preview_window_id([LinphoneManager getLc],(unsigned long)videoPreview);
-    
     [singleFingerTap setNumberOfTapsRequired:1];
     [singleFingerTap setCancelsTouchesInView: FALSE];
     [[PhoneMainView instance].view addGestureRecognizer:singleFingerTap];
@@ -196,11 +199,6 @@ static UICompositeViewDescription *compositeDescription = nil;
     [[PhoneMainView instance].view removeGestureRecognizer:singleFingerTap];
 }
 
-- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
-    [super willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration];
-    [self orientationUpdate:toInterfaceOrientation];
-}
-
 - (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
     [super willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration];
     CGRect frame = [videoPreview frame];
@@ -226,35 +224,6 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 #pragma mark -
 
-- (void)orientationUpdate:(UIInterfaceOrientation)orientation {
-    int oldLinphoneOrientation = linphone_core_get_device_rotation([LinphoneManager getLc]);
-    int newRotation = 0;
-    switch (orientation) {
-        case UIInterfaceOrientationPortrait:
-            newRotation = 0;
-            break;
-        case UIInterfaceOrientationPortraitUpsideDown:
-            newRotation = 180;
-            break;
-        case UIInterfaceOrientationLandscapeRight:
-            newRotation = 270;
-            break;
-        case UIInterfaceOrientationLandscapeLeft:
-            newRotation = 90;
-            break;
-        default:
-            newRotation = oldLinphoneOrientation;
-    }
-    if (oldLinphoneOrientation != newRotation) {
-        linphone_core_set_device_rotation([LinphoneManager getLc], newRotation);
-        LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]);
-        if (call && linphone_call_params_video_enabled(linphone_call_get_current_params(call))) {
-            //Orientation has changed, must call update call
-            linphone_core_update_call([LinphoneManager getLc], call, NULL);
-        }
-    }
-}
-
 - (void)callUpdate:(LinphoneCall *)call state:(LinphoneCallState)state animated:(BOOL)animated {
     // Update table
     [callTableView reloadData];  
@@ -403,13 +372,13 @@ static UICompositeViewDescription *compositeDescription = nil;
         [UIView commitAnimations];
     }
     
-    if([[LinphoneManager instance] lpConfigBoolForKey:@"self_video_preference"]) {
+    if(linphone_core_self_view_enabled([LinphoneManager getLc])) {
         [videoPreview setHidden:FALSE];
     } else {
         [videoPreview setHidden:TRUE];
     }
     
-    if ([LinphoneManager instance].frontCamId !=nil) {
+    if ([LinphoneManager instance].frontCamId != nil) {
         // only show camera switch button if we have more than 1 camera
         [videoCameraSwitch setHidden:FALSE];
     }
@@ -493,13 +462,6 @@ static void hideSpinner(LinphoneCall* call, void* user_data) {
 
 #pragma mark - ActionSheet Functions
 
-- (void)dismissActionSheet: (id)o {
-    if (visibleActionSheet != nil) {
-        [visibleActionSheet dismissWithClickedButtonIndex:visibleActionSheet.cancelButtonIndex animated:TRUE];
-        visibleActionSheet = nil;
-    }
-}
-
 - (void)displayAskToEnableVideoCall:(LinphoneCall*) call {
     if (linphone_core_get_video_policy([LinphoneManager getLc])->automatically_accept)
         return;
@@ -509,62 +471,29 @@ static void hideSpinner(LinphoneCall* call, void* user_data) {
     const char* lDisplayNameChars =  linphone_address_get_display_name(linphone_call_get_remote_address(call));        
 	NSString* lDisplayName = [lDisplayNameChars?[[NSString alloc] initWithUTF8String:lDisplayNameChars]:@"" autorelease];
     
-    // ask the user if he agrees
-    CallDelegate* cd = [[CallDelegate alloc] init];
-    cd.eventType = CD_VIDEO_UPDATE;
-    cd.delegate = self;
-    cd.call = call;
-    
-    if (visibleActionSheet != nil) {
-        [visibleActionSheet dismissWithClickedButtonIndex:visibleActionSheet.cancelButtonIndex animated:TRUE];
-    }
     NSString* title = [NSString stringWithFormat : NSLocalizedString(@"'%@' would like to enable video",nil), ([lDisplayName length] > 0)?lDisplayName:lUserName];
-    visibleActionSheet = [[UIActionSheet alloc] initWithTitle:title
-                                                    delegate:cd 
-                                           cancelButtonTitle:NSLocalizedString(@"Decline",nil) 
-                                      destructiveButtonTitle:NSLocalizedString(@"Accept",nil) 
-                                           otherButtonTitles:nil];
-    
-    visibleActionSheet.actionSheetStyle = UIActionSheetStyleDefault;
-    [visibleActionSheet showInView:[PhoneMainView instance].view];
-    
-    /* start cancel timer */
-    cd.timeout = [NSTimer scheduledTimerWithTimeInterval:30 target:self selector:@selector(dismissActionSheet:) userInfo:nil repeats:NO];
-    [visibleActionSheet release];
+    DTActionSheet *sheet = [[[DTActionSheet alloc] initWithTitle:title] autorelease];
+    NSTimer *timer = [NSTimer scheduledTimerWithTimeInterval:30 target:self selector:@selector(dismissVideoActionSheet:) userInfo:sheet repeats:NO];
+    [sheet addButtonWithTitle:NSLocalizedString(@"Accept", nil)  block:^() {
+        [LinphoneLogger logc:LinphoneLoggerLog format:"User accept video proposal"];
+        LinphoneCallParams* paramsCopy = linphone_call_params_copy(linphone_call_get_current_params(call));
+        linphone_call_params_enable_video(paramsCopy, TRUE);
+        linphone_core_accept_call_update([LinphoneManager getLc], call, paramsCopy);
+        linphone_call_params_destroy(paramsCopy);
+        [timer invalidate];
+    }];
+    [sheet addDestructiveButtonWithTitle:NSLocalizedString(@"Decline", nil)  block:^() {
+        [LinphoneLogger logc:LinphoneLoggerLog format:"User declined video proposal"];
+        linphone_core_accept_call_update([LinphoneManager getLc], call, NULL);
+        [timer invalidate];
+    }];
+    [sheet showInView:[PhoneMainView instance].view];
 }
 
-- (void)actionSheet:(UIActionSheet *)actionSheet ofType:(enum CallDelegateType)type clickedButtonAtIndex:(NSInteger)buttonIndex withUserDatas:(void *)datas {
-    LinphoneCall* call = (LinphoneCall*)datas;
-    // maybe we could verify call validity
-
-    switch (type) {
-        case CD_ZRTP: {
-            if (buttonIndex == 0)
-                linphone_call_set_authentication_token_verified(call, YES);
-            else if (buttonIndex == 1)
-                linphone_call_set_authentication_token_verified(call, NO);
-            visibleActionSheet = nil;
-            break;
-        }
-        case CD_VIDEO_UPDATE: {
-            LinphoneCall* call = (LinphoneCall*)datas;
-            LinphoneCallParams* paramsCopy = linphone_call_params_copy(linphone_call_get_current_params(call));
-            if ([visibleActionSheet destructiveButtonIndex] == buttonIndex) {
-                // accept video
-                linphone_call_params_enable_video(paramsCopy, TRUE);
-                linphone_core_accept_call_update([LinphoneManager getLc], call, paramsCopy);
-            } else {
-                // decline video
-                [LinphoneLogger logc:LinphoneLoggerLog format:"User declined video proposal"];
-                linphone_core_accept_call_update([LinphoneManager getLc], call, NULL);
-            }
-            linphone_call_params_destroy(paramsCopy);
-            visibleActionSheet = nil;
-            break;
-        }
-        default:
-            [LinphoneLogger logc:LinphoneLoggerError format:"Unhandled CallDelegate event of type: %d received - ignoring", type];
-    }
+- (void)dismissVideoActionSheet:(NSTimer*)timer {
+     DTActionSheet *sheet = (DTActionSheet *)timer.userInfo;
+    [sheet dismissWithClickedButtonIndex:sheet.destructiveButtonIndex animated:TRUE];
 }
 
+
 @end

Classes/LinphoneAppDelegate.h

@@ -28,9 +28,11 @@
 @end
 
 @interface LinphoneAppDelegate : NSObject <UIApplicationDelegate,UIAlertViewDelegate> {
-    UIWindow *window;
+    @private
+	UIWindow *window;
     CTCallCenter* callCenter;
     BOOL started;
+	int savedMaxCall;
 }
 
 @property (assign) BOOL started;

Classes/LinphoneAppDelegate.m

@@ -248,12 +248,12 @@
 #pragma mark - PushNotification Functions
 
 - (void)application:(UIApplication*)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData*)deviceToken {
-    [LinphoneLogger log:LinphoneLoggerDebug format:@"PushNotification: Token %@", deviceToken];
+    [LinphoneLogger log:LinphoneLoggerLog format:@"PushNotification: Token %@", deviceToken];
     [[LinphoneManager instance] setPushNotificationToken:deviceToken];
 }
 
 - (void)application:(UIApplication*)application didFailToRegisterForRemoteNotificationsWithError:(NSError*)error {
-    [LinphoneLogger log:LinphoneLoggerDebug format:@"PushNotification: Error %@", error];
+    [LinphoneLogger log:LinphoneLoggerError format:@"PushNotification: Error %@", [error localizedDescription]];
     [[LinphoneManager instance] setPushNotificationToken:nil];
 }
 

Classes/LinphoneCoreSettingsStore.m

@@ -43,9 +43,9 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 		changedDict=[[NSMutableDictionary alloc] init];
 		[self transformLinphoneCoreToKeys];
         LinphoneCore *lc=[LinphoneManager getLc];
-		if (lp_config_get_int(linphone_core_get_config(lc),"app","config_migrated",0) == 0) {
+		if (lp_config_get_int(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY,"config_migrated",0) == 0) {
 			[self handleMigration];
-			lp_config_set_int(linphone_core_get_config(lc),"app","config_migrated",1);
+			lp_config_set_int(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY,"config_migrated",1);
 		}
 	}
 	return self;
@@ -103,7 +103,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 			[self setString: linphone_address_get_username(addr) forKey:@"username_preference"];
 			[self setString: linphone_address_get_domain(addr) forKey:@"domain_preference"];
             [self setInteger: linphone_proxy_config_get_expires(cfg) forKey:@"expire_preference"];
-			[self setString:linphone_proxy_config_get_dial_prefix(cfg) forKey:@"prefix_preference"];
+			[self setString: linphone_proxy_config_get_dial_prefix(cfg) forKey:@"prefix_preference"];
 			if (strcmp(linphone_address_get_domain(addr),linphone_address_get_domain(proxy_addr))!=0
 				|| port!=NULL){
 				char tmp[256]={0};
@@ -120,8 +120,10 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 			
 		}
 	} else {
-		[self setInteger: lp_config_get_int(linphone_core_get_config(lc),"default_values","reg_expires",600) forKey:@"expire_preference"];
+		[self setInteger: lp_config_get_int(linphone_core_get_config(lc),"default_values","reg_expires", 600) forKey:@"expire_preference"];
 	}
+    
+    [self setBool:lp_config_get_int(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "pushnotification_preference", 0) forKey:@"pushnotification_preference"];
     {
         LinphoneAddress *parsed = linphone_core_get_primary_contact_parsed(lc);
         if(parsed != NULL) {
@@ -187,21 +189,20 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 		}
 		[self setString:val forKey:@"media_encryption_preference"];
 	}
-    [self setString: lp_config_get_string(linphone_core_get_config(lc),"app","rotation_preference", "auto") forKey:@"rotation_preference"];
-	[self setBool: lp_config_get_int(linphone_core_get_config(lc),"app","enable_first_login_view_preference", 0) forKey:@"enable_first_login_view_preference"];
-	[self setBool: lp_config_get_int(linphone_core_get_config(lc),"app","debugenable_preference", 0) forKey:@"debugenable_preference"];
-	[self setBool: lp_config_get_int(linphone_core_get_config(lc),"app","animations_preference", 1) forKey:@"animations_preference"];
-	[self setBool: lp_config_get_int(linphone_core_get_config(lc),"app","check_config_disable_preference", 0) forKey:@"check_config_disable_preference"];
-	[self setBool: lp_config_get_int(linphone_core_get_config(lc),"app","wifi_only_preference", 0) forKey:@"wifi_only_preference"];
-	[self setString: lp_config_get_string(linphone_core_get_config(lc),"app","file_upload_url_preference",NULL) forKey:@"file_upload_url_preference"];
+    [self setString: lp_config_get_string(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "rotation_preference", "auto") forKey:@"rotation_preference"];
+	[self setBool: lp_config_get_int(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "enable_first_login_view_preference", 0) forKey:@"enable_first_login_view_preference"];
+	[self setBool: lp_config_get_int(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "debugenable_preference", 0) forKey:@"debugenable_preference"];
+	[self setBool: lp_config_get_int(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "animations_preference", 1) forKey:@"animations_preference"];
+	[self setBool: lp_config_get_int(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "wifi_only_preference", 0) forKey:@"wifi_only_preference"];
+	[self setString: lp_config_get_string(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "file_upload_url_preference", NULL) forKey:@"file_upload_url_preference"];
 	
 	/*keep this one also in the standardUserDefaults so that it can be read before starting liblinphone*/
 	BOOL start_at_boot = TRUE;
-	if ([[NSUserDefaults standardUserDefaults] objectForKey:@"start_at_boot_preference"]!=Nil)
+	if ([[NSUserDefaults standardUserDefaults] objectForKey:@"start_at_boot_preference"] != Nil)
         start_at_boot = [[NSUserDefaults standardUserDefaults]  boolForKey:@"start_at_boot_preference"];
 	[self setBool: start_at_boot forKey:@"start_at_boot_preference"];
 	BOOL background_mode = TRUE;
-	if ([[NSUserDefaults standardUserDefaults] objectForKey:@"backgroundmode_preference"]!=Nil)
+	if ([[NSUserDefaults standardUserDefaults] objectForKey:@"backgroundmode_preference"] != Nil)
         background_mode =[[NSUserDefaults standardUserDefaults]  boolForKey:@"backgroundmode_preference"];
 	[self setBool: background_mode forKey:@"backgroundmode_preference"];
 	
@@ -218,14 +219,15 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 		pol=linphone_core_get_video_policy(lc);
 		[self setBool:(pol->automatically_initiate) forKey:@"start_video_preference"];
         [self setBool:(pol->automatically_accept) forKey:@"accept_video_preference"];
-        [self setBool:lp_config_get_int(linphone_core_get_config(lc),"app","self_video_preference", 1) forKey:@"self_video_preference"];
+        [self setBool:linphone_core_self_view_enabled(lc) forKey:@"self_video_preference"];
+        [self setBool:linphone_core_video_preview_enabled(lc) forKey:@"preview_preference"];
 	}
     {
-        [self setBool: lp_config_get_int(linphone_core_get_config(lc),"app","sipinfo_dtmf_preference", 0) forKey:@"sipinfo_dtmf_preference"];
-        [self setBool: lp_config_get_int(linphone_core_get_config(lc),"app","rfc_dtmf_preference", 1) forKey:@"rfc_dtmf_preference"];
+        [self setBool: lp_config_get_int(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "sipinfo_dtmf_preference", 0) forKey:@"sipinfo_dtmf_preference"];
+        [self setBool: lp_config_get_int(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "rfc_dtmf_preference", 1) forKey:@"rfc_dtmf_preference"];
     }
     
-	if (lp_config_get_int(linphone_core_get_config(lc),"app","debugenable_preference",0))
+	if (lp_config_get_int(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "debugenable_preference",0))
 		linphone_core_enable_logs_with_cb((OrtpLogFunc)linphone_iphone_log_handler);
 	
 	[changedDict release];
@@ -352,9 +354,9 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 		}
 		
 		// configure proxy entries
-		linphone_proxy_config_set_identity(proxyCfg,identity);
-		linphone_proxy_config_set_server_addr(proxyCfg,proxy);
-		linphone_proxy_config_enable_register(proxyCfg,true);
+		linphone_proxy_config_set_identity(proxyCfg, identity);
+		linphone_proxy_config_set_server_addr(proxyCfg, proxy);
+		linphone_proxy_config_enable_register(proxyCfg, true);
 		
 
 		int expire = [self integerForKey:@"expire_preference"];
@@ -365,11 +367,11 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 		if (isWifiOnly && lLinphoneMgr.connectivity == wwan) {
 			linphone_proxy_config_expires(proxyCfg, 0);
 		} else {
-            linphone_proxy_config_expires(proxyCfg,expire);
+            linphone_proxy_config_expires(proxyCfg, expire);
 		}
 		
 		if (isOutboundProxy)
-			linphone_proxy_config_set_route(proxyCfg,proxy);
+			linphone_proxy_config_set_route(proxyCfg, proxy);
 		
 		if ([self objectForKey:@"prefix_preference"]) {		
 			NSString* prefix = [self stringForKey:@"prefix_preference"];
@@ -382,8 +384,10 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 			linphone_proxy_config_set_dial_escape_plus(proxyCfg,substitute_plus_by_00);
 		}
 		
+        BOOL pushnotification = [self boolForKey:@"pushnotification_preference"];
+        lp_config_set_int(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "pushnotification_preference", pushnotification);
         
-        [[LinphoneManager instance ]addPushTokenToProxyConfig : proxyCfg ];
+        [[LinphoneManager instance] addPushTokenToProxyConfig:proxyCfg];
         
 		linphone_core_add_proxy_config(lc,proxyCfg);
 		//set to default proxy
@@ -460,8 +464,8 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
     policy.automatically_accept = [self boolForKey:@"accept_video_preference"];
     policy.automatically_initiate = [self boolForKey:@"start_video_preference"];
     linphone_core_set_video_policy(lc, &policy);
-    lp_config_set_int(linphone_core_get_config(lc),"app","self_video_preference", [self boolForKey:@"self_video_preference"]);
-    
+    linphone_core_enable_self_view(lc, [self boolForKey:@"self_video_preference"]);
+    linphone_core_enable_video_preview(lc, [self boolForKey:@"preview_preference"]);
     
     // Primary contact
     NSString* displayname = [self stringForKey:@"primary_displayname_preference"];
@@ -493,21 +497,21 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 	} else {
 		isbackgroundModeEnabled = false;
 	}
-	lp_config_set_int(linphone_core_get_config(lc),"app","backgroundmode_preference", isbackgroundModeEnabled);
+	lp_config_set_int(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "backgroundmode_preference", isbackgroundModeEnabled);
 	
     BOOL firstloginview = [self boolForKey:@"enable_first_login_view_preference"];
-    lp_config_set_int(linphone_core_get_config(lc),"app","enable_first_login_view_preference", firstloginview);
+    lp_config_set_int(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "enable_first_login_view_preference", firstloginview);
     
     NSString *landscape = [self stringForKey:@"rotation_preference"];
-    lp_config_set_string(linphone_core_get_config(lc),"app","rotation_preference", [landscape UTF8String]);
+    lp_config_set_string(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "rotation_preference", [landscape UTF8String]);
     
 	BOOL debugmode = [self boolForKey:@"debugenable_preference"];
-	lp_config_set_int(linphone_core_get_config(lc),"app","debugenable_preference", debugmode);
+	lp_config_set_int(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "debugenable_preference", debugmode);
 	if (debugmode) linphone_core_enable_logs_with_cb((OrtpLogFunc)linphone_iphone_log_handler);
 	else linphone_core_disable_logs();
     
     BOOL animations = [self boolForKey:@"animations_preference"];
-	lp_config_set_int(linphone_core_get_config(lc),"app","animations_preference", animations);
+	lp_config_set_int(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "animations_preference", animations);
 	NSString*  file_upload_url= [self stringForKey:@"file_upload_url_preference"];
 	[[LinphoneManager instance] lpConfigSetString:file_upload_url forKey:@"file_upload_url_preference"];
 	

Classes/LinphoneManager.h

@@ -31,6 +31,9 @@
 
 #include "linphonecore.h"
 
+extern const char *const LINPHONERC_APPLICATION_KEY;
+
+extern NSString *const kLinphoneCoreUpdate;
 extern NSString *const kLinphoneDisplayStatusUpdate;
 extern NSString *const kLinphoneTextReceived;
 extern NSString *const kLinphoneCallUpdate;
@@ -115,14 +118,18 @@ typedef struct _LinphoneManagerSounds {
 
 - (void)call:(NSString *)address displayName:(NSString*)displayName transfer:(BOOL)transfer;
 
--(void)lpConfigSetString:(NSString*) value forKey:(NSString*) key; 
--(NSString*)lpConfigStringForKey:(NSString*) key;
-
--(void)lpConfigSetInt:(NSInteger) value forKey:(NSString*) key; 
--(NSInteger)lpConfigIntForKey:(NSString*) key;
-
--(void)lpConfigSetBool:(BOOL) value forKey:(NSString*) key; 
--(BOOL)lpConfigBoolForKey:(NSString*) key;
+- (void)lpConfigSetString:(NSString*)value forKey:(NSString*)key;
+- (NSString*)lpConfigStringForKey:(NSString*)key;
+- (void)lpConfigSetString:(NSString*)value forKey:(NSString*)key forSection:(NSString*)section;
+- (NSString*)lpConfigStringForKey:(NSString*)key forSection:(NSString*)section;
+- (void)lpConfigSetInt:(NSInteger)value forKey:(NSString*)key;
+- (NSInteger)lpConfigIntForKey:(NSString*)key;
+- (void)lpConfigSetInt:(NSInteger)value forKey:(NSString*)key forSection:(NSString*)section;
+- (NSInteger)lpConfigIntForKey:(NSString*)key forSection:(NSString*)section;
+- (void)lpConfigSetBool:(BOOL)value forKey:(NSString*)key; 
+- (BOOL)lpConfigBoolForKey:(NSString*)key;
+- (void)lpConfigSetBool:(BOOL)value forKey:(NSString*)key forSection:(NSString*)section;
+- (BOOL)lpConfigBoolForKey:(NSString*)key forSection:(NSString*)section;
 
 @property (readonly) FastAddressBook* fastAddressBook;
 @property Connectivity connectivity;

Classes/LinphoneManager.m

@@ -44,6 +44,9 @@ static void audioRouteChangeListenerCallback (
 static LinphoneCore* theLinphoneCore = nil;
 static LinphoneManager* theLinphoneManager = nil;
 
+const char *const LINPHONERC_APPLICATION_KEY = "app";
+
+NSString *const kLinphoneCoreUpdate = @"kLinphoneCoreUpdate";
 NSString *const kLinphoneDisplayStatusUpdate = @"LinphoneDisplayStatusUpdate";
 NSString *const kLinphoneTextReceived = @"LinphoneTextReceived";
 NSString *const kLinphoneCallUpdate = @"LinphoneCallUpdate";
@@ -419,9 +422,9 @@ static void linphone_iphone_registration_state(LinphoneCore *lc, LinphoneProxyCo
 
 #pragma mark - Text Received Functions
 
-- (void)onTextReceived:(LinphoneCore *)lc room:(LinphoneChatRoom *)room from:(const LinphoneAddress *)from message:(const char *)message {
+- (void)onMessageReceived:(LinphoneCore *)lc room:(LinphoneChatRoom *)room  message:(LinphoneChatMessage*)msg {
     
-    char *fromStr = linphone_address_as_string_uri_only(from);
+    char *fromStr = linphone_address_as_string_uri_only(linphone_chat_message_get_from(msg));
     if(fromStr == NULL)
         return;
     
@@ -429,27 +432,35 @@ static void linphone_iphone_registration_state(LinphoneCore *lc, LinphoneProxyCo
     ChatModel *chat = [[ChatModel alloc] init];
     [chat setLocalContact:@""];
     [chat setRemoteContact:[NSString stringWithUTF8String:fromStr]];
-    [chat setMessage:[NSString stringWithUTF8String:message]];
-    [chat setDirection:[NSNumber numberWithInt:1]];
+    if (linphone_chat_message_get_external_body_url(msg)) {
+		[chat setMessage:NSLocalizedString(@"Incoming file",nil)];
+	} else {
+		[chat setMessage:[NSString stringWithUTF8String:linphone_chat_message_get_text(msg)]];
+    }
+	[chat setDirection:[NSNumber numberWithInt:1]];
     [chat setTime:[NSDate date]];
     [chat setRead:[NSNumber numberWithInt:0]];
     [chat create];
     
     ms_free(fromStr);
-    
+    NSString* ext_body_url=nil;
+	if (linphone_chat_message_get_external_body_url(msg)) {
+		ext_body_url=[NSString stringWithUTF8String:linphone_chat_message_get_external_body_url(msg)];
+	}
     // Post event
     NSDictionary* dict = [NSDictionary dictionaryWithObjectsAndKeys:
-                           [NSValue valueWithPointer:room], @"room", 
-                           [NSValue valueWithPointer:from], @"from",
-                           [NSString stringWithUTF8String:message], @"message", 
-                           chat, @"chat", 
+							[NSValue valueWithPointer:room], @"room", 
+							[NSValue valueWithPointer:linphone_chat_message_get_from(msg)], @"from",
+							chat.message, @"message", 
+							chat, @"chat",
+							ext_body_url,@"external_body_url",
                            nil];
     [[NSNotificationCenter defaultCenter] postNotificationName:kLinphoneTextReceived object:self userInfo:dict];
     [chat release];
 }
 
-static void linphone_iphone_text_received(LinphoneCore *lc, LinphoneChatRoom *room, const LinphoneAddress *from, const char *message) {
-    [(LinphoneManager*)linphone_core_get_user_data(lc) onTextReceived:lc room:room from:from message:message];
+static void linphone_iphone_message_received(LinphoneCore *lc, LinphoneChatRoom *room, LinphoneChatMessage *message) {
+    [(LinphoneManager*)linphone_core_get_user_data(lc) onMessageReceived:lc room:room message:message];
 }
 
 
@@ -505,7 +516,7 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
 			[LinphoneManager kickOffNetworkConnection];
 		} else {
 			Connectivity  newConnectivity;
-			BOOL isWifiOnly = lp_config_get_int(linphone_core_get_config([LinphoneManager getLc]),"app","wifi_only_preference",FALSE);
+			BOOL isWifiOnly = lp_config_get_int(linphone_core_get_config([LinphoneManager getLc]), LINPHONERC_APPLICATION_KEY, "wifi_only_preference",FALSE);
             if (!ctx || ctx->testWWan)
                 newConnectivity = flags & kSCNetworkReachabilityFlagsIsWWAN ? wwan:wifi;
             else
@@ -579,7 +590,8 @@ static LinphoneCoreVTable linphonec_vtable = {
 	.display_message=linphone_iphone_log,
 	.display_warning=linphone_iphone_log,
 	.display_url=NULL,
-	.text_received=linphone_iphone_text_received,
+	.text_received=NULL,
+	.message_received=linphone_iphone_message_received,
 	.dtmf_received=NULL,
     .transfer_state_changed=linphone_iphone_transfer_state_changed
 };
@@ -592,13 +604,11 @@ static LinphoneCoreVTable linphonec_vtable = {
 - (void)startLibLinphone {
 	
 	//get default config from bundle
-	NSBundle* myBundle = [NSBundle mainBundle];
-	NSString* factoryConfig = [myBundle pathForResource:[LinphoneManager runningOnIpad]?@"linphonerc-factory~ipad":@"linphonerc-factory" ofType:nil] ;
-	NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-	NSString *confiFileName = [[paths objectAtIndex:0] stringByAppendingString:@"/.linphonerc"];
-	NSString *zrtpSecretsFileName = [[paths objectAtIndex:0] stringByAppendingString:@"/zrtp_secrets"];
-	const char* lRootCa = [[myBundle pathForResource:@"rootca"ofType:@"pem"] cStringUsingEncoding:[NSString defaultCStringEncoding]];
-	connectivity=none;
+	NSString* factoryConfig = [LinphoneManager bundleFile:[LinphoneManager runningOnIpad]?@"linphonerc-factory~ipad":@"linphonerc-factory"];
+	NSString *confiFileName = [LinphoneManager documentFile:@".linphonerc"];
+	NSString *zrtpSecretsFileName = [LinphoneManager documentFile:@"zrtp_secrets"];
+	const char* lRootCa = [[LinphoneManager bundleFile:@"rootca.pem"] cStringUsingEncoding:[NSString defaultCStringEncoding]];
+	connectivity = none;
 	signal(SIGPIPE, SIG_IGN);
 	//log management	
 	
@@ -624,17 +634,16 @@ static LinphoneCoreVTable linphonec_vtable = {
 										 , [confiFileName cStringUsingEncoding:[NSString defaultCStringEncoding]]
 										 , [factoryConfig cStringUsingEncoding:[NSString defaultCStringEncoding]]
 										 ,self);
-    
-	
+
 	fastAddressBook = [[FastAddressBook alloc] init];
 	
     linphone_core_set_root_ca(theLinphoneCore, lRootCa);
 	// Set audio assets
-	const char* lRing = [[myBundle pathForResource:@"ring"ofType:@"wav"] cStringUsingEncoding:[NSString defaultCStringEncoding]];
-	linphone_core_set_ring(theLinphoneCore, lRing );
-	const char* lRingBack = [[myBundle pathForResource:@"ringback"ofType:@"wav"] cStringUsingEncoding:[NSString defaultCStringEncoding]];
+	const char* lRing = [[LinphoneManager bundleFile:@"ring.wab"] cStringUsingEncoding:[NSString defaultCStringEncoding]];
+	linphone_core_set_ring(theLinphoneCore, lRing);
+	const char* lRingBack = [[LinphoneManager bundleFile:@"ringback.wav"] cStringUsingEncoding:[NSString defaultCStringEncoding]];
 	linphone_core_set_ringback(theLinphoneCore, lRingBack);
-    const char* lPlay = [[myBundle pathForResource:@"hold"ofType:@"wav"] cStringUsingEncoding:[NSString defaultCStringEncoding]];
+    const char* lPlay = [[LinphoneManager bundleFile:@"hold.wav"] cStringUsingEncoding:[NSString defaultCStringEncoding]];
 	linphone_core_set_play_file(theLinphoneCore, lPlay);
 	
 	linphone_core_set_zrtp_secrets_file(theLinphoneCore, [zrtpSecretsFileName cStringUsingEncoding:[NSString defaultCStringEncoding]]);
@@ -664,7 +673,7 @@ static LinphoneCoreVTable linphonec_vtable = {
         [error release];
 	}
     
-    NSString* path = [myBundle pathForResource:@"nowebcamCIF" ofType:@"jpg"];
+    NSString* path = [LinphoneManager bundleFile:@"nowebcamCIF.jpg"];
     if (path) {
         const char* imagePath = [path cStringUsingEncoding:[NSString defaultCStringEncoding]];
         [LinphoneLogger logc:LinphoneLoggerLog format:"Using '%s' as source image for no webcam", imagePath];
@@ -713,7 +722,11 @@ static LinphoneCoreVTable linphonec_vtable = {
 		&& [UIApplication sharedApplication].applicationState ==  UIApplicationStateBackground) {
 		//go directly to bg mode
 		[self resignActive];
-	}	
+	}
+    
+    // Post event
+    NSDictionary *dict = [NSDictionary dictionaryWithObject:[NSValue valueWithPointer:theLinphoneCore] forKey:@"core"];
+    [[NSNotificationCenter defaultCenter] postNotificationName:kLinphoneCoreUpdate object:[LinphoneManager instance] userInfo:dict];
 }
 
 - (void)destroyLibLinphone {
@@ -725,6 +738,11 @@ static LinphoneCoreVTable linphonec_vtable = {
         [LinphoneLogger logc:LinphoneLoggerLog format:"Destroy linphonecore"];
 		linphone_core_destroy(theLinphoneCore);
 		theLinphoneCore = nil;
+        
+        // Post event
+        NSDictionary *dict = [NSDictionary dictionaryWithObject:[NSValue valueWithPointer:theLinphoneCore] forKey:@"core"];
+        [[NSNotificationCenter defaultCenter] postNotificationName:kLinphoneCoreUpdate object:[LinphoneManager instance] userInfo:dict];
+        
         SCNetworkReachabilityUnscheduleFromRunLoop(proxyReachability, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
         if (proxyReachability)
             CFRelease(proxyReachability);
@@ -991,9 +1009,9 @@ static void audioRouteChangeListenerCallback (
     }
 }
 
-- (void)addPushTokenToProxyConfig: (LinphoneProxyConfig*)proxyCfg{
+- (void)addPushTokenToProxyConfig:(LinphoneProxyConfig*)proxyCfg{
 	NSData *tokenData =  pushNotificationToken;
-	if(tokenData != nil) {
+	if(tokenData != nil && [self lpConfigBoolForKey:@"pusnotification_preference"]) {
 		const unsigned char *tokenBuffer = [tokenData bytes];
 		NSMutableString *tokenString = [NSMutableString stringWithCapacity:[tokenData length]*2];
 		for(int i = 0; i < [tokenData length]; ++i) {
@@ -1052,34 +1070,62 @@ static void audioRouteChangeListenerCallback (
 }
 
 
+#pragma mark - LPConfig Functions
 
-
-
--(void)lpConfigSetString:(NSString*) value forKey:(NSString*) key {
-	lp_config_set_string(linphone_core_get_config(theLinphoneCore),"app",[key UTF8String], value?[value UTF8String]:NULL);
+- (void)lpConfigSetString:(NSString*)value forKey:(NSString*)key {
+    [self lpConfigSetString:value forKey:key forSection:[NSString stringWithUTF8String:LINPHONERC_APPLICATION_KEY]];
 }
--(NSString*)lpConfigStringForKey:(NSString*) key {
-	if (!theLinphoneCore) {
-		[LinphoneLogger log:LinphoneLoggerError format:@"cannot read configuration because linphone core not ready yet"];
-		return nil;
-	};
-	const char* value=lp_config_get_string(linphone_core_get_config(theLinphoneCore),"app",[key UTF8String],NULL);	
-	if (value) 
-		return [NSString stringWithCString:value encoding:[NSString defaultCStringEncoding]];
+
+- (void)lpConfigSetString:(NSString*)value forKey:(NSString*)key forSection:(NSString *)section {
+	if (!key) return;
+	lp_config_set_string(linphone_core_get_config(theLinphoneCore), [section UTF8String], [key UTF8String], value?[value UTF8String]:NULL);
+}
+
+- (NSString*)lpConfigStringForKey:(NSString*)key {
+    return [self lpConfigStringForKey:key forSection:[NSString stringWithUTF8String:LINPHONERC_APPLICATION_KEY]];
+}
+
+- (NSString*)lpConfigStringForKey:(NSString*)key forSection:(NSString *)section {
+    if (!key) return nil;
+	const char* value = lp_config_get_string(linphone_core_get_config(theLinphoneCore), [section UTF8String], [key UTF8String], NULL);
+	if (value)
+		return [NSString stringWithUTF8String:value];
 	else
 		return nil;
 }
--(void)lpConfigSetInt:(NSInteger) value forKey:(NSString*) key {
-	lp_config_set_int(linphone_core_get_config(theLinphoneCore),"app",[key UTF8String], value );
-}
--(NSInteger)lpConfigIntForKey:(NSString*) key {
-	return lp_config_get_int(linphone_core_get_config(theLinphoneCore),"app",[key UTF8String],-1);
+
+- (void)lpConfigSetInt:(NSInteger)value forKey:(NSString*)key {
+    [self lpConfigSetInt:value forKey:key forSection:[NSString stringWithUTF8String:LINPHONERC_APPLICATION_KEY]];
 }
 
--(void)lpConfigSetBool:(BOOL) value forKey:(NSString*) key {
-	return [self lpConfigSetInt:(NSInteger)(value==TRUE) forKey:key];
+- (void)lpConfigSetInt:(NSInteger)value forKey:(NSString*)key forSection:(NSString *)section {
+    if (!key) return;
+	lp_config_set_int(linphone_core_get_config(theLinphoneCore), [section UTF8String], [key UTF8String], value );
 }
--(BOOL)lpConfigBoolForKey:(NSString*) key {
-	return [self lpConfigIntForKey:key] == 1;		
+
+- (NSInteger)lpConfigIntForKey:(NSString*)key {
+    return [self lpConfigIntForKey:key forSection:[NSString stringWithUTF8String:LINPHONERC_APPLICATION_KEY]];
 }
+
+- (NSInteger)lpConfigIntForKey:(NSString*)key forSection:(NSString *)section {
+    if (!key) return -1;
+	return lp_config_get_int(linphone_core_get_config(theLinphoneCore), [section UTF8String], [key UTF8String], -1);
+}
+
+- (void)lpConfigSetBool:(BOOL)value forKey:(NSString*)key {
+    [self lpConfigSetBool:value forKey:key forSection:[NSString stringWithUTF8String:LINPHONERC_APPLICATION_KEY]];
+}
+
+- (void)lpConfigSetBool:(BOOL)value forKey:(NSString*)key forSection:(NSString *)section {
+	return [self lpConfigSetInt:(NSInteger)(value == TRUE) forKey:key forSection:section];
+}
+
+- (BOOL)lpConfigBoolForKey:(NSString*)key {
+    return [self lpConfigBoolForKey:key forSection:[NSString stringWithUTF8String:LINPHONERC_APPLICATION_KEY]];
+}
+
+- (BOOL)lpConfigBoolForKey:(NSString*)key forSection:(NSString *)section {
+	return [self lpConfigIntForKey:key forSection:section] == 1;
+}
+
 @end

Classes/LinphoneUI/UICamSwitch.m

@@ -82,15 +82,14 @@
         return;
     }
 	if (nextCamId != currentCamId) {
-		[LinphoneLogger logc:LinphoneLoggerLog format:"Switching from [%s] to [%s]",currentCamId,nextCamId];
+		[LinphoneLogger logc:LinphoneLoggerLog format:"Switching from [%s] to [%s]", currentCamId, nextCamId];
 		linphone_core_set_video_device([LinphoneManager getLc], nextCamId);
-		nextCamId=currentCamId;
+		nextCamId = currentCamId;
 		currentCamId = linphone_core_get_video_device([LinphoneManager getLc]);
-		linphone_core_update_call([LinphoneManager getLc]
-								  , linphone_core_get_current_call([LinphoneManager getLc])
-								  , NULL);
-		/*linphone_core_set_native_preview_window_id([LinphoneManager getLc],
-                                                   (unsigned long)preview);*/
+        LinphoneCall *call = linphone_core_get_current_call([LinphoneManager getLc]);
+        if(call != NULL) {
+            linphone_core_update_call([LinphoneManager getLc], call, NULL);
+        }
 	}
 }
 

Classes/LinphoneUI/UIChatCell.m

@@ -63,7 +63,14 @@
 #pragma mark - Property Funcitons
 
 - (void)setChat:(ChatModel *)achat {
-    chat = achat;
+    if(chat == achat)
+        return;
+    if(chat != nil) {
+        [chat release];
+    }
+    if(achat) {
+        chat = [achat retain];
+    }
     [self update];
 }
 

Classes/LinphoneUI/UICompositeViewController.m

@@ -253,10 +253,12 @@
 #pragma mark - Event Functions
 
 - (void)orientationDidChange:(NSNotification*)notif {
-    // Update rotation
-    UIInterfaceOrientation correctOrientation = [self getCorrectInterfaceOrientation:[[UIDevice currentDevice] orientation]];
-    if(currentOrientation != correctOrientation) {
-        [PhoneMainView setOrientation:correctOrientation animated:currentOrientation!=UIDeviceOrientationUnknown];
+    if([LinphoneManager isLcReady]) {
+        // Update rotation
+        UIInterfaceOrientation correctOrientation = [self getCorrectInterfaceOrientation:[[UIDevice currentDevice] orientation]];
+        if(currentOrientation != correctOrientation) {
+            [PhoneMainView setOrientation:correctOrientation animated:currentOrientation != UIDeviceOrientationUnknown];
+        }
     }
 }
 

Classes/LinphoneUI/UIContactDetailsHeader.h

@@ -20,10 +20,10 @@
 #import <UIKit/UIKit.h>
 #import <AddressBook/AddressBook.h>
 
-#import "ContactDetailsImagePickerController.h"
+#import "ImagePickerViewController.h"
 #import "ContactDetailsDelegate.h"
 
-@interface UIContactDetailsHeader : UIViewController<UITableViewDelegate, UITableViewDataSource, UITextFieldDelegate, ContactDetailsImagePickerDelegate> {
+@interface UIContactDetailsHeader : UIViewController<UITableViewDelegate, UITableViewDataSource, UITextFieldDelegate, ImagePickerDelegate> {
     @private
     NSArray *propertyList;
     BOOL editing;

Classes/LinphoneUI/UIContactDetailsHeader.m

@@ -243,19 +243,28 @@
 
 - (IBAction)onAvatarClick:(id)event {
     if(self.isEditing) {
-        ContactDetailsImagePickerController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[ContactDetailsImagePickerController compositeViewDescription] push:TRUE], ContactDetailsImagePickerController);
-        if(controller != nil) {
-            [controller setAllowsEditing:TRUE];
-            [controller setSourceType:UIImagePickerControllerSourceTypePhotoLibrary];
-            [controller setImagePickerDelegate:self];
-        }
+        [ImagePickerViewController promptSelectSource:^(UIImagePickerControllerSourceType type) {
+            ImagePickerViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[ImagePickerViewController compositeViewDescription] push:TRUE], ImagePickerViewController);
+            if(controller != nil) {
+                controller.sourceType = type;
+                
+                // Displays a control that allows the user to choose picture or
+                // movie capture, if both are available:
+                controller.mediaTypes = [UIImagePickerController availableMediaTypesForSourceType:type];
+                
+                // Hides the controls for moving & scaling pictures, or for
+                // trimming movies. To instead show the controls, use YES.
+                controller.allowsEditing = NO;
+                controller.imagePickerDelegate = self;
+            }
+        }];
     }
 }
 
 
 #pragma mark - ContactDetailsImagePickerDelegate Functions
 
-- (void)changeContactImage:(UIImage*)image {
+- (void)imagePickerDelegateImage:(UIImage*)image {
     NSError* error = NULL;
     if(!ABPersonRemoveImageData(contact, (CFErrorRef*)error)) {
         [LinphoneLogger log:LinphoneLoggerLog format:@"Can't add entry: %@", [error localizedDescription]];

Classes/LinphoneUI/UIStateBar.m

@@ -178,12 +178,12 @@ NSTimer *callSecurityTimer;
     BOOL security = true;
     
     if(![LinphoneManager isLcReady]) {
-        [callSecurityImage setHidden: true];
+        [callSecurityImage setHidden:true];
         return;
     }
     const MSList *list = linphone_core_get_calls([LinphoneManager getLc]);
     if(list == NULL) {
-        [callSecurityImage setHidden: true];
+        [callSecurityImage setHidden:true];
         return;
     }
     while(list != NULL) {
@@ -229,10 +229,10 @@ NSTimer *callSecurityTimer;
         }
     }
     if(image != nil) {
-        [callQualityImage setHidden: false];
-        [callQualityImage setImage: image];
+        [callQualityImage setHidden:false];
+        [callQualityImage setImage:image];
     } else {
-        [callQualityImage setHidden: true];
+        [callQualityImage setHidden:true];
     }
 }
 

Classes/PhoneMainView.h

@@ -30,7 +30,7 @@
 #import "ContactsViewController.h"
 #import "ContactDetailsViewController.h"
 #import "ContactDetailsLabelViewController.h"
-#import "ContactDetailsImagePickerController.h"
+#import "ImagePickerViewController.h"
 #import "HistoryViewController.h"
 #import "HistoryDetailsViewController.h"
 #import "InCallViewController.h"
@@ -39,10 +39,10 @@
 #import "WizardViewController.h"
 #import "IncomingCallViewController.h"
 #import "ConsoleViewController.h"
+#import "ImageViewController.h"
 
-@interface PhoneMainView : UIViewController<CallActionSheetDelegate, IncomingCallViewDelegate> {
+@interface PhoneMainView : UIViewController<IncomingCallViewDelegate> {
     @private
-    UIActionSheet *batteryActionSheet;
     int loadCount;
     NSMutableArray *viewStack;
     NSMutableArray *inhibitedEvents;

Classes/PhoneMainView.m

@@ -23,6 +23,7 @@
 #import "LinphoneAppDelegate.h"
 #import "PhoneMainView.h"
 #import "Utils.h"
+#import "DTActionSheet.h"
 
 static PhoneMainView* phoneMainViewInstance=nil;
 
@@ -31,9 +32,6 @@ static PhoneMainView* phoneMainViewInstance=nil;
 @synthesize mainViewController;
 @synthesize currentView;
 
-// TO READ
-// If a Controller set wantFullScreenLayout then DON'T set the autoresize!
-// So DON'T set autoresize for PhoneMainView
 
 #pragma mark - Lifecycle Functions
 
@@ -247,6 +245,7 @@ static PhoneMainView* phoneMainViewInstance=nil;
 - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
     [super willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration];
     [mainViewController willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration];
+    [self orientationUpdate:toInterfaceOrientation];
 }
 
 - (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
@@ -371,6 +370,35 @@ static PhoneMainView* phoneMainViewInstance=nil;
 
 #pragma mark - 
 
+- (void)orientationUpdate:(UIInterfaceOrientation)orientation {
+    int oldLinphoneOrientation = linphone_core_get_device_rotation([LinphoneManager getLc]);
+    int newRotation = 0;
+    switch (orientation) {
+        case UIInterfaceOrientationPortrait:
+            newRotation = 0;
+            break;
+        case UIInterfaceOrientationPortraitUpsideDown:
+            newRotation = 180;
+            break;
+        case UIInterfaceOrientationLandscapeRight:
+            newRotation = 270;
+            break;
+        case UIInterfaceOrientationLandscapeLeft:
+            newRotation = 90;
+            break;
+        default:
+            newRotation = oldLinphoneOrientation;
+    }
+    if (oldLinphoneOrientation != newRotation) {
+        linphone_core_set_device_rotation([LinphoneManager getLc], newRotation);
+        LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]);
+        if (call && linphone_call_params_video_enabled(linphone_call_get_current_params(call))) {
+            //Orientation has changed, must call update call
+            linphone_core_update_call([LinphoneManager getLc], call, NULL);
+        }
+    }
+}
+
 - (void)startUp {   
     if ([[LinphoneManager instance] lpConfigBoolForKey:@"enable_first_login_view_preference"]  == true) {
         // Change to fist login view
@@ -381,7 +409,10 @@ static PhoneMainView* phoneMainViewInstance=nil;
         if(list != NULL) {
             [self changeCurrentView: [DialerViewController compositeViewDescription]];
         } else {
-            [self changeCurrentView: [WizardViewController compositeViewDescription]];
+            WizardViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[WizardViewController compositeViewDescription]], WizardViewController);
+            if(controller != nil) {
+                [controller reset];
+            }
         }
     }
     
@@ -674,7 +705,7 @@ static PhoneMainView* phoneMainViewInstance=nil;
 }
 
 - (void)batteryLevelChanged:(NSNotification*)notif {
-	if (! [LinphoneManager isLcReady]) return;
+	if (![LinphoneManager isLcReady]) return;
     LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]);
     if (!call || !linphone_call_params_video_enabled(linphone_call_get_current_params(call)))
         return;
@@ -683,48 +714,17 @@ static PhoneMainView* phoneMainViewInstance=nil;
         float level = [UIDevice currentDevice].batteryLevel;
         [LinphoneLogger logc:LinphoneLoggerLog format:"Video call is running. Battery level: %.2f", level];
         if (level < 0.1 && !appData->batteryWarningShown) {
-            // notify user
-            CallDelegate* cd = [[CallDelegate alloc] init];
-            cd.eventType = CD_STOP_VIDEO_ON_LOW_BATTERY;
-            cd.delegate = self;
-            cd.call = call;
-            
-            if (batteryActionSheet != nil) {
-                [batteryActionSheet dismissWithClickedButtonIndex:batteryActionSheet.cancelButtonIndex animated:TRUE];
-            }
-            NSString* title = NSLocalizedString(@"Battery is running low. Stop video ?",nil);
-            batteryActionSheet = [[UIActionSheet alloc] initWithTitle:title
-                                                             delegate:cd 
-                                                    cancelButtonTitle:NSLocalizedString(@"Continue video",nil) 
-                                               destructiveButtonTitle:NSLocalizedString(@"Stop video",nil) 
-                                                    otherButtonTitles:nil];
-            
-            batteryActionSheet.actionSheetStyle = UIActionSheetStyleDefault;
-            [batteryActionSheet showInView: self.view];
-            [batteryActionSheet release];
-            appData->batteryWarningShown = TRUE;
-        }
-    }
-}
-
-- (void)actionSheet:(UIActionSheet *)actionSheet ofType:(enum CallDelegateType)type 
-                                   clickedButtonAtIndex:(NSInteger)buttonIndex 
-                                          withUserDatas:(void *)datas {
-    switch(type) {
-        case CD_STOP_VIDEO_ON_LOW_BATTERY: 
-        {
-            LinphoneCall* call = (LinphoneCall*)datas;
-            LinphoneCallParams* paramsCopy = linphone_call_params_copy(linphone_call_get_current_params(call));
-            if (buttonIndex == [batteryActionSheet destructiveButtonIndex]) {
+            DTActionSheet *sheet = [[[DTActionSheet alloc] initWithTitle:NSLocalizedString(@"Battery is running low. Stop video ?",nil)] autorelease];
+            [sheet addCancelButtonWithTitle:NSLocalizedString(@"Continue video", nil)];
+            [sheet addDestructiveButtonWithTitle:NSLocalizedString(@"Stop video", nil) block:^() {
+                LinphoneCallParams* paramsCopy = linphone_call_params_copy(linphone_call_get_current_params(call));
                 // stop video
                 linphone_call_params_enable_video(paramsCopy, FALSE);
                 linphone_core_update_call([LinphoneManager getLc], call, paramsCopy);
-            }
-            batteryActionSheet = nil;
-            break;
+            }];
+            [sheet showInView:self.view];
+            appData->batteryWarningShown = TRUE;
         }
-        default:
-            break;
     }
 }
 

Classes/SettingsViewController.m

@@ -31,6 +31,15 @@
 #import "IASKTextField.h"
 #include "lpconfig.h"
 
+#ifdef DEBUG
+@interface UIDevice (debug)
+
+- (void)_setBatteryLevel:(float)level;
+- (void)_setBatteryState:(int)state;
+
+@end
+#endif
+
 #pragma mark - IASKSwitchEx Class
 
 @interface IASKSwitchEx : DCRoundSwitch {
@@ -381,7 +390,6 @@ static UICompositeViewDescription *compositeDescription = nil;
     [super viewDidLoad];
 	
 	settingsStore = [[LinphoneCoreSettingsStore alloc] init];
-	[settingsStore transformLinphoneCoreToKeys];
 	
     settingsController.showDoneButton = FALSE;
     settingsController.delegate = self;
@@ -407,6 +415,10 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
+    
+    [settingsStore transformLinphoneCoreToKeys]; // Sync settings with linphone core settings
+    [settingsController.tableView reloadData];	
+    
     // Set observer
     [[NSNotificationCenter defaultCenter] addObserver:self 
                                              selector:@selector(appSettingChanged:) 
@@ -478,6 +490,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 #ifndef DEBUG
     [hiddenKeys addObject:@"release_button"];
     [hiddenKeys addObject:@"clear_cache_button"];
+    [hiddenKeys addObject:@"battery_alert_button"];
 #endif
     
     [hiddenKeys addObject:@"quit_button"]; // Hide for the moment
@@ -520,10 +533,13 @@ static UICompositeViewDescription *compositeDescription = nil;
         [hiddenKeys addObject:@"console_button"];
     }
     
+    if(![LinphoneManager runningOnIpad]) {
+        [hiddenKeys addObject:@"preview_preference"];
+    }
+    
     return hiddenKeys;
 }
 
-
 #pragma mark - IASKSettingsDelegate Functions
 
 - (void)settingsViewControllerDidEnd:(IASKAppSettingsViewController *)sender {
@@ -539,10 +555,19 @@ static UICompositeViewDescription *compositeDescription = nil;
         [LinphoneManager instanceRelease];
     } else  if([key isEqual:@"clear_cache_button"]) {
         [[PhoneMainView instance].mainViewController clearCache];
+    } else  if([key isEqual:@"battery_alert_button"]) {
+        [[UIDevice currentDevice] _setBatteryState:UIDeviceBatteryStateUnplugged];
+        [[UIDevice currentDevice] _setBatteryLevel:0.09f];
+        [[NSNotificationCenter defaultCenter] postNotificationName:UIDeviceBatteryLevelDidChangeNotification object:self];
     }
 #endif
     if([key isEqual:@"console_button"]) {
         [[PhoneMainView instance] changeCurrentView:[ConsoleViewController compositeViewDescription] push:TRUE];
+    } else if([key isEqual:@"wizard_button"]) {
+        WizardViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[WizardViewController compositeViewDescription]], WizardViewController);
+        if(controller != nil) {
+            [controller reset];
+        }
     }
 }
 @end

Classes/Utils/DTFoundation/DTActionSheet.h

@@ -0,0 +1,49 @@
+//
+//  DTActionSheet.h
+//  DTFoundation
+//
+//  Created by Oliver Drobnik on 08.06.12.
+//  Copyright (c) 2012 Cocoanetics. All rights reserved.
+//
+
+typedef void (^DTActionSheetBlock)(void);
+
+/**
+ Extends UIActionSheet with support for blocks
+ */
+
+@interface DTActionSheet : UIActionSheet
+
+/**
+ Initializes the action sheet using the specified title. 
+ */
+- (id)initWithTitle:(NSString *)title;
+
+/**
+ Adds a custom button to the action sheet.
+ @param title The title of the new button.
+ @param block The block to execute when the button is tapped.
+ @returns The index of the new button. Button indices start at 0 and increase in the order they are added.
+*/ 
+- (NSInteger)addButtonWithTitle:(NSString *)title block:(DTActionSheetBlock)block;
+
+/**
+ Adds a custom destructive button to the action sheet.
+ 
+ Since there can only be one destructive button a previously marked destructive button becomes a normal button.
+ @param title The title of the new button.
+ @param block The block to execute when the button is tapped.
+ @returns The index of the new button. Button indices start at 0 and increase in the order they are added.
+ */ 
+- (NSInteger)addDestructiveButtonWithTitle:(NSString *)title block:(DTActionSheetBlock)block;
+
+/**
+ Adds a custom cancel button to the action sheet.
+ 
+ Since there can only be one cancel button a previously marked cancel button becomes a normal button.
+ @param title The title of the new button.
+ @returns The index of the new button. Button indices start at 0 and increase in the order they are added.
+ */ 
+- (NSInteger)addCancelButtonWithTitle:(NSString *)title;
+
+@end

Classes/Utils/DTFoundation/DTActionSheet.m

@@ -0,0 +1,191 @@
+//
+//  DTActionSheet.m
+//  DTFoundation
+//
+//  Created by Oliver Drobnik on 08.06.12.
+//  Copyright (c) 2012 Cocoanetics. All rights reserved.
+//
+
+#import "DTActionSheet.h"
+
+@interface DTActionSheet () <UIActionSheetDelegate>
+
+@end
+
+@implementation DTActionSheet
+{
+	id <UIActionSheetDelegate> _externalDelegate;
+	
+	NSMutableDictionary *_actionsPerIndex;
+	
+	// lookup bitmask what delegate methods are implemented
+	struct 
+	{
+		unsigned int delegateSupportsActionSheetCancel:1;
+		unsigned int delegateSupportsWillPresentActionSheet:1;
+		unsigned int delegateSupportsDidPresentActionSheet:1;
+		unsigned int delegateSupportsWillDismissWithButtonIndex:1;
+		unsigned int delegateSupportsDidDismissWithButtonIndex:1;
+	} _delegateFlags;
+}
+
+- (id)init 
+{
+	self = [super init];
+	if (self)
+	{
+		_actionsPerIndex = [[NSMutableDictionary alloc] init];
+		self.delegate = self;
+	}
+	
+	return self;
+}
+
+// designated initializer
+- (id)initWithTitle:(NSString *)title
+{
+	self = [self init];
+	if (self) 
+	{
+		self.title = title;
+	}
+	
+	return self;
+}
+
+- (NSInteger)addButtonWithTitle:(NSString *)title block:(DTActionSheetBlock)block
+{
+	NSInteger retIndex = [self addButtonWithTitle:title];
+	
+	if (block)
+	{
+		NSNumber *key = [NSNumber numberWithInt:retIndex];
+		[_actionsPerIndex setObject:[block copy] forKey:key];
+	}
+	
+	return retIndex;
+}
+
+- (NSInteger)addDestructiveButtonWithTitle:(NSString *)title block:(DTActionSheetBlock)block
+{
+	NSInteger retIndex = [self addButtonWithTitle:title block:block];
+	[self setDestructiveButtonIndex:retIndex];
+	
+	return retIndex;
+}
+
+- (NSInteger)addCancelButtonWithTitle:(NSString *)title
+{
+	NSInteger retIndex = [self addButtonWithTitle:title];
+	[self setCancelButtonIndex:retIndex];
+	
+	return retIndex;
+}
+
+#pragma UIActionSheetDelegate (forwarded)
+
+- (void)actionSheetCancel:(UIActionSheet *)actionSheet
+{
+	if (_delegateFlags.delegateSupportsActionSheetCancel)
+	{
+		[_externalDelegate actionSheetCancel:actionSheet];
+	}
+}
+
+- (void)willPresentActionSheet:(UIActionSheet *)actionSheet
+{
+	if (_delegateFlags.delegateSupportsWillPresentActionSheet)
+	{
+		[_externalDelegate willPresentActionSheet:actionSheet];	
+	}
+}
+
+- (void)didPresentActionSheet:(UIActionSheet *)actionSheet
+{
+	if (_delegateFlags.delegateSupportsDidPresentActionSheet)
+	{
+		[_externalDelegate didPresentActionSheet:actionSheet];
+	}
+}
+
+- (void)actionSheet:(UIActionSheet *)actionSheet willDismissWithButtonIndex:(NSInteger)buttonIndex
+{
+	if (_delegateFlags.delegateSupportsWillDismissWithButtonIndex)
+	{
+		[_externalDelegate actionSheet:actionSheet willDismissWithButtonIndex:buttonIndex];
+	}
+}
+
+
+- (void)actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger)buttonIndex
+{
+	NSNumber *key = [NSNumber numberWithInt:buttonIndex];
+	
+	DTActionSheetBlock block = [_actionsPerIndex objectForKey:key];
+	
+	if (block)
+	{
+		block();
+	}
+
+	if (_delegateFlags.delegateSupportsDidDismissWithButtonIndex)
+	{
+		[_externalDelegate actionSheet:actionSheet didDismissWithButtonIndex:buttonIndex];
+	}
+}
+
+
+#pragma mark Properties
+
+- (id <UIActionSheetDelegate>)delegate
+{
+	return _externalDelegate;
+}
+
+- (void)setDelegate:(id <UIActionSheetDelegate>)delegate
+{
+	if (delegate == self)
+	{
+		[super setDelegate:self];
+	}
+	else if (delegate == nil)
+	{
+		[super setDelegate:nil];
+		_externalDelegate = nil;
+	}
+	else 
+	{
+		_externalDelegate = delegate;
+	}
+	
+	// wipe
+	memset(&_delegateFlags, 0, sizeof(_delegateFlags));
+	
+	// set flags according to available methods in delegate
+	if ([_externalDelegate respondsToSelector:@selector(actionSheetCancel:)])
+	{
+		_delegateFlags.delegateSupportsActionSheetCancel = YES;
+	}
+
+	if ([_externalDelegate respondsToSelector:@selector(willPresentActionSheet:)])
+	{
+		_delegateFlags.delegateSupportsWillPresentActionSheet = YES;
+	}
+
+	if ([_externalDelegate respondsToSelector:@selector(didPresentActionSheet:)])
+	{
+		_delegateFlags.delegateSupportsDidPresentActionSheet = YES;
+	}
+
+	if ([_externalDelegate respondsToSelector:@selector(actionSheet:willDismissWithButtonIndex:)])
+	{
+		_delegateFlags.delegateSupportsWillDismissWithButtonIndex = YES;
+	}
+
+	if ([_externalDelegate respondsToSelector:@selector(actionSheet:didDismissWithButtonIndex:)])
+	{
+		_delegateFlags.delegateSupportsDidDismissWithButtonIndex = YES;
+	}
+}
+
+@end

Classes/WizardViewController.h

@@ -42,6 +42,8 @@
 @property (nonatomic, retain) IBOutlet UIButton *backButton;
 @property (nonatomic, retain) IBOutlet UIButton *startButton;
 
+- (void)reset;
+
 - (IBAction)onStartClick:(id)sender;
 - (IBAction)onBackClick:(id)sender;
 - (IBAction)onCancelClick:(id)sender;

Classes/WizardViewController.m

@@ -52,11 +52,6 @@ typedef enum _ViewElement {
 @synthesize backButton;
 @synthesize startButton;
 
-static int LINPHONE_WIZARD_MIN_PASSWORD_LENGTH = 6;
-static int LINPHONE_WIZARD_MIN_USERNAME_LENGTH = 4;
-static NSString *LINPHONE_WIZARD_URL = @"https://www.linphone.org/wizard.php";
-static NSString *LINPHONE_WIZARD_DOMAIN = @"sip.linphone.org";
-
 
 #pragma mark - Lifecycle Functions
 
@@ -114,12 +109,6 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 #pragma mark - ViewController Functions
 
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    [self resetWizard];
-}
-
-
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     
@@ -166,7 +155,7 @@ static UICompositeViewDescription *compositeDescription = nil;
     }
 }
 
-- (void)resetWizard {
+- (void)reset {
     [self clearProxyConfig];
     [WizardViewController cleanTextField:welcomeView];
     [WizardViewController cleanTextField:choiceView];
@@ -258,23 +247,69 @@ static UICompositeViewDescription *compositeDescription = nil;
 	linphone_core_clear_all_auth_info([LinphoneManager getLc]);
 }
 
-- (void)addProxyConfig:(NSString*)username password:(NSString*)password domain:(NSString*)domain {
-	const char* identity = [[NSString stringWithFormat:@"sip:%@@%@",username,domain] UTF8String];
+- (void)setDefaultSettings:(LinphoneProxyConfig*)proxyCfg {
+    BOOL pushnotification = [[LinphoneManager instance] lpConfigBoolForKey:@"push_notification" forSection:@"wizard"];
+    [[LinphoneManager instance] lpConfigSetBool:pushnotification forKey:@"pushnotification_preference"];
+    if(pushnotification) {
+        [[LinphoneManager instance] addPushTokenToProxyConfig:proxyCfg];
+    }
+    int expires = [[LinphoneManager instance] lpConfigIntForKey:@"expires" forSection:@"wizard"];
+    linphone_proxy_config_expires(proxyCfg, expires);
+    
+    NSString* transport = [[LinphoneManager instance] lpConfigStringForKey:@"transport" forSection:@"wizard"];
+    LinphoneCore *lc = [LinphoneManager getLc];
+    LCSipTransports transportValue={0};
+	if (transport!=nil) {
+		if (linphone_core_get_sip_transports(lc, &transportValue)) {
+			[LinphoneLogger logc:LinphoneLoggerError format:"cannot get current transport"];
+		}
+		// Only one port can be set at one time, the others's value is 0
+		if ([transport isEqualToString:@"tcp"]) {
+			transportValue.tcp_port=transportValue.tcp_port|transportValue.udp_port|transportValue.tls_port;
+			transportValue.udp_port=0;
+            transportValue.tls_port=0;
+		} else if ([transport isEqualToString:@"udp"]){
+			transportValue.udp_port=transportValue.tcp_port|transportValue.udp_port|transportValue.tls_port;
+			transportValue.tcp_port=0;
+            transportValue.tls_port=0;
+		} else if ([transport isEqualToString:@"tls"]){
+			transportValue.tls_port=transportValue.tcp_port|transportValue.udp_port|transportValue.tls_port;
+			transportValue.tcp_port=0;
+            transportValue.udp_port=0;
+		} else {
+			[LinphoneLogger logc:LinphoneLoggerError format:"unexpected transport [%s]",[transport cStringUsingEncoding:[NSString defaultCStringEncoding]]];
+		}
+		if (linphone_core_set_sip_transports(lc, &transportValue)) {
+			[LinphoneLogger logc:LinphoneLoggerError format:"cannot set transport"];
+		}
+	}
+}
+
+- (void)addProxyConfig:(NSString*)username password:(NSString*)password domain:(NSString*)domain server:(NSString*)server {
+    if(server == nil) {
+        server = domain;
+    }
+	const char* identity = [[NSString stringWithFormat:@"sip:%@@%@", username, domain] UTF8String];
 	LinphoneProxyConfig* proxyCfg = linphone_core_create_proxy_config([LinphoneManager getLc]);
-	LinphoneAuthInfo* info=linphone_auth_info_new([username UTF8String],NULL,[password UTF8String],NULL,NULL);
-	linphone_proxy_config_set_identity(proxyCfg,identity);
-	linphone_proxy_config_set_server_addr(proxyCfg,[domain UTF8String]);
-	linphone_proxy_config_enable_register(proxyCfg,true);
-	linphone_core_add_proxy_config([LinphoneManager getLc], proxyCfg);
+	LinphoneAuthInfo* info = linphone_auth_info_new([username UTF8String], NULL, [password UTF8String], NULL, NULL);
+	linphone_proxy_config_set_identity(proxyCfg, identity);
+	linphone_proxy_config_set_server_addr(proxyCfg, [server UTF8String]);
+    if([server compare:domain options:NSCaseInsensitiveSearch] != 0) {
+        linphone_proxy_config_set_route(proxyCfg, [server UTF8String]);
+    }
+	linphone_proxy_config_enable_register(proxyCfg, true);
+    if([domain compare:[[LinphoneManager instance] lpConfigStringForKey:@"domain" forSection:@"wizard"] options:NSCaseInsensitiveSearch] == 0) {
+        [self setDefaultSettings:proxyCfg];
+    }
+    linphone_core_add_proxy_config([LinphoneManager getLc], proxyCfg);
 	linphone_core_set_default_proxy([LinphoneManager getLc], proxyCfg);
-	linphone_core_add_auth_info([LinphoneManager getLc],info)
-	;
+	linphone_core_add_auth_info([LinphoneManager getLc], info);
 }
 
 - (void)checkUserExist:(NSString*)username {
     [LinphoneLogger log:LinphoneLoggerDebug format:@"XMLRPC check_account %@", username];
     
-    NSURL *URL = [NSURL URLWithString: LINPHONE_WIZARD_URL];
+    NSURL *URL = [NSURL URLWithString:[[LinphoneManager instance] lpConfigStringForKey:@"service_url" forSection:@"wizard"]];
     XMLRPCRequest *request = [[XMLRPCRequest alloc] initWithURL: URL];
     [request setMethod: @"check_account" withParameters:[NSArray arrayWithObjects:username, nil]];
     
@@ -289,7 +324,7 @@ static UICompositeViewDescription *compositeDescription = nil;
     NSString *useragent = [LinphoneManager getUserAgent];
     [LinphoneLogger log:LinphoneLoggerDebug format:@"XMLRPC create_account_with_useragent %@ %@ %@ %@", identity, password, email, useragent];
     
-    NSURL *URL = [NSURL URLWithString: LINPHONE_WIZARD_URL];
+    NSURL *URL = [NSURL URLWithString: [[LinphoneManager instance] lpConfigStringForKey:@"service_url" forSection:@"wizard"]];
     XMLRPCRequest *request = [[XMLRPCRequest alloc] initWithURL: URL];
     [request setMethod: @"create_account_with_useragent" withParameters:[NSArray arrayWithObjects:identity, password, email, useragent, nil]];
     
@@ -303,7 +338,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 - (void)checkAccountValidation:(NSString*)identity {
     [LinphoneLogger log:LinphoneLoggerDebug format:@"XMLRPC check_account_validated %@", identity];
     
-    NSURL *URL = [NSURL URLWithString: LINPHONE_WIZARD_URL];
+    NSURL *URL = [NSURL URLWithString: [[LinphoneManager instance] lpConfigStringForKey:@"service_url" forSection:@"wizard"]];
     XMLRPCRequest *request = [[XMLRPCRequest alloc] initWithURL: URL];
     [request setMethod: @"check_account_validated" withParameters:[NSArray arrayWithObjects:identity, nil]];
     
@@ -384,7 +419,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 - (IBAction)onCheckValidationClick:(id)sender {
     NSString *username = [WizardViewController findTextField:ViewElement_Username view:contentView].text;
-    [self checkAccountValidation:[NSString stringWithFormat:@"%@@%@", username, LINPHONE_WIZARD_DOMAIN]];
+    [self checkAccountValidation:[NSString stringWithFormat:@"%@@%@", username, [[LinphoneManager instance] lpConfigStringForKey:@"domain" forSection:@"wizard"]]];
 }
 
 - (IBAction)onSignInExternalClick:(id)sender {
@@ -392,14 +427,16 @@ static UICompositeViewDescription *compositeDescription = nil;
     NSString *username = [WizardViewController findTextField:ViewElement_Username  view:contentView].text;
     NSString *password = [WizardViewController findTextField:ViewElement_Password  view:contentView].text;
     NSString *domain = [WizardViewController findTextField:ViewElement_Domain  view:contentView].text;
-    [self addProxyConfig:username password:password domain:domain];
+    [self addProxyConfig:username password:password domain:domain server:nil];
 }
 
 - (IBAction)onSignInClick:(id)sender {
     [self.waitView setHidden:false];
     NSString *username = [WizardViewController findTextField:ViewElement_Username  view:contentView].text;
     NSString *password = [WizardViewController findTextField:ViewElement_Password  view:contentView].text;
-    [self addProxyConfig:username password:password domain:LINPHONE_WIZARD_DOMAIN];
+    [self addProxyConfig:username password:password
+                  domain:[[LinphoneManager instance] lpConfigStringForKey:@"domain" forSection:@"wizard"]
+                  server:[[LinphoneManager instance] lpConfigStringForKey:@"proxy" forSection:@"wizard"]];
 }
 
 - (IBAction)onRegisterClick:(id)sender {
@@ -409,13 +446,16 @@ static UICompositeViewDescription *compositeDescription = nil;
     NSString *email = [WizardViewController findTextField:ViewElement_Email view:contentView].text;
     NSMutableString *errors = [NSMutableString string];
     
-    if ([username length] < LINPHONE_WIZARD_MIN_USERNAME_LENGTH) {
+    int username_length = [[LinphoneManager instance] lpConfigIntForKey:@"username_length" forSection:@"wizard"];
+    int password_length = [[LinphoneManager instance] lpConfigIntForKey:@"password_length" forSection:@"wizard"];
+    
+    if ([username length] < username_length) {
         
-        [errors appendString:[NSString stringWithFormat:NSLocalizedString(@"The username is too short (minimum %d characters).\n", nil), LINPHONE_WIZARD_MIN_USERNAME_LENGTH]];
+        [errors appendString:[NSString stringWithFormat:NSLocalizedString(@"The username is too short (minimum %d characters).\n", nil), username_length]];
     }
     
-    if ([password length] < LINPHONE_WIZARD_MIN_PASSWORD_LENGTH) {
-        [errors appendString:[NSString stringWithFormat:NSLocalizedString(@"The password is too short (minimum %d characters).\n", nil), LINPHONE_WIZARD_MIN_PASSWORD_LENGTH]];
+    if ([password length] < password_length) {
+        [errors appendString:[NSString stringWithFormat:NSLocalizedString(@"The password is too short (minimum %d characters).\n", nil), password_length]];
     }
     
     if (![password2 isEqualToString:password]) {
@@ -447,6 +487,7 @@ static UICompositeViewDescription *compositeDescription = nil;
     [self registrationUpdate:[[notif.userInfo objectForKey: @"state"] intValue]];
 }
 
+
 #pragma mark - Keyboard Event Functions
 
 - (void)keyboardWillHide:(NSNotification *)notif {
@@ -533,7 +574,7 @@ static UICompositeViewDescription *compositeDescription = nil;
                 NSString *username = [WizardViewController findTextField:ViewElement_Username view:contentView].text;
                 NSString *password = [WizardViewController findTextField:ViewElement_Password view:contentView].text;
                 NSString *email = [WizardViewController findTextField:ViewElement_Email view:contentView].text;
-                [self createAccount:[NSString stringWithFormat:@"%@@%@", username, LINPHONE_WIZARD_DOMAIN] password:password email:email];
+                [self createAccount:[NSString stringWithFormat:@"%@@%@", username, [[LinphoneManager instance] lpConfigStringForKey:@"domain" forSection:@"wizard"]] password:password email:email];
             }
         } else if([[request method] isEqualToString:@"create_account_with_useragent"]) {
             if([response object] == [NSNumber numberWithInt:0]) {
@@ -555,7 +596,9 @@ static UICompositeViewDescription *compositeDescription = nil;
              if([response object] == [NSNumber numberWithInt:1]) {
                  NSString *username = [WizardViewController findTextField:ViewElement_Username view:contentView].text;
                  NSString *password = [WizardViewController findTextField:ViewElement_Password view:contentView].text;
-                [self addProxyConfig:username password:password domain:LINPHONE_WIZARD_DOMAIN];
+                [self addProxyConfig:username password:password
+                              domain:[[LinphoneManager instance] lpConfigStringForKey:@"domain" forSection:@"wizard"]
+                              server:[[LinphoneManager instance] lpConfigStringForKey:@"proxy" forSection:@"wizard"]];
              } else {
                  UIAlertView* errorView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Account validation issue",nil)
                                                                      message:NSLocalizedString(@"Your account is not validate yet.", nil)

Classes/en.lproj/ChatRoomViewController.xib

@@ -15,6 +15,7 @@
 			<string>IBUIButton</string>
 			<string>IBUIImageView</string>
 			<string>IBUILabel</string>
+			<string>IBUIProgressView</string>
 			<string>IBUITableView</string>
 			<string>IBUITableViewController</string>
 			<string>IBUITapGestureRecognizer</string>
@@ -137,9 +138,9 @@
 								<string key="NSFrame">{{0, 80}, {320, 277}}</string>
 								<reference key="NSSuperview" ref="715329044"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="833509359"/>
+								<reference key="NSNextKeyView" ref="229066993"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<object class="NSColor" key="IBUIBackgroundColor">
+								<object class="NSColor" key="IBUIBackgroundColor" id="795265735">
 									<int key="NSColorSpace">3</int>
 									<bytes key="NSWhite">MQA</bytes>
 								</object>
@@ -153,6 +154,89 @@
 								<float key="IBUISectionHeaderHeight">22</float>
 								<float key="IBUISectionFooterHeight">22</float>
 							</object>
+							<object class="IBUIView" id="229066993">
+								<reference key="NSNextResponder" ref="715329044"/>
+								<int key="NSvFlags">-2147483356</int>
+								<array class="NSMutableArray" key="NSSubviews">
+									<object class="IBUIImageView" id="661332796">
+										<reference key="NSNextResponder" ref="229066993"/>
+										<int key="NSvFlags">274</int>
+										<string key="NSFrameSize">{320, 59}</string>
+										<reference key="NSSuperview" ref="229066993"/>
+										<reference key="NSWindow"/>
+										<reference key="NSNextKeyView" ref="164391443"/>
+										<string key="NSReuseIdentifierKey">_NS:9</string>
+										<object class="NSColor" key="IBUIBackgroundColor">
+											<int key="NSColorSpace">1</int>
+											<bytes key="NSRGB">MSAwLjI4MzE1ODM3MjYgMC4wNTY3ODY4OTE2MQA</bytes>
+										</object>
+										<bool key="IBUIUserInteractionEnabled">NO</bool>
+										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+										<object class="NSCustomResource" key="IBUIImage" id="172588711">
+											<string key="NSClassName">NSImage</string>
+											<string key="NSResourceName">chat_background.png</string>
+										</object>
+									</object>
+									<object class="IBUIButton" id="391057061">
+										<reference key="NSNextResponder" ref="229066993"/>
+										<int key="NSvFlags">292</int>
+										<string key="NSFrame">{{250, 0}, {70, 59}}</string>
+										<reference key="NSSuperview" ref="229066993"/>
+										<reference key="NSWindow"/>
+										<reference key="NSNextKeyView" ref="833509359"/>
+										<string key="NSReuseIdentifierKey">_NS:9</string>
+										<bool key="IBUIOpaque">NO</bool>
+										<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+											<string key="IBUIAccessibilityLabel">Cancel</string>
+										</object>
+										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+										<int key="IBUIContentHorizontalAlignment">0</int>
+										<int key="IBUIContentVerticalAlignment">0</int>
+										<string key="IBUINormalTitle">Cancel</string>
+										<reference key="IBUIHighlightedTitleColor" ref="795265735"/>
+										<object class="NSColor" key="IBUINormalTitleColor">
+											<int key="NSColorSpace">1</int>
+											<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+										</object>
+										<object class="NSColor" key="IBUINormalTitleShadowColor" id="153071662">
+											<int key="NSColorSpace">3</int>
+											<bytes key="NSWhite">MC41AA</bytes>
+										</object>
+										<object class="IBUIFontDescription" key="IBUIFontDescription" id="278893601">
+											<int key="type">2</int>
+											<double key="pointSize">15</double>
+										</object>
+										<object class="NSFont" key="IBUIFont" id="740255166">
+											<string key="NSName">Helvetica-Bold</string>
+											<double key="NSSize">15</double>
+											<int key="NSfFlags">16</int>
+										</object>
+									</object>
+									<object class="IBUIProgressView" id="164391443">
+										<reference key="NSNextResponder" ref="229066993"/>
+										<int key="NSvFlags">292</int>
+										<string key="NSFrame">{{20, 25}, {213, 9}}</string>
+										<reference key="NSSuperview" ref="229066993"/>
+										<reference key="NSWindow"/>
+										<reference key="NSNextKeyView" ref="391057061"/>
+										<string key="NSReuseIdentifierKey">_NS:9</string>
+										<bool key="IBUIOpaque">NO</bool>
+										<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+											<string key="IBUIAccessibilityLabel">Upload or download progression</string>
+											<integer value="768" key="IBUIAccessibilityTraits"/>
+										</object>
+										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+										<float key="IBUIProgress">0.5</float>
+									</object>
+								</array>
+								<string key="NSFrame">{{0, 357}, {320, 59}}</string>
+								<reference key="NSSuperview" ref="715329044"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="661332796"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<reference key="IBUIBackgroundColor" ref="460939904"/>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+							</object>
 							<object class="IBUIView" id="833509359">
 								<reference key="NSNextResponder" ref="715329044"/>
 								<int key="NSvFlags">266</int>
@@ -163,7 +247,7 @@
 										<string key="NSFrameSize">{320, 59}</string>
 										<reference key="NSSuperview" ref="833509359"/>
 										<reference key="NSWindow"/>
-										<reference key="NSNextKeyView" ref="49605932"/>
+										<reference key="NSNextKeyView" ref="787000581"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<object class="NSColor" key="IBUIBackgroundColor">
 											<int key="NSColorSpace">1</int>
@@ -171,10 +255,18 @@
 										</object>
 										<bool key="IBUIUserInteractionEnabled">NO</bool>
 										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-										<object class="NSCustomResource" key="IBUIImage">
-											<string key="NSClassName">NSImage</string>
-											<string key="NSResourceName">chat_background.png</string>
-										</object>
+										<reference key="IBUIImage" ref="172588711"/>
+									</object>
+									<object class="IBUIView" id="787000581">
+										<reference key="NSNextResponder" ref="833509359"/>
+										<int key="NSvFlags">274</int>
+										<string key="NSFrameSize">{320, 59}</string>
+										<reference key="NSSuperview" ref="833509359"/>
+										<reference key="NSWindow"/>
+										<reference key="NSNextKeyView" ref="120263452"/>
+										<string key="NSReuseIdentifierKey">_NS:9</string>
+										<reference key="IBUIBackgroundColor" ref="460939904"/>
+										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 									</object>
 									<object class="IBUIButton" id="487645621">
 										<reference key="NSNextResponder" ref="833509359"/>
@@ -193,10 +285,7 @@
 										<int key="IBUIContentVerticalAlignment">0</int>
 										<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
 										<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
-										<object class="NSColor" key="IBUINormalTitleShadowColor" id="153071662">
-											<int key="NSColorSpace">3</int>
-											<bytes key="NSWhite">MC41AA</bytes>
-										</object>
+										<reference key="IBUINormalTitleShadowColor" ref="153071662"/>
 										<object class="NSCustomResource" key="IBUIHighlightedImage">
 											<string key="NSClassName">NSImage</string>
 											<string key="NSResourceName">chat_send_over.png</string>
@@ -209,15 +298,33 @@
 											<string key="NSClassName">NSImage</string>
 											<string key="NSResourceName">chat_send_default.png</string>
 										</object>
-										<object class="IBUIFontDescription" key="IBUIFontDescription" id="278893601">
-											<int key="type">2</int>
-											<double key="pointSize">15</double>
+										<reference key="IBUIFontDescription" ref="278893601"/>
+										<reference key="IBUIFont" ref="740255166"/>
+									</object>
+									<object class="IBUIButton" id="120263452">
+										<reference key="NSNextResponder" ref="833509359"/>
+										<int key="NSvFlags">300</int>
+										<string key="NSFrameSize">{40, 59}</string>
+										<reference key="NSSuperview" ref="833509359"/>
+										<reference key="NSWindow"/>
+										<reference key="NSNextKeyView" ref="49605932"/>
+										<string key="NSReuseIdentifierKey">_NS:9</string>
+										<bool key="IBUIOpaque">NO</bool>
+										<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+											<string key="IBUIAccessibilityLabel">Send picture</string>
 										</object>
-										<object class="NSFont" key="IBUIFont" id="871116895">
-											<string key="NSName">Helvetica-Bold</string>
-											<double key="NSSize">15</double>
-											<int key="NSfFlags">16</int>
+										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+										<int key="IBUIContentHorizontalAlignment">0</int>
+										<int key="IBUIContentVerticalAlignment">0</int>
+										<string key="IBUINormalTitle">Pict</string>
+										<reference key="IBUIHighlightedTitleColor" ref="795265735"/>
+										<object class="NSColor" key="IBUINormalTitleColor">
+											<int key="NSColorSpace">1</int>
+											<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
 										</object>
+										<reference key="IBUINormalTitleShadowColor" ref="153071662"/>
+										<reference key="IBUIFontDescription" ref="278893601"/>
+										<reference key="IBUIFont" ref="740255166"/>
 									</object>
 									<object class="IBUIView" id="49605932">
 										<reference key="NSNextResponder" ref="833509359"/>
@@ -226,7 +333,7 @@
 											<object class="IBUIImageView" id="946416684">
 												<reference key="NSNextResponder" ref="49605932"/>
 												<int key="NSvFlags">274</int>
-												<string key="NSFrameSize">{250, 59}</string>
+												<string key="NSFrameSize">{210, 59}</string>
 												<reference key="NSSuperview" ref="49605932"/>
 												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="587350058"/>
@@ -241,7 +348,7 @@
 											<object class="IBUIView" id="587350058">
 												<reference key="NSNextResponder" ref="49605932"/>
 												<int key="NSvFlags">274</int>
-												<string key="NSFrame">{{10, 10}, {230, 39}}</string>
+												<string key="NSFrame">{{10, 10}, {190, 39}}</string>
 												<reference key="NSSuperview" ref="49605932"/>
 												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="487645621"/>
@@ -250,7 +357,7 @@
 												<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 											</object>
 										</array>
-										<string key="NSFrameSize">{250, 59}</string>
+										<string key="NSFrame">{{40, 0}, {210, 59}}</string>
 										<reference key="NSSuperview" ref="833509359"/>
 										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="946416684"/>
@@ -321,7 +428,7 @@
 									<string key="NSResourceName">chat_back_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="278893601"/>
-								<reference key="IBUIFont" ref="871116895"/>
+								<reference key="IBUIFont" ref="740255166"/>
 							</object>
 							<object class="IBUIButton" id="602867427">
 								<reference key="NSNextResponder" ref="333187864"/>
@@ -353,7 +460,7 @@
 									<string key="NSResourceName">chat_edit_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="278893601"/>
-								<reference key="IBUIFont" ref="871116895"/>
+								<reference key="IBUIFont" ref="740255166"/>
 							</object>
 						</array>
 						<string key="NSFrameSize">{320, 44}</string>
@@ -500,6 +607,38 @@
 					</object>
 					<int key="connectionID">71</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">imageTransferProgressBar</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="164391443"/>
+					</object>
+					<int key="connectionID">79</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">pictureButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="120263452"/>
+					</object>
+					<int key="connectionID">84</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">cancelTransferButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="391057061"/>
+					</object>
+					<int key="connectionID">85</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">transferView</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="229066993"/>
+					</object>
+					<int key="connectionID">86</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">dataSource</string>
@@ -569,6 +708,24 @@
 					</object>
 					<int key="connectionID">62</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">onPictureClick:</string>
+						<reference key="source" ref="120263452"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">87</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">onTransferCancelClick:</string>
+						<reference key="source" ref="391057061"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">78</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -640,6 +797,7 @@
 							<reference ref="414508017"/>
 							<reference ref="879615756"/>
 							<reference ref="833509359"/>
+							<reference ref="229066993"/>
 						</array>
 						<reference key="parent" ref="589117993"/>
 						<string key="objectName">chatView</string>
@@ -687,6 +845,8 @@
 							<reference ref="487645621"/>
 							<reference ref="131075038"/>
 							<reference ref="49605932"/>
+							<reference ref="120263452"/>
+							<reference ref="787000581"/>
 						</array>
 						<reference key="parent" ref="715329044"/>
 						<string key="objectName">footerView</string>
@@ -731,6 +891,47 @@
 						<reference key="parent" ref="49605932"/>
 						<string key="objectName">messageField</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">73</int>
+						<reference key="object" ref="120263452"/>
+						<reference key="parent" ref="833509359"/>
+						<string key="objectName">pictureButton</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">82</int>
+						<reference key="object" ref="787000581"/>
+						<reference key="parent" ref="833509359"/>
+						<string key="objectName">normalView</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">72</int>
+						<reference key="object" ref="229066993"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="164391443"/>
+							<reference ref="391057061"/>
+							<reference ref="661332796"/>
+						</array>
+						<reference key="parent" ref="715329044"/>
+						<string key="objectName">transferView</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">74</int>
+						<reference key="object" ref="164391443"/>
+						<reference key="parent" ref="229066993"/>
+						<string key="objectName">transferProgressBar</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">75</int>
+						<reference key="object" ref="391057061"/>
+						<reference key="parent" ref="229066993"/>
+						<string key="objectName">cancelTransferButton</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">83</int>
+						<reference key="object" ref="661332796"/>
+						<reference key="parent" ref="229066993"/>
+						<string key="objectName">footerBackgroundImage</string>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -760,7 +961,13 @@
 				<string key="66.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="68.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="72.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="74.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="75.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="82.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="83.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="9.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
 				<real value="2" key="9.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
@@ -769,7 +976,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">71</int>
+			<int key="maxID">87</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -789,7 +996,9 @@
 						<string key="onEditClick:">id</string>
 						<string key="onListTap:">id</string>
 						<string key="onMessageChange:">id</string>
+						<string key="onPictureClick:">id</string>
 						<string key="onSendClick:">id</string>
+						<string key="onTransferCancelClick:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
 						<object class="IBActionInfo" key="onBackClick:">
@@ -808,25 +1017,37 @@
 							<string key="name">onMessageChange:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="onPictureClick:">
+							<string key="name">onPictureClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 						<object class="IBActionInfo" key="onSendClick:">
 							<string key="name">onSendClick:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="onTransferCancelClick:">
+							<string key="name">onTransferCancelClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="addressLabel">UILabel</string>
 						<string key="avatarImage">UIImageView</string>
+						<string key="cancelTransferButton">UIButton</string>
 						<string key="chatView">UIView</string>
 						<string key="editButton">UIToggleButton</string>
 						<string key="footerBackgroundImage">UIImageView</string>
 						<string key="footerView">UIView</string>
 						<string key="headerView">UIView</string>
+						<string key="imageTransferProgressBar">UIProgressView</string>
 						<string key="listTapGestureRecognizer">UITapGestureRecognizer</string>
 						<string key="messageBackgroundImage">UIImageView</string>
 						<string key="messageField">HPGrowingTextView</string>
 						<string key="messageView">UIView</string>
+						<string key="pictureButton">UIButton</string>
 						<string key="sendButton">UIButton</string>
 						<string key="tableController">ChatRoomTableViewController</string>
+						<string key="transferView">UIView</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
 						<object class="IBToOneOutletInfo" key="addressLabel">
@@ -837,6 +1058,10 @@
 							<string key="name">avatarImage</string>
 							<string key="candidateClassName">UIImageView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="cancelTransferButton">
+							<string key="name">cancelTransferButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="chatView">
 							<string key="name">chatView</string>
 							<string key="candidateClassName">UIView</string>
@@ -857,6 +1082,10 @@
 							<string key="name">headerView</string>
 							<string key="candidateClassName">UIView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="imageTransferProgressBar">
+							<string key="name">imageTransferProgressBar</string>
+							<string key="candidateClassName">UIProgressView</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="listTapGestureRecognizer">
 							<string key="name">listTapGestureRecognizer</string>
 							<string key="candidateClassName">UITapGestureRecognizer</string>
@@ -873,6 +1102,10 @@
 							<string key="name">messageView</string>
 							<string key="candidateClassName">UIView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="pictureButton">
+							<string key="name">pictureButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="sendButton">
 							<string key="name">sendButton</string>
 							<string key="candidateClassName">UIButton</string>
@@ -881,6 +1114,10 @@
 							<string key="name">tableController</string>
 							<string key="candidateClassName">ChatRoomTableViewController</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="transferView">
+							<string key="name">transferView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
 					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>

Classes/en.lproj/ChatViewController.xib

@@ -61,8 +61,8 @@
 							</object>
 							<object class="IBUIButton" id="174033966">
 								<reference key="NSNextResponder" ref="852221244"/>
-								<int key="NSvFlags">289</int>
-								<string key="NSFrame">{{160, 0}, {160, 44}}</string>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrameSize">{160, 44}</string>
 								<reference key="NSSuperview" ref="852221244"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="490705294"/>
@@ -99,8 +99,8 @@
 							</object>
 							<object class="IBUIButton" id="1001279594">
 								<reference key="NSNextResponder" ref="852221244"/>
-								<int key="NSvFlags">292</int>
-								<string key="NSFrameSize">{160, 44}</string>
+								<int key="NSvFlags">289</int>
+								<string key="NSFrame">{{160, 0}, {160, 44}}</string>
 								<reference key="NSSuperview" ref="852221244"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="174033966"/>
@@ -389,8 +389,8 @@
 						<int key="objectID">7</int>
 						<reference key="object" ref="852221244"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="1001279594"/>
 							<reference ref="428805768"/>
+							<reference ref="1001279594"/>
 							<reference ref="174033966"/>
 						</array>
 						<reference key="parent" ref="1010501960"/>

Classes/en.lproj/DialerViewController~ipad.xib

@@ -37,6 +37,73 @@
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<array class="NSMutableArray" key="NSSubviews">
+					<object class="IBUIView" id="887694290">
+						<reference key="NSNextResponder" ref="450916897"/>
+						<int key="NSvFlags">301</int>
+						<string key="NSFrame">{{-1000, -1000}, {2768, 2900}}</string>
+						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="935083036"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<object class="NSColor" key="IBUIBackgroundColor">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MAA</bytes>
+						</object>
+						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+					</object>
+					<object class="IBUIView" id="820868226">
+						<reference key="NSNextResponder" ref="450916897"/>
+						<int key="NSvFlags">274</int>
+						<string key="NSFrame">{{0, 58}, {768, 842}}</string>
+						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="857979271"/>
+						<object class="NSColor" key="IBUIBackgroundColor" id="474273757">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MCAwAA</bytes>
+						</object>
+						<int key="IBUIContentMode">2</int>
+						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+					</object>
+					<object class="IBUIButton" id="857979271">
+						<reference key="NSNextResponder" ref="450916897"/>
+						<int key="NSvFlags">-2147483356</int>
+						<string key="NSFrame">{{0, 77}, {85, 33}}</string>
+						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="811328787"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="IBUIOpaque">NO</bool>
+						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+							<string key="IBUIAccessibilityLabel">Switch camera</string>
+						</object>
+						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+						<int key="IBUIContentHorizontalAlignment">0</int>
+						<int key="IBUIContentVerticalAlignment">0</int>
+						<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
+						<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
+						<object class="NSColor" key="IBUINormalTitleShadowColor" id="213950483">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MC41AA</bytes>
+						</object>
+						<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">switch_camera_over.png</string>
+						</object>
+						<object class="NSCustomResource" key="IBUINormalBackgroundImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">switch_camera_default.png</string>
+						</object>
+						<object class="IBUIFontDescription" key="IBUIFontDescription" id="551176679">
+							<int key="type">2</int>
+							<double key="pointSize">15</double>
+						</object>
+						<object class="NSFont" key="IBUIFont" id="733629239">
+							<string key="NSName">Helvetica-Bold</string>
+							<double key="NSSize">15</double>
+							<int key="NSfFlags">16</int>
+						</object>
+					</object>
 					<object class="IBUIView" id="935083036">
 						<reference key="NSNextResponder" ref="450916897"/>
 						<int key="NSvFlags">290</int>
@@ -104,7 +171,7 @@
 								<string key="NSFrame">{{698, 4}, {70, 51}}</string>
 								<reference key="NSSuperview" ref="935083036"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="811328787"/>
+								<reference key="NSNextKeyView" ref="820868226"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -120,10 +187,7 @@
 								<double key="IBUIContentEdgeInsets.bottom">15</double>
 								<double key="IBUIContentEdgeInsets.left">15</double>
 								<double key="IBUIContentEdgeInsets.right">15</double>
-								<object class="NSColor" key="IBUINormalTitleShadowColor" id="213950483">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MC41AA</bytes>
-								</object>
+								<reference key="IBUINormalTitleShadowColor" ref="213950483"/>
 								<object class="NSCustomResource" key="IBUIHighlightedImage">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">backspace_over~ipad.png</string>
@@ -136,15 +200,8 @@
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">backspace_default~ipad.png</string>
 								</object>
-								<object class="IBUIFontDescription" key="IBUIFontDescription" id="551176679">
-									<int key="type">2</int>
-									<double key="pointSize">15</double>
-								</object>
-								<object class="NSFont" key="IBUIFont" id="914591064">
-									<string key="NSName">Helvetica-Bold</string>
-									<double key="NSSize">15</double>
-									<int key="NSfFlags">16</int>
-								</object>
+								<reference key="IBUIFontDescription" ref="551176679"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 						</array>
 						<string key="NSFrameSize">{768, 80}</string>
@@ -166,6 +223,22 @@
 						<reference key="NSNextResponder" ref="450916897"/>
 						<int key="NSvFlags">268</int>
 						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUIImageView" id="848268216">
+								<reference key="NSNextResponder" ref="811328787"/>
+								<int key="NSvFlags">274</int>
+								<string key="NSFrameSize">{320, 280}</string>
+								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="257730270"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<int key="IBUITag">2</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+								<object class="NSCustomResource" key="IBUIImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">background_alt.png</string>
+								</object>
+							</object>
 							<object class="IBUIButton" id="257730270">
 								<reference key="NSNextResponder" ref="811328787"/>
 								<int key="NSvFlags">292</int>
@@ -200,7 +273,7 @@
 									<int key="traits">2</int>
 									<double key="pointSize">15</double>
 								</object>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="579980565">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -227,7 +300,7 @@
 									<string key="NSResourceName">numpad_two_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="534491605">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -254,7 +327,7 @@
 									<string key="NSResourceName">numpad_three_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="405606838">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -281,7 +354,7 @@
 									<string key="NSResourceName">numpad_four_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="984444210">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -308,7 +381,7 @@
 									<string key="NSResourceName">numpad_five_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="505513327">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -335,7 +408,7 @@
 									<string key="NSResourceName">numpad_six_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="829692929">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -362,7 +435,7 @@
 									<string key="NSResourceName">numpad_seven_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="430965229">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -389,7 +462,7 @@
 									<string key="NSResourceName">numpad_eight_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="565116665">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -416,7 +489,7 @@
 									<string key="NSResourceName">numpad_nine_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="47810246">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -443,7 +516,7 @@
 									<string key="NSResourceName">numpad_star_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="776264615">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -470,7 +543,7 @@
 									<string key="NSResourceName">numpad_zero_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="718499319">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -497,18 +570,15 @@
 									<string key="NSResourceName">numpad_sharp_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 						</array>
 						<string key="NSFrame">{{0, 640}, {320, 260}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="257730270"/>
+						<reference key="NSNextKeyView" ref="848268216"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor" id="474273757">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MCAwAA</bytes>
-						</object>
+						<reference key="IBUIBackgroundColor" ref="474273757"/>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 					</object>
 					<object class="IBUIView" id="683359487">
@@ -547,7 +617,7 @@
 									<string key="NSResourceName">add_contact_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="405746031">
 								<reference key="NSNextResponder" ref="683359487"/>
@@ -580,7 +650,7 @@
 									<string key="NSResourceName">back_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="981547916">
 								<reference key="NSNextResponder" ref="683359487"/>
@@ -614,7 +684,7 @@
 									<string key="NSResourceName">call_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="514058756">
 								<reference key="NSNextResponder" ref="683359487"/>
@@ -648,7 +718,7 @@
 									<string key="NSResourceName">add_call_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="1043651254">
 								<reference key="NSNextResponder" ref="683359487"/>
@@ -682,7 +752,7 @@
 									<string key="NSResourceName">transfer_call_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 						</array>
 						<string key="NSFrame">{{456, 815}, {312, 85}}</string>
@@ -701,7 +771,7 @@
 				<string key="NSFrameSize">{768, 900}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="935083036"/>
+				<reference key="NSNextKeyView" ref="887694290"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="474273757"/>
 				<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -869,6 +939,30 @@
 					</object>
 					<int key="connectionID">69</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">videoCameraSwitch</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="857979271"/>
+					</object>
+					<int key="connectionID">74</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">videoPreview</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="820868226"/>
+					</object>
+					<int key="connectionID">75</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">backgroundView</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="887694290"/>
+					</object>
+					<int key="connectionID">77</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">onAddressChange:</string>
@@ -1024,6 +1118,14 @@
 					</object>
 					<int key="connectionID">39</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">preview</string>
+						<reference key="source" ref="857979271"/>
+						<reference key="destination" ref="820868226"/>
+					</object>
+					<int key="connectionID">72</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -1051,6 +1153,9 @@
 							<reference ref="811328787"/>
 							<reference ref="683359487"/>
 							<reference ref="935083036"/>
+							<reference ref="820868226"/>
+							<reference ref="857979271"/>
+							<reference ref="887694290"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -1083,6 +1188,7 @@
 							<reference ref="534491605"/>
 							<reference ref="579980565"/>
 							<reference ref="257730270"/>
+							<reference ref="848268216"/>
 						</array>
 						<reference key="parent" ref="450916897"/>
 						<string key="objectName">pad</string>
@@ -1218,6 +1324,30 @@
 						<reference key="parent" ref="935083036"/>
 						<string key="objectName">backspaceButton</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">70</int>
+						<reference key="object" ref="820868226"/>
+						<reference key="parent" ref="450916897"/>
+						<string key="objectName">preview</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">71</int>
+						<reference key="object" ref="857979271"/>
+						<reference key="parent" ref="450916897"/>
+						<string key="objectName">videoCameraSwitch</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">73</int>
+						<reference key="object" ref="848268216"/>
+						<reference key="parent" ref="811328787"/>
+						<string key="objectName">background</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">76</int>
+						<reference key="object" ref="887694290"/>
+						<reference key="parent" ref="450916897"/>
+						<string key="objectName">backgroundView</string>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1279,6 +1409,12 @@
 				<string key="6.CustomClassName">UIAddressTextField</string>
 				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="70.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="71.CustomClassName">UICamSwitch</string>
+				<string key="71.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<real value="1" key="71.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="76.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="8.CustomClassName">UIDigitButton</string>
 				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="8.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
@@ -1290,7 +1426,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">69</int>
+			<int key="maxID">77</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1321,6 +1457,7 @@
 						<string key="addContactButton">UIButton</string>
 						<string key="addressField">UITextField</string>
 						<string key="backButton">UIButton</string>
+						<string key="backgroundView">UIView</string>
 						<string key="callButton">UICallButton</string>
 						<string key="eightButton">UIDigitButton</string>
 						<string key="eraseButton">UIEraseButton</string>
@@ -1335,6 +1472,8 @@
 						<string key="threeButton">UIDigitButton</string>
 						<string key="transferButton">UITransferButton</string>
 						<string key="twoButton">UIDigitButton</string>
+						<string key="videoCameraSwitch">UICamSwitch</string>
+						<string key="videoPreview">UIView</string>
 						<string key="zeroButton">UIDigitButton</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -1354,6 +1493,10 @@
 							<string key="name">backButton</string>
 							<string key="candidateClassName">UIButton</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="backgroundView">
+							<string key="name">backgroundView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="callButton">
 							<string key="name">callButton</string>
 							<string key="candidateClassName">UICallButton</string>
@@ -1410,6 +1553,14 @@
 							<string key="name">twoButton</string>
 							<string key="candidateClassName">UIDigitButton</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="videoCameraSwitch">
+							<string key="name">videoCameraSwitch</string>
+							<string key="candidateClassName">UICamSwitch</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="videoPreview">
+							<string key="name">videoPreview</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="zeroButton">
 							<string key="name">zeroButton</string>
 							<string key="candidateClassName">UIDigitButton</string>
@@ -1447,6 +1598,25 @@
 						<string key="minorKey">./Classes/UICallButton.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UICamSwitch</string>
+					<string key="superclassName">UIButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">preview</string>
+						<string key="NS.object.0">UIView</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">preview</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">preview</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UICamSwitch.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">UIDigitButton</string>
 					<string key="superclassName">UILongTouchButton</string>
@@ -1532,6 +1702,7 @@
 			<string key="back_default~ipad.png">{251, 170}</string>
 			<string key="back_disabled~ipad.png">{251, 170}</string>
 			<string key="back_over~ipad.png">{251, 170}</string>
+			<string key="background_alt.png">{640, 561}</string>
 			<string key="backspace_default~ipad.png">{81, 43}</string>
 			<string key="backspace_disabled~ipad.png">{81, 43}</string>
 			<string key="backspace_over~ipad.png">{81, 43}</string>
@@ -1563,6 +1734,8 @@
 			<string key="numpad_two_over.png">{220, 113}</string>
 			<string key="numpad_zero_default.png">{220, 113}</string>
 			<string key="numpad_zero_over.png">{220, 113}</string>
+			<string key="switch_camera_default.png">{170, 65}</string>
+			<string key="switch_camera_over.png">{170, 65}</string>
 			<string key="transfer_call_default~ipad.png">{371, 170}</string>
 			<string key="transfer_call_disabled~ipad.png">{371, 170}</string>
 			<string key="transfer_call_over~ipad.png">{371, 170}</string>

Classes/en.lproj/HistoryViewController.xib

@@ -186,7 +186,7 @@
 								<reference key="IBUIFont" ref="590723448"/>
 							</object>
 						</array>
-						<string key="NSFrameSize">{320, 58}</string>
+						<string key="NSFrameSize">{320, 44}</string>
 						<reference key="NSSuperview" ref="812520855"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="929072924"/>

Classes/en.lproj/ImageViewController.xib

@@ -0,0 +1,299 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1296</int>
+		<string key="IBDocument.SystemVersion">11E53</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2549</string>
+		<string key="IBDocument.AppKitVersion">1138.47</string>
+		<string key="IBDocument.HIToolboxVersion">569.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+			<string key="NS.object.0">1498</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBProxyObject</string>
+			<string>IBUIButton</string>
+			<string>IBUIImageView</string>
+			<string>IBUIView</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<object class="IBProxyObject" id="372490531">
+				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+			<object class="IBProxyObject" id="975951072">
+				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+			<object class="IBUIView" id="191373211">
+				<reference key="NSNextResponder"/>
+				<int key="NSvFlags">274</int>
+				<array class="NSMutableArray" key="NSSubviews">
+					<object class="IBUIImageView" id="170933358">
+						<reference key="NSNextResponder" ref="191373211"/>
+						<int key="NSvFlags">274</int>
+						<string key="NSFrame">{{0, 44}, {320, 416}}</string>
+						<reference key="NSSuperview" ref="191373211"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<object class="NSColor" key="IBUIBackgroundColor" id="986758619">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MCAwAA</bytes>
+						</object>
+						<int key="IBUIContentMode">4</int>
+						<bool key="IBUIUserInteractionEnabled">NO</bool>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
+					<object class="IBUIView" id="350805517">
+						<reference key="NSNextResponder" ref="191373211"/>
+						<int key="NSvFlags">290</int>
+						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUIImageView" id="714444944">
+								<reference key="NSNextResponder" ref="350805517"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrameSize">{320, 44}</string>
+								<reference key="NSSuperview" ref="350805517"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="771824371"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<object class="NSCustomResource" key="IBUIImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">toolsbar_background.png</string>
+								</object>
+							</object>
+							<object class="IBUIButton" id="771824371">
+								<reference key="NSNextResponder" ref="350805517"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrameSize">{80, 44}</string>
+								<reference key="NSSuperview" ref="350805517"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="170933358"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<bool key="IBUIOpaque">NO</bool>
+								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+									<string key="IBUIAccessibilityLabel">Back</string>
+								</object>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<int key="IBUIContentHorizontalAlignment">0</int>
+								<int key="IBUIContentVerticalAlignment">0</int>
+								<object class="NSColor" key="IBUIHighlightedTitleColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MQA</bytes>
+								</object>
+								<object class="NSColor" key="IBUINormalTitleColor">
+									<int key="NSColorSpace">1</int>
+									<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+								</object>
+								<object class="NSColor" key="IBUINormalTitleShadowColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MC41AA</bytes>
+								</object>
+								<object class="NSCustomResource" key="IBUINormalImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">chat_back_default.png</string>
+								</object>
+								<object class="NSCustomResource" key="IBUINormalBackgroundImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">chat_back_over.png</string>
+								</object>
+								<object class="IBUIFontDescription" key="IBUIFontDescription">
+									<int key="type">2</int>
+									<double key="pointSize">15</double>
+								</object>
+								<object class="NSFont" key="IBUIFont">
+									<string key="NSName">Helvetica-Bold</string>
+									<double key="NSSize">15</double>
+									<int key="NSfFlags">16</int>
+								</object>
+							</object>
+						</array>
+						<string key="NSFrameSize">{320, 44}</string>
+						<reference key="NSSuperview" ref="191373211"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="714444944"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<reference key="IBUIBackgroundColor" ref="986758619"/>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
+				</array>
+				<string key="NSFrame">{{0, 20}, {320, 460}}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView" ref="350805517"/>
+				<reference key="IBUIBackgroundColor" ref="986758619"/>
+				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">view</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="191373211"/>
+					</object>
+					<int key="connectionID">3</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">imageView</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="170933358"/>
+					</object>
+					<int key="connectionID">9</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">backButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="771824371"/>
+					</object>
+					<int key="connectionID">8</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">onBackClick:</string>
+						<reference key="source" ref="771824371"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">10</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1</int>
+						<reference key="object" ref="191373211"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="170933358"/>
+							<reference ref="350805517"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="372490531"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="975951072"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">4</int>
+						<reference key="object" ref="170933358"/>
+						<reference key="parent" ref="191373211"/>
+						<string key="objectName">imageView</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">11</int>
+						<reference key="object" ref="350805517"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="714444944"/>
+							<reference ref="771824371"/>
+						</array>
+						<reference key="parent" ref="191373211"/>
+						<string key="objectName">toolbar</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">7</int>
+						<reference key="object" ref="771824371"/>
+						<reference key="parent" ref="350805517"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="714444944"/>
+						<reference key="parent" ref="350805517"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.CustomClassName">ImageViewController</string>
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="-2.CustomClassName">UIResponder</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">11</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">ImageViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">onBackClick:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">onBackClick:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">onBackClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="backButton">UIButton</string>
+						<string key="imageView">UIImageView</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="backButton">
+							<string key="name">backButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="imageView">
+							<string key="name">imageView</string>
+							<string key="candidateClassName">UIImageView</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/ImageViewController.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+			<real value="1296" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="chat_back_default.png">{320, 88}</string>
+			<string key="chat_back_over.png">{320, 88}</string>
+			<string key="toolsbar_background.png">{5, 117}</string>
+		</dictionary>
+		<string key="IBCocoaTouchPluginVersion">1498</string>
+	</data>
+</archive>

Classes/en.lproj/InCallViewController.xib

@@ -146,7 +146,6 @@
 						<string key="NSFrame">{{0, 23}, {85, 33}}</string>
 						<reference key="NSSuperview" ref="858247959"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">

Classes/en.lproj/WizardViewController.xib

@@ -136,7 +136,6 @@
 								<string key="NSFrame">{{160, 0}, {160, 77}}</string>
 								<reference key="NSSuperview" ref="1057285194"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -243,7 +242,6 @@
 						<string key="NSFrame">{{40, 290}, {240, 44}}</string>
 						<reference key="NSSuperview" ref="741268807"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -372,7 +370,6 @@
 						<string key="NSFrame">{{33, 269}, {255, 50}}</string>
 						<reference key="NSSuperview" ref="361414027"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -473,6 +470,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
 						<object class="NSCustomResource" key="IBUIBackground" id="814678829">
@@ -515,6 +513,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<bool key="IBUISecureTextEntry">YES</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
@@ -548,6 +547,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<bool key="IBUISecureTextEntry">YES</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
@@ -581,6 +581,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
 						<reference key="IBUIBackground" ref="814678829"/>
@@ -593,7 +594,6 @@
 						<string key="NSFrame">{{33, 330}, {255, 50}}</string>
 						<reference key="NSSuperview" ref="183617546"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -678,7 +678,6 @@
 						<string key="NSFrame">{{32, 330}, {255, 50}}</string>
 						<reference key="NSSuperview" ref="101753691"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -722,6 +721,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<bool key="IBUISecureTextEntry">YES</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
@@ -755,6 +755,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
 						<reference key="IBUIBackground" ref="814678829"/>
@@ -841,6 +842,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
 						<reference key="IBUIBackground" ref="814678829"/>
@@ -873,6 +875,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<bool key="IBUISecureTextEntry">YES</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
@@ -906,6 +909,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
 						<reference key="IBUIBackground" ref="814678829"/>
@@ -918,7 +922,6 @@
 						<string key="NSFrame">{{34, 330}, {255, 50}}</string>
 						<reference key="NSSuperview" ref="71390966"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -996,7 +999,6 @@
 						<string key="NSFrame">{{32, 330}, {255, 50}}</string>
 						<reference key="NSSuperview" ref="611643284"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -1040,6 +1042,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<bool key="IBUISecureTextEntry">YES</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
@@ -1073,6 +1076,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
 						<reference key="IBUIBackground" ref="814678829"/>

Classes/fr.lproj/ChatRoomViewController.xib

@@ -15,6 +15,7 @@
 			<string>IBUIImageView</string>
 			<string>IBUILabel</string>
 			<string>IBProxyObject</string>
+			<string>IBUIProgressView</string>
 			<string>IBUITapGestureRecognizer</string>
 			<string>IBUITableViewController</string>
 			<string>IBUITableView</string>
@@ -132,9 +133,9 @@
 								<int key="NSvFlags">274</int>
 								<string key="NSFrame">{{0, 80}, {320, 277}}</string>
 								<reference key="NSSuperview" ref="715329044"/>
-								<reference key="NSNextKeyView" ref="833509359"/>
+								<reference key="NSNextKeyView" ref="229066993"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<object class="NSColor" key="IBUIBackgroundColor">
+								<object class="NSColor" key="IBUIBackgroundColor" id="795265735">
 									<int key="NSColorSpace">3</int>
 									<bytes key="NSWhite">MQA</bytes>
 								</object>
@@ -148,6 +149,85 @@
 								<float key="IBUISectionHeaderHeight">22</float>
 								<float key="IBUISectionFooterHeight">22</float>
 							</object>
+							<object class="IBUIView" id="229066993">
+								<reference key="NSNextResponder" ref="715329044"/>
+								<int key="NSvFlags">-2147483356</int>
+								<array class="NSMutableArray" key="NSSubviews">
+									<object class="IBUIImageView" id="661332796">
+										<reference key="NSNextResponder" ref="229066993"/>
+										<int key="NSvFlags">274</int>
+										<string key="NSFrameSize">{320, 59}</string>
+										<reference key="NSSuperview" ref="229066993"/>
+										<reference key="NSNextKeyView" ref="164391443"/>
+										<string key="NSReuseIdentifierKey">_NS:9</string>
+										<object class="NSColor" key="IBUIBackgroundColor">
+											<int key="NSColorSpace">1</int>
+											<bytes key="NSRGB">MSAwLjI4MzE1ODM3MjYgMC4wNTY3ODY4OTE2MQA</bytes>
+										</object>
+										<bool key="IBUIUserInteractionEnabled">NO</bool>
+										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+										<object class="NSCustomResource" key="IBUIImage" id="172588711">
+											<string key="NSClassName">NSImage</string>
+											<string key="NSResourceName">chat_background.png</string>
+										</object>
+									</object>
+									<object class="IBUIButton" id="391057061">
+										<reference key="NSNextResponder" ref="229066993"/>
+										<int key="NSvFlags">292</int>
+										<string key="NSFrame">{{250, 0}, {70, 59}}</string>
+										<reference key="NSSuperview" ref="229066993"/>
+										<reference key="NSNextKeyView" ref="833509359"/>
+										<string key="NSReuseIdentifierKey">_NS:9</string>
+										<bool key="IBUIOpaque">NO</bool>
+										<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+											<string key="IBUIAccessibilityLabel">Annuler</string>
+										</object>
+										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+										<int key="IBUIContentHorizontalAlignment">0</int>
+										<int key="IBUIContentVerticalAlignment">0</int>
+										<string key="IBUINormalTitle">Annuler</string>
+										<reference key="IBUIHighlightedTitleColor" ref="795265735"/>
+										<object class="NSColor" key="IBUINormalTitleColor">
+											<int key="NSColorSpace">1</int>
+											<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+										</object>
+										<object class="NSColor" key="IBUINormalTitleShadowColor" id="153071662">
+											<int key="NSColorSpace">3</int>
+											<bytes key="NSWhite">MC41AA</bytes>
+										</object>
+										<object class="IBUIFontDescription" key="IBUIFontDescription" id="278893601">
+											<int key="type">2</int>
+											<double key="pointSize">15</double>
+										</object>
+										<object class="NSFont" key="IBUIFont" id="740255166">
+											<string key="NSName">Helvetica-Bold</string>
+											<double key="NSSize">15</double>
+											<int key="NSfFlags">16</int>
+										</object>
+									</object>
+									<object class="IBUIProgressView" id="164391443">
+										<reference key="NSNextResponder" ref="229066993"/>
+										<int key="NSvFlags">292</int>
+										<string key="NSFrame">{{20, 25}, {213, 9}}</string>
+										<reference key="NSSuperview" ref="229066993"/>
+										<reference key="NSNextKeyView" ref="391057061"/>
+										<string key="NSReuseIdentifierKey">_NS:9</string>
+										<bool key="IBUIOpaque">NO</bool>
+										<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+											<string key="IBUIAccessibilityLabel">Progression du téléversement/téléchargement</string>
+											<integer value="768" key="IBUIAccessibilityTraits"/>
+										</object>
+										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+										<float key="IBUIProgress">0.5</float>
+									</object>
+								</array>
+								<string key="NSFrame">{{0, 357}, {320, 59}}</string>
+								<reference key="NSSuperview" ref="715329044"/>
+								<reference key="NSNextKeyView" ref="661332796"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<reference key="IBUIBackgroundColor" ref="460939904"/>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+							</object>
 							<object class="IBUIView" id="833509359">
 								<reference key="NSNextResponder" ref="715329044"/>
 								<int key="NSvFlags">266</int>
@@ -157,7 +237,7 @@
 										<int key="NSvFlags">274</int>
 										<string key="NSFrameSize">{320, 59}</string>
 										<reference key="NSSuperview" ref="833509359"/>
-										<reference key="NSNextKeyView" ref="49605932"/>
+										<reference key="NSNextKeyView" ref="787000581"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<object class="NSColor" key="IBUIBackgroundColor">
 											<int key="NSColorSpace">1</int>
@@ -165,10 +245,17 @@
 										</object>
 										<bool key="IBUIUserInteractionEnabled">NO</bool>
 										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-										<object class="NSCustomResource" key="IBUIImage">
-											<string key="NSClassName">NSImage</string>
-											<string key="NSResourceName">chat_background.png</string>
-										</object>
+										<reference key="IBUIImage" ref="172588711"/>
+									</object>
+									<object class="IBUIView" id="787000581">
+										<reference key="NSNextResponder" ref="833509359"/>
+										<int key="NSvFlags">274</int>
+										<string key="NSFrameSize">{320, 59}</string>
+										<reference key="NSSuperview" ref="833509359"/>
+										<reference key="NSNextKeyView" ref="120263452"/>
+										<string key="NSReuseIdentifierKey">_NS:9</string>
+										<reference key="IBUIBackgroundColor" ref="460939904"/>
+										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 									</object>
 									<object class="IBUIButton" id="487645621">
 										<reference key="NSNextResponder" ref="833509359"/>
@@ -186,10 +273,7 @@
 										<int key="IBUIContentVerticalAlignment">0</int>
 										<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
 										<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
-										<object class="NSColor" key="IBUINormalTitleShadowColor" id="153071662">
-											<int key="NSColorSpace">3</int>
-											<bytes key="NSWhite">MC41AA</bytes>
-										</object>
+										<reference key="IBUINormalTitleShadowColor" ref="153071662"/>
 										<object class="NSCustomResource" key="IBUIHighlightedImage">
 											<string key="NSClassName">NSImage</string>
 											<string key="NSResourceName">chat_send_over.png</string>
@@ -202,15 +286,32 @@
 											<string key="NSClassName">NSImage</string>
 											<string key="NSResourceName">chat_send_default.png</string>
 										</object>
-										<object class="IBUIFontDescription" key="IBUIFontDescription" id="278893601">
-											<int key="type">2</int>
-											<double key="pointSize">15</double>
+										<reference key="IBUIFontDescription" ref="278893601"/>
+										<reference key="IBUIFont" ref="740255166"/>
+									</object>
+									<object class="IBUIButton" id="120263452">
+										<reference key="NSNextResponder" ref="833509359"/>
+										<int key="NSvFlags">300</int>
+										<string key="NSFrameSize">{40, 59}</string>
+										<reference key="NSSuperview" ref="833509359"/>
+										<reference key="NSNextKeyView" ref="49605932"/>
+										<string key="NSReuseIdentifierKey">_NS:9</string>
+										<bool key="IBUIOpaque">NO</bool>
+										<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+											<string key="IBUIAccessibilityLabel">Envoyer l'image</string>
 										</object>
-										<object class="NSFont" key="IBUIFont" id="871116895">
-											<string key="NSName">Helvetica-Bold</string>
-											<double key="NSSize">15</double>
-											<int key="NSfFlags">16</int>
+										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+										<int key="IBUIContentHorizontalAlignment">0</int>
+										<int key="IBUIContentVerticalAlignment">0</int>
+										<string key="IBUINormalTitle">Img</string>
+										<reference key="IBUIHighlightedTitleColor" ref="795265735"/>
+										<object class="NSColor" key="IBUINormalTitleColor">
+											<int key="NSColorSpace">1</int>
+											<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
 										</object>
+										<reference key="IBUINormalTitleShadowColor" ref="153071662"/>
+										<reference key="IBUIFontDescription" ref="278893601"/>
+										<reference key="IBUIFont" ref="740255166"/>
 									</object>
 									<object class="IBUIView" id="49605932">
 										<reference key="NSNextResponder" ref="833509359"/>
@@ -219,7 +320,7 @@
 											<object class="IBUIImageView" id="946416684">
 												<reference key="NSNextResponder" ref="49605932"/>
 												<int key="NSvFlags">274</int>
-												<string key="NSFrameSize">{250, 59}</string>
+												<string key="NSFrameSize">{210, 59}</string>
 												<reference key="NSSuperview" ref="49605932"/>
 												<reference key="NSNextKeyView" ref="587350058"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -233,7 +334,7 @@
 											<object class="IBUIView" id="587350058">
 												<reference key="NSNextResponder" ref="49605932"/>
 												<int key="NSvFlags">274</int>
-												<string key="NSFrame">{{10, 10}, {230, 39}}</string>
+												<string key="NSFrame">{{10, 10}, {190, 39}}</string>
 												<reference key="NSSuperview" ref="49605932"/>
 												<reference key="NSNextKeyView" ref="487645621"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -241,7 +342,7 @@
 												<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 											</object>
 										</array>
-										<string key="NSFrameSize">{250, 59}</string>
+										<string key="NSFrame">{{40, 0}, {210, 59}}</string>
 										<reference key="NSSuperview" ref="833509359"/>
 										<reference key="NSNextKeyView" ref="946416684"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -307,7 +408,7 @@
 									<string key="NSResourceName">chat_back_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="278893601"/>
-								<reference key="IBUIFont" ref="871116895"/>
+								<reference key="IBUIFont" ref="740255166"/>
 							</object>
 							<object class="IBUIButton" id="602867427">
 								<reference key="NSNextResponder" ref="333187864"/>
@@ -338,7 +439,7 @@
 									<string key="NSResourceName">chat_edit_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="278893601"/>
-								<reference key="IBUIFont" ref="871116895"/>
+								<reference key="IBUIFont" ref="740255166"/>
 							</object>
 						</array>
 						<string key="NSFrameSize">{320, 44}</string>
@@ -482,6 +583,38 @@
 					</object>
 					<int key="connectionID">71</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">imageTransferProgressBar</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="164391443"/>
+					</object>
+					<int key="connectionID">79</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">pictureButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="120263452"/>
+					</object>
+					<int key="connectionID">84</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">cancelTransferButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="391057061"/>
+					</object>
+					<int key="connectionID">85</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">transferView</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="229066993"/>
+					</object>
+					<int key="connectionID">86</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">dataSource</string>
@@ -551,6 +684,24 @@
 					</object>
 					<int key="connectionID">62</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">onPictureClick:</string>
+						<reference key="source" ref="120263452"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">87</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">onTransferCancelClick:</string>
+						<reference key="source" ref="391057061"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">78</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -622,6 +773,7 @@
 							<reference ref="414508017"/>
 							<reference ref="879615756"/>
 							<reference ref="833509359"/>
+							<reference ref="229066993"/>
 						</array>
 						<reference key="parent" ref="589117993"/>
 						<string key="objectName">chatView</string>
@@ -669,6 +821,8 @@
 							<reference ref="487645621"/>
 							<reference ref="131075038"/>
 							<reference ref="49605932"/>
+							<reference ref="120263452"/>
+							<reference ref="787000581"/>
 						</array>
 						<reference key="parent" ref="715329044"/>
 						<string key="objectName">footerView</string>
@@ -713,6 +867,47 @@
 						<reference key="parent" ref="49605932"/>
 						<string key="objectName">messageField</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">73</int>
+						<reference key="object" ref="120263452"/>
+						<reference key="parent" ref="833509359"/>
+						<string key="objectName">pictureButton</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">82</int>
+						<reference key="object" ref="787000581"/>
+						<reference key="parent" ref="833509359"/>
+						<string key="objectName">normalView</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">72</int>
+						<reference key="object" ref="229066993"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="164391443"/>
+							<reference ref="391057061"/>
+							<reference ref="661332796"/>
+						</array>
+						<reference key="parent" ref="715329044"/>
+						<string key="objectName">transferView</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">74</int>
+						<reference key="object" ref="164391443"/>
+						<reference key="parent" ref="229066993"/>
+						<string key="objectName">transferProgressBar</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">75</int>
+						<reference key="object" ref="391057061"/>
+						<reference key="parent" ref="229066993"/>
+						<string key="objectName">cancelTransferButton</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">83</int>
+						<reference key="object" ref="661332796"/>
+						<reference key="parent" ref="229066993"/>
+						<string key="objectName">footerBackgroundImage</string>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -742,7 +937,13 @@
 				<string key="66.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="68.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="72.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="74.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="75.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="82.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="83.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="9.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
 				<real value="2" key="9.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
@@ -751,7 +952,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">71</int>
+			<int key="maxID">87</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -771,7 +972,9 @@
 						<string key="onEditClick:">id</string>
 						<string key="onListTap:">id</string>
 						<string key="onMessageChange:">id</string>
+						<string key="onPictureClick:">id</string>
 						<string key="onSendClick:">id</string>
+						<string key="onTransferCancelClick:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
 						<object class="IBActionInfo" key="onBackClick:">
@@ -790,25 +993,37 @@
 							<string key="name">onMessageChange:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="onPictureClick:">
+							<string key="name">onPictureClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 						<object class="IBActionInfo" key="onSendClick:">
 							<string key="name">onSendClick:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="onTransferCancelClick:">
+							<string key="name">onTransferCancelClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="addressLabel">UILabel</string>
 						<string key="avatarImage">UIImageView</string>
+						<string key="cancelTransferButton">UIButton</string>
 						<string key="chatView">UIView</string>
 						<string key="editButton">UIToggleButton</string>
 						<string key="footerBackgroundImage">UIImageView</string>
 						<string key="footerView">UIView</string>
 						<string key="headerView">UIView</string>
+						<string key="imageTransferProgressBar">UIProgressView</string>
 						<string key="listTapGestureRecognizer">UITapGestureRecognizer</string>
 						<string key="messageBackgroundImage">UIImageView</string>
 						<string key="messageField">HPGrowingTextView</string>
 						<string key="messageView">UIView</string>
+						<string key="pictureButton">UIButton</string>
 						<string key="sendButton">UIButton</string>
 						<string key="tableController">ChatRoomTableViewController</string>
+						<string key="transferView">UIView</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
 						<object class="IBToOneOutletInfo" key="addressLabel">
@@ -819,6 +1034,10 @@
 							<string key="name">avatarImage</string>
 							<string key="candidateClassName">UIImageView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="cancelTransferButton">
+							<string key="name">cancelTransferButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="chatView">
 							<string key="name">chatView</string>
 							<string key="candidateClassName">UIView</string>
@@ -839,6 +1058,10 @@
 							<string key="name">headerView</string>
 							<string key="candidateClassName">UIView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="imageTransferProgressBar">
+							<string key="name">imageTransferProgressBar</string>
+							<string key="candidateClassName">UIProgressView</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="listTapGestureRecognizer">
 							<string key="name">listTapGestureRecognizer</string>
 							<string key="candidateClassName">UITapGestureRecognizer</string>
@@ -855,6 +1078,10 @@
 							<string key="name">messageView</string>
 							<string key="candidateClassName">UIView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="pictureButton">
+							<string key="name">pictureButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="sendButton">
 							<string key="name">sendButton</string>
 							<string key="candidateClassName">UIButton</string>
@@ -863,6 +1090,10 @@
 							<string key="name">tableController</string>
 							<string key="candidateClassName">ChatRoomTableViewController</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="transferView">
+							<string key="name">transferView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
 					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>

Classes/fr.lproj/ChatViewController.xib

@@ -60,8 +60,8 @@
 							</object>
 							<object class="IBUIButton" id="174033966">
 								<reference key="NSNextResponder" ref="852221244"/>
-								<int key="NSvFlags">289</int>
-								<string key="NSFrame">{{160, 0}, {160, 44}}</string>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrameSize">{160, 44}</string>
 								<reference key="NSSuperview" ref="852221244"/>
 								<reference key="NSNextKeyView" ref="490705294"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -97,8 +97,8 @@
 							</object>
 							<object class="IBUIButton" id="1001279594">
 								<reference key="NSNextResponder" ref="852221244"/>
-								<int key="NSvFlags">292</int>
-								<string key="NSFrameSize">{160, 44}</string>
+								<int key="NSvFlags">289</int>
+								<string key="NSFrame">{{160, 0}, {160, 44}}</string>
 								<reference key="NSSuperview" ref="852221244"/>
 								<reference key="NSNextKeyView" ref="174033966"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
@@ -380,8 +380,8 @@
 						<int key="objectID">7</int>
 						<reference key="object" ref="852221244"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="1001279594"/>
 							<reference ref="428805768"/>
+							<reference ref="1001279594"/>
 							<reference ref="174033966"/>
 						</array>
 						<reference key="parent" ref="1010501960"/>

Classes/fr.lproj/DialerViewController~ipad.xib

@@ -37,6 +37,70 @@
 				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<array class="NSMutableArray" key="NSSubviews">
+					<object class="IBUIView" id="887694290">
+						<reference key="NSNextResponder" ref="450916897"/>
+						<int key="NSvFlags">301</int>
+						<string key="NSFrame">{{-1000, -1000}, {2768, 2900}}</string>
+						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSNextKeyView" ref="935083036"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<object class="NSColor" key="IBUIBackgroundColor">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MAA</bytes>
+						</object>
+						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+					</object>
+					<object class="IBUIView" id="820868226">
+						<reference key="NSNextResponder" ref="450916897"/>
+						<int key="NSvFlags">274</int>
+						<string key="NSFrame">{{0, 58}, {768, 842}}</string>
+						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSNextKeyView" ref="857979271"/>
+						<object class="NSColor" key="IBUIBackgroundColor" id="474273757">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MCAwAA</bytes>
+						</object>
+						<int key="IBUIContentMode">2</int>
+						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+					</object>
+					<object class="IBUIButton" id="857979271">
+						<reference key="NSNextResponder" ref="450916897"/>
+						<int key="NSvFlags">-2147483356</int>
+						<string key="NSFrame">{{0, 77}, {85, 33}}</string>
+						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSNextKeyView" ref="811328787"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="IBUIOpaque">NO</bool>
+						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+							<string key="IBUIAccessibilityLabel">Changer de camera</string>
+						</object>
+						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+						<int key="IBUIContentHorizontalAlignment">0</int>
+						<int key="IBUIContentVerticalAlignment">0</int>
+						<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
+						<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
+						<object class="NSColor" key="IBUINormalTitleShadowColor" id="213950483">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MC41AA</bytes>
+						</object>
+						<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">switch_camera_over.png</string>
+						</object>
+						<object class="NSCustomResource" key="IBUINormalBackgroundImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">switch_camera_default.png</string>
+						</object>
+						<object class="IBUIFontDescription" key="IBUIFontDescription" id="551176679">
+							<int key="type">2</int>
+							<double key="pointSize">15</double>
+						</object>
+						<object class="NSFont" key="IBUIFont" id="733629239">
+							<string key="NSName">Helvetica-Bold</string>
+							<double key="NSSize">15</double>
+							<int key="NSfFlags">16</int>
+						</object>
+					</object>
 					<object class="IBUIView" id="935083036">
 						<reference key="NSNextResponder" ref="450916897"/>
 						<int key="NSvFlags">290</int>
@@ -101,7 +165,7 @@
 								<int key="NSvFlags">289</int>
 								<string key="NSFrame">{{698, 4}, {70, 51}}</string>
 								<reference key="NSSuperview" ref="935083036"/>
-								<reference key="NSNextKeyView" ref="811328787"/>
+								<reference key="NSNextKeyView" ref="820868226"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -117,10 +181,7 @@
 								<double key="IBUIContentEdgeInsets.bottom">15</double>
 								<double key="IBUIContentEdgeInsets.left">15</double>
 								<double key="IBUIContentEdgeInsets.right">15</double>
-								<object class="NSColor" key="IBUINormalTitleShadowColor" id="213950483">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MC41AA</bytes>
-								</object>
+								<reference key="IBUINormalTitleShadowColor" ref="213950483"/>
 								<object class="NSCustomResource" key="IBUIHighlightedImage">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">backspace_over~ipad.png</string>
@@ -133,15 +194,8 @@
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">backspace_default~ipad.png</string>
 								</object>
-								<object class="IBUIFontDescription" key="IBUIFontDescription" id="551176679">
-									<int key="type">2</int>
-									<double key="pointSize">15</double>
-								</object>
-								<object class="NSFont" key="IBUIFont" id="914591064">
-									<string key="NSName">Helvetica-Bold</string>
-									<double key="NSSize">15</double>
-									<int key="NSfFlags">16</int>
-								</object>
+								<reference key="IBUIFontDescription" ref="551176679"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 						</array>
 						<string key="NSFrameSize">{768, 80}</string>
@@ -162,6 +216,21 @@
 						<reference key="NSNextResponder" ref="450916897"/>
 						<int key="NSvFlags">268</int>
 						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUIImageView" id="848268216">
+								<reference key="NSNextResponder" ref="811328787"/>
+								<int key="NSvFlags">274</int>
+								<string key="NSFrameSize">{320, 280}</string>
+								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSNextKeyView" ref="257730270"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<int key="IBUITag">2</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+								<object class="NSCustomResource" key="IBUIImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">background_alt.png</string>
+								</object>
+							</object>
 							<object class="IBUIButton" id="257730270">
 								<reference key="NSNextResponder" ref="811328787"/>
 								<int key="NSvFlags">292</int>
@@ -195,7 +264,7 @@
 									<int key="traits">2</int>
 									<double key="pointSize">15</double>
 								</object>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="579980565">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -221,7 +290,7 @@
 									<string key="NSResourceName">numpad_two_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="534491605">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -247,7 +316,7 @@
 									<string key="NSResourceName">numpad_three_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="405606838">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -273,7 +342,7 @@
 									<string key="NSResourceName">numpad_four_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="984444210">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -299,7 +368,7 @@
 									<string key="NSResourceName">numpad_five_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="505513327">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -325,7 +394,7 @@
 									<string key="NSResourceName">numpad_six_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="829692929">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -351,7 +420,7 @@
 									<string key="NSResourceName">numpad_seven_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="430965229">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -377,7 +446,7 @@
 									<string key="NSResourceName">numpad_eight_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="565116665">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -403,7 +472,7 @@
 									<string key="NSResourceName">numpad_nine_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="47810246">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -429,7 +498,7 @@
 									<string key="NSResourceName">numpad_star_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="776264615">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -455,7 +524,7 @@
 									<string key="NSResourceName">numpad_zero_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="718499319">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -481,17 +550,14 @@
 									<string key="NSResourceName">numpad_sharp_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 						</array>
 						<string key="NSFrame">{{0, 640}, {320, 260}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
-						<reference key="NSNextKeyView" ref="257730270"/>
+						<reference key="NSNextKeyView" ref="848268216"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor" id="474273757">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MCAwAA</bytes>
-						</object>
+						<reference key="IBUIBackgroundColor" ref="474273757"/>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 					</object>
 					<object class="IBUIView" id="683359487">
@@ -529,7 +595,7 @@
 									<string key="NSResourceName">add_contact_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="405746031">
 								<reference key="NSNextResponder" ref="683359487"/>
@@ -561,7 +627,7 @@
 									<string key="NSResourceName">back_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="981547916">
 								<reference key="NSNextResponder" ref="683359487"/>
@@ -594,7 +660,7 @@
 									<string key="NSResourceName">call_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="514058756">
 								<reference key="NSNextResponder" ref="683359487"/>
@@ -627,7 +693,7 @@
 									<string key="NSResourceName">add_call_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="1043651254">
 								<reference key="NSNextResponder" ref="683359487"/>
@@ -659,7 +725,7 @@
 									<string key="NSResourceName">transfer_call_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 						</array>
 						<string key="NSFrame">{{456, 815}, {312, 85}}</string>
@@ -675,7 +741,7 @@
 					</object>
 				</array>
 				<string key="NSFrameSize">{768, 900}</string>
-				<reference key="NSNextKeyView" ref="935083036"/>
+				<reference key="NSNextKeyView" ref="887694290"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="474273757"/>
 				<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -843,6 +909,30 @@
 					</object>
 					<int key="connectionID">69</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">videoCameraSwitch</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="857979271"/>
+					</object>
+					<int key="connectionID">74</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">videoPreview</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="820868226"/>
+					</object>
+					<int key="connectionID">75</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">backgroundView</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="887694290"/>
+					</object>
+					<int key="connectionID">77</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">onAddressChange:</string>
@@ -998,6 +1088,14 @@
 					</object>
 					<int key="connectionID">39</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">preview</string>
+						<reference key="source" ref="857979271"/>
+						<reference key="destination" ref="820868226"/>
+					</object>
+					<int key="connectionID">72</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -1025,6 +1123,9 @@
 							<reference ref="811328787"/>
 							<reference ref="683359487"/>
 							<reference ref="935083036"/>
+							<reference ref="820868226"/>
+							<reference ref="857979271"/>
+							<reference ref="887694290"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -1057,6 +1158,7 @@
 							<reference ref="534491605"/>
 							<reference ref="579980565"/>
 							<reference ref="257730270"/>
+							<reference ref="848268216"/>
 						</array>
 						<reference key="parent" ref="450916897"/>
 						<string key="objectName">pad</string>
@@ -1192,6 +1294,30 @@
 						<reference key="parent" ref="935083036"/>
 						<string key="objectName">backspaceButton</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">70</int>
+						<reference key="object" ref="820868226"/>
+						<reference key="parent" ref="450916897"/>
+						<string key="objectName">preview</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">71</int>
+						<reference key="object" ref="857979271"/>
+						<reference key="parent" ref="450916897"/>
+						<string key="objectName">videoCameraSwitch</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">73</int>
+						<reference key="object" ref="848268216"/>
+						<reference key="parent" ref="811328787"/>
+						<string key="objectName">background</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">76</int>
+						<reference key="object" ref="887694290"/>
+						<reference key="parent" ref="450916897"/>
+						<string key="objectName">backgroundView</string>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1253,6 +1379,12 @@
 				<string key="6.CustomClassName">UIAddressTextField</string>
 				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="70.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="71.CustomClassName">UICamSwitch</string>
+				<string key="71.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<real value="1" key="71.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="76.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="8.CustomClassName">UIDigitButton</string>
 				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="8.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
@@ -1264,7 +1396,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">69</int>
+			<int key="maxID">77</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1295,6 +1427,7 @@
 						<string key="addContactButton">UIButton</string>
 						<string key="addressField">UITextField</string>
 						<string key="backButton">UIButton</string>
+						<string key="backgroundView">UIView</string>
 						<string key="callButton">UICallButton</string>
 						<string key="eightButton">UIDigitButton</string>
 						<string key="eraseButton">UIEraseButton</string>
@@ -1309,6 +1442,8 @@
 						<string key="threeButton">UIDigitButton</string>
 						<string key="transferButton">UITransferButton</string>
 						<string key="twoButton">UIDigitButton</string>
+						<string key="videoCameraSwitch">UICamSwitch</string>
+						<string key="videoPreview">UIView</string>
 						<string key="zeroButton">UIDigitButton</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -1328,6 +1463,10 @@
 							<string key="name">backButton</string>
 							<string key="candidateClassName">UIButton</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="backgroundView">
+							<string key="name">backgroundView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="callButton">
 							<string key="name">callButton</string>
 							<string key="candidateClassName">UICallButton</string>
@@ -1384,6 +1523,14 @@
 							<string key="name">twoButton</string>
 							<string key="candidateClassName">UIDigitButton</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="videoCameraSwitch">
+							<string key="name">videoCameraSwitch</string>
+							<string key="candidateClassName">UICamSwitch</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="videoPreview">
+							<string key="name">videoPreview</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="zeroButton">
 							<string key="name">zeroButton</string>
 							<string key="candidateClassName">UIDigitButton</string>
@@ -1421,6 +1568,25 @@
 						<string key="minorKey">./Classes/UICallButton.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UICamSwitch</string>
+					<string key="superclassName">UIButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">preview</string>
+						<string key="NS.object.0">UIView</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">preview</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">preview</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UICamSwitch.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">UIDigitButton</string>
 					<string key="superclassName">UILongTouchButton</string>
@@ -1506,6 +1672,7 @@
 			<string key="back_default~ipad.png">{251, 170}</string>
 			<string key="back_disabled~ipad.png">{251, 170}</string>
 			<string key="back_over~ipad.png">{251, 170}</string>
+			<string key="background_alt.png">{640, 561}</string>
 			<string key="backspace_default~ipad.png">{81, 43}</string>
 			<string key="backspace_disabled~ipad.png">{81, 43}</string>
 			<string key="backspace_over~ipad.png">{81, 43}</string>
@@ -1537,6 +1704,8 @@
 			<string key="numpad_two_over.png">{220, 113}</string>
 			<string key="numpad_zero_default.png">{220, 113}</string>
 			<string key="numpad_zero_over.png">{220, 113}</string>
+			<string key="switch_camera_default.png">{170, 65}</string>
+			<string key="switch_camera_over.png">{170, 65}</string>
 			<string key="transfer_call_default~ipad.png">{371, 170}</string>
 			<string key="transfer_call_disabled~ipad.png">{371, 170}</string>
 			<string key="transfer_call_over~ipad.png">{371, 170}</string>

Classes/fr.lproj/HistoryViewController.xib

@@ -109,11 +109,10 @@
 								<int key="IBUIContentVerticalAlignment">0</int>
 								<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
 								<reference key="IBUINormalTitleShadowColor" ref="873246362"/>
-								<object class="NSCustomResource" key="IBUIHighlightedImage" id="739681638">
+								<object class="NSCustomResource" key="IBUIHighlightedImage">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">history_all_selected.png</string>
 								</object>
-								<reference key="IBUISelectedImage" ref="739681638"/>
 								<object class="NSCustomResource" key="IBUINormalImage">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">history_all_default.png</string>
@@ -181,7 +180,7 @@
 								<reference key="IBUIFont" ref="590723448"/>
 							</object>
 						</array>
-						<string key="NSFrameSize">{320, 58}</string>
+						<string key="NSFrameSize">{320, 44}</string>
 						<reference key="NSSuperview" ref="812520855"/>
 						<reference key="NSNextKeyView" ref="929072924"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>

Classes/fr.lproj/ImageViewController.xib

@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1296</int>
+		<string key="IBDocument.SystemVersion">11E53</string>
+		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
+		<string key="IBDocument.AppKitVersion">1138.47</string>
+		<string key="IBDocument.HIToolboxVersion">569.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+			<string key="NS.object.0">933</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBUIButton</string>
+			<string>IBUIImageView</string>
+			<string>IBUIView</string>
+			<string>IBProxyObject</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<object class="IBProxyObject" id="372490531">
+				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+			<object class="IBProxyObject" id="975951072">
+				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+			<object class="IBUIView" id="191373211">
+				<nil key="NSNextResponder"/>
+				<int key="NSvFlags">274</int>
+				<array class="NSMutableArray" key="NSSubviews">
+					<object class="IBUIImageView" id="170933358">
+						<reference key="NSNextResponder" ref="191373211"/>
+						<int key="NSvFlags">274</int>
+						<string key="NSFrame">{{0, 44}, {320, 416}}</string>
+						<reference key="NSSuperview" ref="191373211"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<object class="NSColor" key="IBUIBackgroundColor" id="986758619">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MCAwAA</bytes>
+						</object>
+						<int key="IBUIContentMode">4</int>
+						<bool key="IBUIUserInteractionEnabled">NO</bool>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
+					<object class="IBUIView" id="350805517">
+						<reference key="NSNextResponder" ref="191373211"/>
+						<int key="NSvFlags">290</int>
+						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUIImageView" id="714444944">
+								<reference key="NSNextResponder" ref="350805517"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrameSize">{320, 44}</string>
+								<reference key="NSSuperview" ref="350805517"/>
+								<reference key="NSNextKeyView" ref="771824371"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<object class="NSCustomResource" key="IBUIImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">toolsbar_background.png</string>
+								</object>
+							</object>
+							<object class="IBUIButton" id="771824371">
+								<reference key="NSNextResponder" ref="350805517"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrameSize">{80, 44}</string>
+								<reference key="NSSuperview" ref="350805517"/>
+								<reference key="NSNextKeyView" ref="170933358"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<bool key="IBUIOpaque">NO</bool>
+								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+									<string key="IBUIAccessibilityLabel">Retour</string>
+								</object>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<int key="IBUIContentHorizontalAlignment">0</int>
+								<int key="IBUIContentVerticalAlignment">0</int>
+								<object class="NSColor" key="IBUIHighlightedTitleColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MQA</bytes>
+								</object>
+								<object class="NSColor" key="IBUINormalTitleColor">
+									<int key="NSColorSpace">1</int>
+									<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+								</object>
+								<object class="NSColor" key="IBUINormalTitleShadowColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MC41AA</bytes>
+								</object>
+								<object class="NSCustomResource" key="IBUINormalImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">chat_back_default.png</string>
+								</object>
+								<object class="NSCustomResource" key="IBUINormalBackgroundImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">chat_back_over.png</string>
+								</object>
+								<object class="IBUIFontDescription" key="IBUIFontDescription">
+									<int key="type">2</int>
+									<double key="pointSize">15</double>
+								</object>
+								<object class="NSFont" key="IBUIFont">
+									<string key="NSName">Helvetica-Bold</string>
+									<double key="NSSize">15</double>
+									<int key="NSfFlags">16</int>
+								</object>
+							</object>
+						</array>
+						<string key="NSFrameSize">{320, 44}</string>
+						<reference key="NSSuperview" ref="191373211"/>
+						<reference key="NSNextKeyView" ref="714444944"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<reference key="IBUIBackgroundColor" ref="986758619"/>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
+				</array>
+				<string key="NSFrame">{{0, 20}, {320, 460}}</string>
+				<reference key="NSNextKeyView" ref="350805517"/>
+				<reference key="IBUIBackgroundColor" ref="986758619"/>
+				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">view</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="191373211"/>
+					</object>
+					<int key="connectionID">3</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">imageView</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="170933358"/>
+					</object>
+					<int key="connectionID">9</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">backButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="771824371"/>
+					</object>
+					<int key="connectionID">8</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">onBackClick:</string>
+						<reference key="source" ref="771824371"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">10</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1</int>
+						<reference key="object" ref="191373211"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="170933358"/>
+							<reference ref="350805517"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="372490531"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="975951072"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">4</int>
+						<reference key="object" ref="170933358"/>
+						<reference key="parent" ref="191373211"/>
+						<string key="objectName">imageView</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">11</int>
+						<reference key="object" ref="350805517"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="714444944"/>
+							<reference ref="771824371"/>
+						</array>
+						<reference key="parent" ref="191373211"/>
+						<string key="objectName">toolbar</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">7</int>
+						<reference key="object" ref="771824371"/>
+						<reference key="parent" ref="350805517"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="714444944"/>
+						<reference key="parent" ref="350805517"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.CustomClassName">ImageViewController</string>
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="-2.CustomClassName">UIResponder</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">11</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">ImageViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">onBackClick:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">onBackClick:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">onBackClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="backButton">UIButton</string>
+						<string key="imageView">UIImageView</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="backButton">
+							<string key="name">backButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="imageView">
+							<string key="name">imageView</string>
+							<string key="candidateClassName">UIImageView</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/ImageViewController.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+			<real value="1296" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="chat_back_default.png">{320, 88}</string>
+			<string key="chat_back_over.png">{320, 88}</string>
+			<string key="toolsbar_background.png">{5, 117}</string>
+		</dictionary>
+		<string key="IBCocoaTouchPluginVersion">933</string>
+	</data>
+</archive>

Classes/fr.lproj/WizardViewController.xib

@@ -448,6 +448,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
 						<object class="NSCustomResource" key="IBUIBackground" id="814678829">
@@ -489,6 +490,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<bool key="IBUISecureTextEntry">YES</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
@@ -521,6 +523,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<bool key="IBUISecureTextEntry">YES</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
@@ -553,6 +556,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
 						<reference key="IBUIBackground" ref="814678829"/>
@@ -685,6 +689,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<bool key="IBUISecureTextEntry">YES</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
@@ -717,6 +722,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
 						<reference key="IBUIBackground" ref="814678829"/>
@@ -798,6 +804,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
 						<reference key="IBUIBackground" ref="814678829"/>
@@ -829,6 +836,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<bool key="IBUISecureTextEntry">YES</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
@@ -861,6 +869,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
 						<reference key="IBUIBackground" ref="814678829"/>
@@ -986,6 +995,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<bool key="IBUISecureTextEntry">YES</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
@@ -1018,6 +1028,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
 						<reference key="IBUIBackground" ref="814678829"/>

README

@@ -32,6 +32,8 @@ Link host's strings to simulator SDK
 	For newer XCode:
 	$ sudo ln -s  /usr/bin/strings /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/strings
 
+ImageMagick & Optipng
+	sudo port install ImageMagick optipng
 
 BUILDING THE SDK
 ****************
@@ -78,6 +80,12 @@ The liblinphone-sdk is compiled with third parties code that are subject to pate
 Linphone controls the embedding of these codecs thanks to the preprocessor macros HAVE_SILK, HAVE_AMR, HAVE_G729 HAVE_X264 positioned in xcode project.
 Before embeding these 4 codecs in the final application, make sure to have the right to do so.
 
+TRANSLATER THE APPLICATION
+**************************
+
+You have to download the application Localization Suite(http://www.loc-suite.org/)
+Each modification in a xib have to be scanned and synchronized
+
 
 LIMITATIONS, KNOWN BUGS
 ***********************

Resources/linphonerc

@@ -17,8 +17,15 @@ show_local=0
 enabled=1
 size=qvga
 display_filter_auto_rotate=1
+automatically_initiate=0
+automatically_accept=0
 
+[net]
+firewall_policy=0
 
+[app]
+rotation_preference=auto
+animations_preference=1
 
 [default_values]
 reg_expires=600

Resources/linphonerc-factory

@@ -1,8 +1,10 @@
 [net]
 download_bw=380
 upload_bw=380
-firewall_policy=0
 mtu=1300
+activate_edge_workarounds=1
+edge_ping_time=200
+edge_bw=10
 
 [sip]
 guess_hostname=1
@@ -29,4 +31,13 @@ dtmf_player_amp=0.007
 history_max_size=30
 max_calls=3
 
+[wizard]
+service_url=https://www.linphone.org/wizard.php
+domain=sip.linphone.org
+proxy=sip.linphone.org:5223
+password_length=6
+username_length=4
+expires=600
+push_notification=1
+transport=tls
 

Resources/linphonerc-factory~ipad

@@ -1,8 +1,10 @@
 [net]
 download_bw=512
 upload_bw=512
-firewall_policy=0
 mtu=1300
+activate_edge_workarounds=1
+edge_ping_time=200
+edge_bw=10
 
 [sip]
 guess_hostname=1
@@ -29,11 +31,12 @@ dtmf_player_amp=0.007
 history_max_size=30
 max_calls=3
 
-[video]
-display=1
-capture=1
-show_local=0
-enabled=1
-size=vga
-display_filter_auto_rotate=1
-
+[wizard]
+service_url=https://www.linphone.org/wizard.php
+domain=sip.linphone.org
+proxy=sip.linphone.org:5223
+password_length=6
+username_length=4
+expires=600
+push_notification=1
+transport=tls

Resources/linphonerc~ipad

@@ -4,7 +4,28 @@ sip_tcp_random_port=1
 sip_tls_random_port=1
 contact="Linphone iPhone" <sip:linphone.iphone@unknown-host>
 keepalive_period=30000
+default_proxy=0
 
 [rtp]
 audio_rtp_port=7076
-video_rtp_port=9078
+video_rtp_port=9078
+
+[video]
+display=1
+capture=1
+show_local=1
+enabled=1
+size=vga
+display_filter_auto_rotate=1
+automatically_initiate=0
+automatically_accept=0
+
+[net]
+firewall_policy=0
+
+[app]
+rotation_preference=auto
+animations_preference=1
+
+[default_values]
+reg_expires=600

Settings/InAppSettings.bundle/Advanced.plist

@@ -111,6 +111,8 @@
 			<string>NumberPad</string>
 			<key>DefaultValue</key>
 			<integer>600</integer>
+			<key>IASKTextAlignment</key>
+			<string>IASKUITextAlignmentRight</string>
 		</dict>
 		<dict>
 			<key>Title</key>
@@ -137,6 +139,8 @@
 			<string>Display name</string>
 			<key>Type</key>
 			<string>PSTextFieldSpecifier</string>
+			<key>IASKTextAlignment</key>
+			<string>IASKUITextAlignmentRight</string>
 		</dict>
 		<dict>
 			<key>AutocapitalizationType</key>
@@ -155,6 +159,24 @@
 			<string>Username</string>
 			<key>Type</key>
 			<string>PSTextFieldSpecifier</string>
+			<key>IASKTextAlignment</key>
+			<string>IASKUITextAlignmentRight</string>
+		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+			<key>Title</key>
+			<string></string>
+		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSTextFieldSpecifier</string>
+			<key>Title</key>
+			<string>Sharing server</string>
+			<key>Key</key>
+			<string>file_upload_url_preference</string>
+			<key>IASKTextAlignment</key>
+			<string>IASKUITextAlignmentRight</string>
 		</dict>
 	</array>
 </dict>

Settings/InAppSettings.bundle/Call.plist

@@ -19,6 +19,8 @@
 			<string>Prefix</string>
 			<key>Type</key>
 			<string>PSTextFieldSpecifier</string>
+			<key>IASKTextAlignment</key>
+			<string>IASKUITextAlignmentRight</string>
 		</dict>
 		<dict>
 			<key>DefaultValue</key>

Settings/InAppSettings.bundle/Network.plist

@@ -27,6 +27,8 @@
 			<string>No</string>
 			<key>DefaultValue</key>
 			<string></string>
+			<key>IASKTextAlignment</key>
+			<string>IASKUITextAlignmentRight</string>
 		</dict>
 		<dict>
 			<key>Title</key>
@@ -63,6 +65,8 @@
 			<string>NumberPad</string>
 			<key>DefaultValue</key>
 			<integer>5060</integer>
+			<key>IASKTextAlignment</key>
+			<string>IASKUITextAlignmentRight</string>
 		</dict>
 		<dict>
 			<key>Key</key>
@@ -79,6 +83,8 @@
 			<string>NumberPad</string>
 			<key>DefaultValue</key>
 			<integer>7076</integer>
+			<key>IASKTextAlignment</key>
+			<string>IASKUITextAlignmentRight</string>
 		</dict>
 		<dict>
 			<key>Key</key>
@@ -95,6 +101,8 @@
 			<string>NumberPad</string>
 			<key>DefaultValue</key>
 			<integer>9078</integer>
+			<key>IASKTextAlignment</key>
+			<string>IASKUITextAlignmentRight</string>
 		</dict>
 		<dict>
 			<key>DefaultValue</key>
@@ -140,6 +148,16 @@
 				<string>ZRTP</string>
 			</array>
 		</dict>
+		<dict>
+			<key>Title</key>
+			<string>Push Notification</string>
+			<key>Key</key>
+			<string>pushnotification_preference</string>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+			<key>DefaultValue</key>
+			<false/>
+		</dict>
 	</array>
 </dict>
 </plist>

Settings/InAppSettings.bundle/Root.plist

@@ -10,6 +10,14 @@
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
 		</dict>
+		<dict>
+			<key>Key</key>
+			<string>wizard_button</string>
+			<key>Title</key>
+			<string>Wizard</string>
+			<key>Type</key>
+			<string>IASKButtonSpecifier</string>
+		</dict>
 		<dict>
 			<key>AutocapitalizationType</key>
 			<string>None</string>
@@ -192,6 +200,14 @@
 			<key>Type</key>
 			<string>IASKButtonSpecifier</string>
 		</dict>
+		<dict>
+			<key>Key</key>
+			<string>battery_alert_button</string>
+			<key>Title</key>
+			<string>Battery alert</string>
+			<key>Type</key>
+			<string>IASKButtonSpecifier</string>
+		</dict>
 	</array>
 	<key>StringsTable</key>
 	<string>Root</string>

Settings/InAppSettings.bundle/Video.plist

@@ -32,6 +32,14 @@
 			<key>Key</key>
 			<string>self_video_preference</string>
 		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+			<key>Title</key>
+			<string>Show preview</string>
+			<key>Key</key>
+			<string>preview_preference</string>
+		</dict>
 		<dict>
 			<key>Title</key>
 			<string>Codecs</string>

Settings/InAppSettings.bundle/en.lproj/Advanced.strings

@@ -34,6 +34,9 @@
 /* Display name */
 "Display name" = "Display name";
 
+/* Sharing server */
+"Sharing server" = "Sharing server";
+
 /* Username */
 "Username" = "Username";
 

Settings/InAppSettings.bundle/en.lproj/Network.strings

@@ -0,0 +1,51 @@
+/* Wifi only */
+"Wifi only" = "Wifi only";
+
+/* Stun server */
+"Stun server" = "Stun server";
+
+/* ICE */
+"ICE" = "ICE";
+
+/* Random Port */
+"Random Port" = "Random Port";
+
+/* Port */
+"Port" = "Port";
+
+/* Audio Port */
+"Audio Port" = "Audio Port";
+
+/* Video Port */
+"Video Port" = "Video Port";
+
+/* Transport */
+"Transport" = "Transport";
+
+/* Media Encryption */
+"Media Encryption" = "Media Encryption";
+
+/* Push Notifications */
+"Push Notification" = "Push Notification";
+
+/* Transport */
+"Transport" = "Transport";
+
+/* udp */
+"udp" = "udp";
+
+/* tcp */
+"tcp" = "tcp";
+
+/* tls */
+"tls" = "tls";
+
+/* None */
+"None" = "None";
+
+/* SRTP */
+"SRTP" = "SRTP";
+
+/* ZRTP */
+"ZRTP" = "ZRTP";
+

Settings/InAppSettings.bundle/en.lproj/Root.strings

@@ -1,6 +1,9 @@
 /* SIP account */
 "SIP account" = "SIP account";
 
+/* Wizard */
+"Wizard" = "Wizard";
+
 /* User name */
 "User name" = "User name";
 

Settings/InAppSettings.bundle/en.lproj/Video.strings

@@ -7,6 +7,9 @@
 /* Show self view */
 "Show self view" = "Show self view";
 
+/* Show preview */
+"Show preview" = "Show preview";
+
 /* Codecs */
 "Codecs" = "Codecs";
 

Settings/InAppSettings.bundle/fr.lproj/Advanced.strings

@@ -34,6 +34,9 @@
 /* Display name */
 "Display name" = "Nom d'affichage";
 
+/* Sharing server */
+"Sharing server" = "Serveur de partage";
+
 /* Username */
 "Username" = "Nom d'utilisateur";
 

Settings/InAppSettings.bundle/fr.lproj/Network.strings

@@ -0,0 +1,51 @@
+/* Wifi only */
+"Wifi only" = "Uniquement Wifi";
+
+/* Stun server */
+"Stun server" = "Serveur Stun";
+
+/* ICE */
+"ICE" = "ICE";
+
+/* Random Port */
+"Random Port" = "Port Aléatoire";
+
+/* Port */
+"Port" = "Port";
+
+/* Audio Port */
+"Audio Port" = "Port Audio";
+
+/* Video Port */
+"Video Port" = "Port Vidéo";
+
+/* Transport */
+"Transport" = "Transport";
+
+/* Media Encryption */
+"Media Encryption" = "Chiffrement";
+
+/* Push Notifications */
+"Push Notification" = "Push Notification";
+
+/* Transport */
+"Transport" = "Transport";
+
+/* udp */
+"udp" = "udp";
+
+/* tcp */
+"tcp" = "tcp";
+
+/* tls */
+"tls" = "tls";
+
+/* None */
+"None" = "Aucun";
+
+/* SRTP */
+"SRTP" = "SRTP";
+
+/* ZRTP */
+"ZRTP" = "ZRTP";
+

Settings/InAppSettings.bundle/fr.lproj/Root.strings

@@ -1,6 +1,9 @@
 /* SIP account */
 "SIP account" = "Compte SIP";
 
+/* Wizard */
+"Wizard" = "Assistant";
+
 /* User name */
 "User name" = "Nom d'utilisateur";
 

linphone.ldb/Resources/Classes/ChatRoomViewController/15/ChatRoomViewController.xib

@@ -15,6 +15,7 @@
 			<string>IBUIButton</string>
 			<string>IBUIImageView</string>
 			<string>IBUILabel</string>
+			<string>IBUIProgressView</string>
 			<string>IBUITableView</string>
 			<string>IBUITableViewController</string>
 			<string>IBUITapGestureRecognizer</string>
@@ -137,9 +138,9 @@
 								<string key="NSFrame">{{0, 80}, {320, 277}}</string>
 								<reference key="NSSuperview" ref="715329044"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="833509359"/>
+								<reference key="NSNextKeyView" ref="229066993"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
-								<object class="NSColor" key="IBUIBackgroundColor">
+								<object class="NSColor" key="IBUIBackgroundColor" id="795265735">
 									<int key="NSColorSpace">3</int>
 									<bytes key="NSWhite">MQA</bytes>
 								</object>
@@ -153,6 +154,89 @@
 								<float key="IBUISectionHeaderHeight">22</float>
 								<float key="IBUISectionFooterHeight">22</float>
 							</object>
+							<object class="IBUIView" id="229066993">
+								<reference key="NSNextResponder" ref="715329044"/>
+								<int key="NSvFlags">-2147483356</int>
+								<array class="NSMutableArray" key="NSSubviews">
+									<object class="IBUIImageView" id="661332796">
+										<reference key="NSNextResponder" ref="229066993"/>
+										<int key="NSvFlags">274</int>
+										<string key="NSFrameSize">{320, 59}</string>
+										<reference key="NSSuperview" ref="229066993"/>
+										<reference key="NSWindow"/>
+										<reference key="NSNextKeyView" ref="164391443"/>
+										<string key="NSReuseIdentifierKey">_NS:9</string>
+										<object class="NSColor" key="IBUIBackgroundColor">
+											<int key="NSColorSpace">1</int>
+											<bytes key="NSRGB">MSAwLjI4MzE1ODM3MjYgMC4wNTY3ODY4OTE2MQA</bytes>
+										</object>
+										<bool key="IBUIUserInteractionEnabled">NO</bool>
+										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+										<object class="NSCustomResource" key="IBUIImage" id="172588711">
+											<string key="NSClassName">NSImage</string>
+											<string key="NSResourceName">chat_background.png</string>
+										</object>
+									</object>
+									<object class="IBUIButton" id="391057061">
+										<reference key="NSNextResponder" ref="229066993"/>
+										<int key="NSvFlags">292</int>
+										<string key="NSFrame">{{250, 0}, {70, 59}}</string>
+										<reference key="NSSuperview" ref="229066993"/>
+										<reference key="NSWindow"/>
+										<reference key="NSNextKeyView" ref="833509359"/>
+										<string key="NSReuseIdentifierKey">_NS:9</string>
+										<bool key="IBUIOpaque">NO</bool>
+										<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+											<string key="IBUIAccessibilityLabel">Cancel</string>
+										</object>
+										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+										<int key="IBUIContentHorizontalAlignment">0</int>
+										<int key="IBUIContentVerticalAlignment">0</int>
+										<string key="IBUINormalTitle">Cancel</string>
+										<reference key="IBUIHighlightedTitleColor" ref="795265735"/>
+										<object class="NSColor" key="IBUINormalTitleColor">
+											<int key="NSColorSpace">1</int>
+											<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+										</object>
+										<object class="NSColor" key="IBUINormalTitleShadowColor" id="153071662">
+											<int key="NSColorSpace">3</int>
+											<bytes key="NSWhite">MC41AA</bytes>
+										</object>
+										<object class="IBUIFontDescription" key="IBUIFontDescription" id="278893601">
+											<int key="type">2</int>
+											<double key="pointSize">15</double>
+										</object>
+										<object class="NSFont" key="IBUIFont" id="740255166">
+											<string key="NSName">Helvetica-Bold</string>
+											<double key="NSSize">15</double>
+											<int key="NSfFlags">16</int>
+										</object>
+									</object>
+									<object class="IBUIProgressView" id="164391443">
+										<reference key="NSNextResponder" ref="229066993"/>
+										<int key="NSvFlags">292</int>
+										<string key="NSFrame">{{20, 25}, {213, 9}}</string>
+										<reference key="NSSuperview" ref="229066993"/>
+										<reference key="NSWindow"/>
+										<reference key="NSNextKeyView" ref="391057061"/>
+										<string key="NSReuseIdentifierKey">_NS:9</string>
+										<bool key="IBUIOpaque">NO</bool>
+										<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+											<string key="IBUIAccessibilityLabel">Upload or download progression</string>
+											<integer value="768" key="IBUIAccessibilityTraits"/>
+										</object>
+										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+										<float key="IBUIProgress">0.5</float>
+									</object>
+								</array>
+								<string key="NSFrame">{{0, 357}, {320, 59}}</string>
+								<reference key="NSSuperview" ref="715329044"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="661332796"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<reference key="IBUIBackgroundColor" ref="460939904"/>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+							</object>
 							<object class="IBUIView" id="833509359">
 								<reference key="NSNextResponder" ref="715329044"/>
 								<int key="NSvFlags">266</int>
@@ -163,7 +247,7 @@
 										<string key="NSFrameSize">{320, 59}</string>
 										<reference key="NSSuperview" ref="833509359"/>
 										<reference key="NSWindow"/>
-										<reference key="NSNextKeyView" ref="49605932"/>
+										<reference key="NSNextKeyView" ref="787000581"/>
 										<string key="NSReuseIdentifierKey">_NS:9</string>
 										<object class="NSColor" key="IBUIBackgroundColor">
 											<int key="NSColorSpace">1</int>
@@ -171,10 +255,18 @@
 										</object>
 										<bool key="IBUIUserInteractionEnabled">NO</bool>
 										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-										<object class="NSCustomResource" key="IBUIImage">
-											<string key="NSClassName">NSImage</string>
-											<string key="NSResourceName">chat_background.png</string>
-										</object>
+										<reference key="IBUIImage" ref="172588711"/>
+									</object>
+									<object class="IBUIView" id="787000581">
+										<reference key="NSNextResponder" ref="833509359"/>
+										<int key="NSvFlags">274</int>
+										<string key="NSFrameSize">{320, 59}</string>
+										<reference key="NSSuperview" ref="833509359"/>
+										<reference key="NSWindow"/>
+										<reference key="NSNextKeyView" ref="120263452"/>
+										<string key="NSReuseIdentifierKey">_NS:9</string>
+										<reference key="IBUIBackgroundColor" ref="460939904"/>
+										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 									</object>
 									<object class="IBUIButton" id="487645621">
 										<reference key="NSNextResponder" ref="833509359"/>
@@ -193,10 +285,7 @@
 										<int key="IBUIContentVerticalAlignment">0</int>
 										<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
 										<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
-										<object class="NSColor" key="IBUINormalTitleShadowColor" id="153071662">
-											<int key="NSColorSpace">3</int>
-											<bytes key="NSWhite">MC41AA</bytes>
-										</object>
+										<reference key="IBUINormalTitleShadowColor" ref="153071662"/>
 										<object class="NSCustomResource" key="IBUIHighlightedImage">
 											<string key="NSClassName">NSImage</string>
 											<string key="NSResourceName">chat_send_over.png</string>
@@ -209,15 +298,33 @@
 											<string key="NSClassName">NSImage</string>
 											<string key="NSResourceName">chat_send_default.png</string>
 										</object>
-										<object class="IBUIFontDescription" key="IBUIFontDescription" id="278893601">
-											<int key="type">2</int>
-											<double key="pointSize">15</double>
+										<reference key="IBUIFontDescription" ref="278893601"/>
+										<reference key="IBUIFont" ref="740255166"/>
+									</object>
+									<object class="IBUIButton" id="120263452">
+										<reference key="NSNextResponder" ref="833509359"/>
+										<int key="NSvFlags">300</int>
+										<string key="NSFrameSize">{40, 59}</string>
+										<reference key="NSSuperview" ref="833509359"/>
+										<reference key="NSWindow"/>
+										<reference key="NSNextKeyView" ref="49605932"/>
+										<string key="NSReuseIdentifierKey">_NS:9</string>
+										<bool key="IBUIOpaque">NO</bool>
+										<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+											<string key="IBUIAccessibilityLabel">Send picture</string>
 										</object>
-										<object class="NSFont" key="IBUIFont" id="871116895">
-											<string key="NSName">Helvetica-Bold</string>
-											<double key="NSSize">15</double>
-											<int key="NSfFlags">16</int>
+										<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+										<int key="IBUIContentHorizontalAlignment">0</int>
+										<int key="IBUIContentVerticalAlignment">0</int>
+										<string key="IBUINormalTitle">Pict</string>
+										<reference key="IBUIHighlightedTitleColor" ref="795265735"/>
+										<object class="NSColor" key="IBUINormalTitleColor">
+											<int key="NSColorSpace">1</int>
+											<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
 										</object>
+										<reference key="IBUINormalTitleShadowColor" ref="153071662"/>
+										<reference key="IBUIFontDescription" ref="278893601"/>
+										<reference key="IBUIFont" ref="740255166"/>
 									</object>
 									<object class="IBUIView" id="49605932">
 										<reference key="NSNextResponder" ref="833509359"/>
@@ -226,7 +333,7 @@
 											<object class="IBUIImageView" id="946416684">
 												<reference key="NSNextResponder" ref="49605932"/>
 												<int key="NSvFlags">274</int>
-												<string key="NSFrameSize">{250, 59}</string>
+												<string key="NSFrameSize">{210, 59}</string>
 												<reference key="NSSuperview" ref="49605932"/>
 												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="587350058"/>
@@ -241,7 +348,7 @@
 											<object class="IBUIView" id="587350058">
 												<reference key="NSNextResponder" ref="49605932"/>
 												<int key="NSvFlags">274</int>
-												<string key="NSFrame">{{10, 10}, {230, 39}}</string>
+												<string key="NSFrame">{{10, 10}, {190, 39}}</string>
 												<reference key="NSSuperview" ref="49605932"/>
 												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="487645621"/>
@@ -250,7 +357,7 @@
 												<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 											</object>
 										</array>
-										<string key="NSFrameSize">{250, 59}</string>
+										<string key="NSFrame">{{40, 0}, {210, 59}}</string>
 										<reference key="NSSuperview" ref="833509359"/>
 										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="946416684"/>
@@ -321,7 +428,7 @@
 									<string key="NSResourceName">chat_back_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="278893601"/>
-								<reference key="IBUIFont" ref="871116895"/>
+								<reference key="IBUIFont" ref="740255166"/>
 							</object>
 							<object class="IBUIButton" id="602867427">
 								<reference key="NSNextResponder" ref="333187864"/>
@@ -353,7 +460,7 @@
 									<string key="NSResourceName">chat_edit_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="278893601"/>
-								<reference key="IBUIFont" ref="871116895"/>
+								<reference key="IBUIFont" ref="740255166"/>
 							</object>
 						</array>
 						<string key="NSFrameSize">{320, 44}</string>
@@ -500,6 +607,38 @@
 					</object>
 					<int key="connectionID">71</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">imageTransferProgressBar</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="164391443"/>
+					</object>
+					<int key="connectionID">79</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">pictureButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="120263452"/>
+					</object>
+					<int key="connectionID">84</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">cancelTransferButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="391057061"/>
+					</object>
+					<int key="connectionID">85</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">transferView</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="229066993"/>
+					</object>
+					<int key="connectionID">86</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">dataSource</string>
@@ -569,6 +708,24 @@
 					</object>
 					<int key="connectionID">62</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">onPictureClick:</string>
+						<reference key="source" ref="120263452"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">87</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">onTransferCancelClick:</string>
+						<reference key="source" ref="391057061"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">78</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -640,6 +797,7 @@
 							<reference ref="414508017"/>
 							<reference ref="879615756"/>
 							<reference ref="833509359"/>
+							<reference ref="229066993"/>
 						</array>
 						<reference key="parent" ref="589117993"/>
 						<string key="objectName">chatView</string>
@@ -687,6 +845,8 @@
 							<reference ref="487645621"/>
 							<reference ref="131075038"/>
 							<reference ref="49605932"/>
+							<reference ref="120263452"/>
+							<reference ref="787000581"/>
 						</array>
 						<reference key="parent" ref="715329044"/>
 						<string key="objectName">footerView</string>
@@ -731,6 +891,47 @@
 						<reference key="parent" ref="49605932"/>
 						<string key="objectName">messageField</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">73</int>
+						<reference key="object" ref="120263452"/>
+						<reference key="parent" ref="833509359"/>
+						<string key="objectName">pictureButton</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">82</int>
+						<reference key="object" ref="787000581"/>
+						<reference key="parent" ref="833509359"/>
+						<string key="objectName">normalView</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">72</int>
+						<reference key="object" ref="229066993"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="164391443"/>
+							<reference ref="391057061"/>
+							<reference ref="661332796"/>
+						</array>
+						<reference key="parent" ref="715329044"/>
+						<string key="objectName">transferView</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">74</int>
+						<reference key="object" ref="164391443"/>
+						<reference key="parent" ref="229066993"/>
+						<string key="objectName">transferProgressBar</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">75</int>
+						<reference key="object" ref="391057061"/>
+						<reference key="parent" ref="229066993"/>
+						<string key="objectName">cancelTransferButton</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">83</int>
+						<reference key="object" ref="661332796"/>
+						<reference key="parent" ref="229066993"/>
+						<string key="objectName">footerBackgroundImage</string>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -760,7 +961,13 @@
 				<string key="66.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="68.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="72.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="74.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="75.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="82.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="83.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="9.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
 				<real value="2" key="9.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
@@ -769,7 +976,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">71</int>
+			<int key="maxID">87</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -789,7 +996,9 @@
 						<string key="onEditClick:">id</string>
 						<string key="onListTap:">id</string>
 						<string key="onMessageChange:">id</string>
+						<string key="onPictureClick:">id</string>
 						<string key="onSendClick:">id</string>
+						<string key="onTransferCancelClick:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
 						<object class="IBActionInfo" key="onBackClick:">
@@ -808,25 +1017,37 @@
 							<string key="name">onMessageChange:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="onPictureClick:">
+							<string key="name">onPictureClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 						<object class="IBActionInfo" key="onSendClick:">
 							<string key="name">onSendClick:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="onTransferCancelClick:">
+							<string key="name">onTransferCancelClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="addressLabel">UILabel</string>
 						<string key="avatarImage">UIImageView</string>
+						<string key="cancelTransferButton">UIButton</string>
 						<string key="chatView">UIView</string>
 						<string key="editButton">UIToggleButton</string>
 						<string key="footerBackgroundImage">UIImageView</string>
 						<string key="footerView">UIView</string>
 						<string key="headerView">UIView</string>
+						<string key="imageTransferProgressBar">UIProgressView</string>
 						<string key="listTapGestureRecognizer">UITapGestureRecognizer</string>
 						<string key="messageBackgroundImage">UIImageView</string>
 						<string key="messageField">HPGrowingTextView</string>
 						<string key="messageView">UIView</string>
+						<string key="pictureButton">UIButton</string>
 						<string key="sendButton">UIButton</string>
 						<string key="tableController">ChatRoomTableViewController</string>
+						<string key="transferView">UIView</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
 						<object class="IBToOneOutletInfo" key="addressLabel">
@@ -837,6 +1058,10 @@
 							<string key="name">avatarImage</string>
 							<string key="candidateClassName">UIImageView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="cancelTransferButton">
+							<string key="name">cancelTransferButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="chatView">
 							<string key="name">chatView</string>
 							<string key="candidateClassName">UIView</string>
@@ -857,6 +1082,10 @@
 							<string key="name">headerView</string>
 							<string key="candidateClassName">UIView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="imageTransferProgressBar">
+							<string key="name">imageTransferProgressBar</string>
+							<string key="candidateClassName">UIProgressView</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="listTapGestureRecognizer">
 							<string key="name">listTapGestureRecognizer</string>
 							<string key="candidateClassName">UITapGestureRecognizer</string>
@@ -873,6 +1102,10 @@
 							<string key="name">messageView</string>
 							<string key="candidateClassName">UIView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="pictureButton">
+							<string key="name">pictureButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="sendButton">
 							<string key="name">sendButton</string>
 							<string key="candidateClassName">UIButton</string>
@@ -881,6 +1114,10 @@
 							<string key="name">tableController</string>
 							<string key="candidateClassName">ChatRoomTableViewController</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="transferView">
+							<string key="name">transferView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
 					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>

linphone.ldb/Resources/Classes/ChatViewController/3/ChatViewController.xib

@@ -61,8 +61,8 @@
 							</object>
 							<object class="IBUIButton" id="174033966">
 								<reference key="NSNextResponder" ref="852221244"/>
-								<int key="NSvFlags">289</int>
-								<string key="NSFrame">{{160, 0}, {160, 44}}</string>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrameSize">{160, 44}</string>
 								<reference key="NSSuperview" ref="852221244"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="490705294"/>
@@ -99,8 +99,8 @@
 							</object>
 							<object class="IBUIButton" id="1001279594">
 								<reference key="NSNextResponder" ref="852221244"/>
-								<int key="NSvFlags">292</int>
-								<string key="NSFrameSize">{160, 44}</string>
+								<int key="NSvFlags">289</int>
+								<string key="NSFrame">{{160, 0}, {160, 44}}</string>
 								<reference key="NSSuperview" ref="852221244"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="174033966"/>
@@ -389,8 +389,8 @@
 						<int key="objectID">7</int>
 						<reference key="object" ref="852221244"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="1001279594"/>
 							<reference ref="428805768"/>
+							<reference ref="1001279594"/>
 							<reference ref="174033966"/>
 						</array>
 						<reference key="parent" ref="1010501960"/>

linphone.ldb/Resources/Classes/ContactDetailsViewController/1/ContactDetailsViewController.xib

@@ -36,7 +36,7 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUIView" id="191373211">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">274</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="IBUIView" id="624008635">
@@ -48,7 +48,6 @@
 								<int key="NSvFlags">290</int>
 								<string key="NSFrameSize">{320, 44}</string>
 								<reference key="NSSuperview" ref="624008635"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="40094652"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -63,7 +62,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrameSize">{160, 44}</string>
 								<reference key="NSSuperview" ref="624008635"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="827146159"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -101,7 +99,6 @@
 								<int key="NSvFlags">-2147483356</int>
 								<string key="NSFrameSize">{160, 44}</string>
 								<reference key="NSSuperview" ref="624008635"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="100677920"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -129,7 +126,6 @@
 								<int key="NSvFlags">289</int>
 								<string key="NSFrame">{{160, 0}, {160, 44}}</string>
 								<reference key="NSSuperview" ref="624008635"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="685526080"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
@@ -159,7 +155,6 @@
 						</array>
 						<string key="NSFrameSize">{320, 44}</string>
 						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="463087888"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
@@ -176,8 +171,6 @@
 						<int key="NSvFlags">306</int>
 						<string key="NSFrame">{{0, 44}, {320, 416}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">10</int>
@@ -260,8 +253,6 @@ AAgACAAIAAEAAQABAAE</bytes>
 					</object>
 				</array>
 				<string key="NSFrameSize">{320, 460}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="624008635"/>
 				<reference key="IBUIBackgroundColor" ref="845399741"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>

linphone.ldb/Resources/Classes/DialerViewController~ipad/7/DialerViewController~ipad.xib

@@ -37,6 +37,73 @@
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<array class="NSMutableArray" key="NSSubviews">
+					<object class="IBUIView" id="887694290">
+						<reference key="NSNextResponder" ref="450916897"/>
+						<int key="NSvFlags">301</int>
+						<string key="NSFrame">{{-1000, -1000}, {2768, 2900}}</string>
+						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="935083036"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<object class="NSColor" key="IBUIBackgroundColor">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MAA</bytes>
+						</object>
+						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+					</object>
+					<object class="IBUIView" id="820868226">
+						<reference key="NSNextResponder" ref="450916897"/>
+						<int key="NSvFlags">274</int>
+						<string key="NSFrame">{{0, 58}, {768, 842}}</string>
+						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="857979271"/>
+						<object class="NSColor" key="IBUIBackgroundColor" id="474273757">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MCAwAA</bytes>
+						</object>
+						<int key="IBUIContentMode">2</int>
+						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+					</object>
+					<object class="IBUIButton" id="857979271">
+						<reference key="NSNextResponder" ref="450916897"/>
+						<int key="NSvFlags">-2147483356</int>
+						<string key="NSFrame">{{0, 77}, {85, 33}}</string>
+						<reference key="NSSuperview" ref="450916897"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="811328787"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="IBUIOpaque">NO</bool>
+						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+							<string key="IBUIAccessibilityLabel">Switch camera</string>
+						</object>
+						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+						<int key="IBUIContentHorizontalAlignment">0</int>
+						<int key="IBUIContentVerticalAlignment">0</int>
+						<bool key="IBUIAdjustsImageWhenHighlighted">NO</bool>
+						<bool key="IBUIAdjustsImageWhenDisabled">NO</bool>
+						<object class="NSColor" key="IBUINormalTitleShadowColor" id="213950483">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MC41AA</bytes>
+						</object>
+						<object class="NSCustomResource" key="IBUIHighlightedBackgroundImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">switch_camera_over.png</string>
+						</object>
+						<object class="NSCustomResource" key="IBUINormalBackgroundImage">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">switch_camera_default.png</string>
+						</object>
+						<object class="IBUIFontDescription" key="IBUIFontDescription" id="551176679">
+							<int key="type">2</int>
+							<double key="pointSize">15</double>
+						</object>
+						<object class="NSFont" key="IBUIFont" id="733629239">
+							<string key="NSName">Helvetica-Bold</string>
+							<double key="NSSize">15</double>
+							<int key="NSfFlags">16</int>
+						</object>
+					</object>
 					<object class="IBUIView" id="935083036">
 						<reference key="NSNextResponder" ref="450916897"/>
 						<int key="NSvFlags">290</int>
@@ -104,7 +171,7 @@
 								<string key="NSFrame">{{698, 4}, {70, 51}}</string>
 								<reference key="NSSuperview" ref="935083036"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView" ref="811328787"/>
+								<reference key="NSNextKeyView" ref="820868226"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -120,10 +187,7 @@
 								<double key="IBUIContentEdgeInsets.bottom">15</double>
 								<double key="IBUIContentEdgeInsets.left">15</double>
 								<double key="IBUIContentEdgeInsets.right">15</double>
-								<object class="NSColor" key="IBUINormalTitleShadowColor" id="213950483">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MC41AA</bytes>
-								</object>
+								<reference key="IBUINormalTitleShadowColor" ref="213950483"/>
 								<object class="NSCustomResource" key="IBUIHighlightedImage">
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">backspace_over~ipad.png</string>
@@ -136,15 +200,8 @@
 									<string key="NSClassName">NSImage</string>
 									<string key="NSResourceName">backspace_default~ipad.png</string>
 								</object>
-								<object class="IBUIFontDescription" key="IBUIFontDescription" id="551176679">
-									<int key="type">2</int>
-									<double key="pointSize">15</double>
-								</object>
-								<object class="NSFont" key="IBUIFont" id="914591064">
-									<string key="NSName">Helvetica-Bold</string>
-									<double key="NSSize">15</double>
-									<int key="NSfFlags">16</int>
-								</object>
+								<reference key="IBUIFontDescription" ref="551176679"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 						</array>
 						<string key="NSFrameSize">{768, 80}</string>
@@ -166,6 +223,22 @@
 						<reference key="NSNextResponder" ref="450916897"/>
 						<int key="NSvFlags">268</int>
 						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUIImageView" id="848268216">
+								<reference key="NSNextResponder" ref="811328787"/>
+								<int key="NSvFlags">274</int>
+								<string key="NSFrameSize">{320, 280}</string>
+								<reference key="NSSuperview" ref="811328787"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="257730270"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<int key="IBUITag">2</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+								<object class="NSCustomResource" key="IBUIImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">background_alt.png</string>
+								</object>
+							</object>
 							<object class="IBUIButton" id="257730270">
 								<reference key="NSNextResponder" ref="811328787"/>
 								<int key="NSvFlags">292</int>
@@ -200,7 +273,7 @@
 									<int key="traits">2</int>
 									<double key="pointSize">15</double>
 								</object>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="579980565">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -227,7 +300,7 @@
 									<string key="NSResourceName">numpad_two_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="534491605">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -254,7 +327,7 @@
 									<string key="NSResourceName">numpad_three_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="405606838">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -281,7 +354,7 @@
 									<string key="NSResourceName">numpad_four_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="984444210">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -308,7 +381,7 @@
 									<string key="NSResourceName">numpad_five_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="505513327">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -335,7 +408,7 @@
 									<string key="NSResourceName">numpad_six_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="829692929">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -362,7 +435,7 @@
 									<string key="NSResourceName">numpad_seven_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="430965229">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -389,7 +462,7 @@
 									<string key="NSResourceName">numpad_eight_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="565116665">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -416,7 +489,7 @@
 									<string key="NSResourceName">numpad_nine_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="47810246">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -443,7 +516,7 @@
 									<string key="NSResourceName">numpad_star_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="776264615">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -470,7 +543,7 @@
 									<string key="NSResourceName">numpad_zero_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="718499319">
 								<reference key="NSNextResponder" ref="811328787"/>
@@ -497,18 +570,15 @@
 									<string key="NSResourceName">numpad_sharp_default.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="671953595"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 						</array>
 						<string key="NSFrame">{{0, 640}, {320, 260}}</string>
 						<reference key="NSSuperview" ref="450916897"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="257730270"/>
+						<reference key="NSNextKeyView" ref="848268216"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<object class="NSColor" key="IBUIBackgroundColor" id="474273757">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MCAwAA</bytes>
-						</object>
+						<reference key="IBUIBackgroundColor" ref="474273757"/>
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 					</object>
 					<object class="IBUIView" id="683359487">
@@ -547,7 +617,7 @@
 									<string key="NSResourceName">add_contact_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="405746031">
 								<reference key="NSNextResponder" ref="683359487"/>
@@ -580,7 +650,7 @@
 									<string key="NSResourceName">back_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="981547916">
 								<reference key="NSNextResponder" ref="683359487"/>
@@ -614,7 +684,7 @@
 									<string key="NSResourceName">call_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="514058756">
 								<reference key="NSNextResponder" ref="683359487"/>
@@ -648,7 +718,7 @@
 									<string key="NSResourceName">add_call_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 							<object class="IBUIButton" id="1043651254">
 								<reference key="NSNextResponder" ref="683359487"/>
@@ -682,7 +752,7 @@
 									<string key="NSResourceName">transfer_call_default~ipad.png</string>
 								</object>
 								<reference key="IBUIFontDescription" ref="551176679"/>
-								<reference key="IBUIFont" ref="914591064"/>
+								<reference key="IBUIFont" ref="733629239"/>
 							</object>
 						</array>
 						<string key="NSFrame">{{456, 815}, {312, 85}}</string>
@@ -701,7 +771,7 @@
 				<string key="NSFrameSize">{768, 900}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="935083036"/>
+				<reference key="NSNextKeyView" ref="887694290"/>
 				<string key="NSReuseIdentifierKey">_NS:9</string>
 				<reference key="IBUIBackgroundColor" ref="474273757"/>
 				<string key="targetRuntimeIdentifier">IBIPadFramework</string>
@@ -869,6 +939,30 @@
 					</object>
 					<int key="connectionID">69</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">videoCameraSwitch</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="857979271"/>
+					</object>
+					<int key="connectionID">74</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">videoPreview</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="820868226"/>
+					</object>
+					<int key="connectionID">75</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">backgroundView</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="887694290"/>
+					</object>
+					<int key="connectionID">77</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">onAddressChange:</string>
@@ -1024,6 +1118,14 @@
 					</object>
 					<int key="connectionID">39</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">preview</string>
+						<reference key="source" ref="857979271"/>
+						<reference key="destination" ref="820868226"/>
+					</object>
+					<int key="connectionID">72</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -1051,6 +1153,9 @@
 							<reference ref="811328787"/>
 							<reference ref="683359487"/>
 							<reference ref="935083036"/>
+							<reference ref="820868226"/>
+							<reference ref="857979271"/>
+							<reference ref="887694290"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -1083,6 +1188,7 @@
 							<reference ref="534491605"/>
 							<reference ref="579980565"/>
 							<reference ref="257730270"/>
+							<reference ref="848268216"/>
 						</array>
 						<reference key="parent" ref="450916897"/>
 						<string key="objectName">pad</string>
@@ -1218,6 +1324,30 @@
 						<reference key="parent" ref="935083036"/>
 						<string key="objectName">backspaceButton</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">70</int>
+						<reference key="object" ref="820868226"/>
+						<reference key="parent" ref="450916897"/>
+						<string key="objectName">preview</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">71</int>
+						<reference key="object" ref="857979271"/>
+						<reference key="parent" ref="450916897"/>
+						<string key="objectName">videoCameraSwitch</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">73</int>
+						<reference key="object" ref="848268216"/>
+						<reference key="parent" ref="811328787"/>
+						<string key="objectName">background</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">76</int>
+						<reference key="object" ref="887694290"/>
+						<reference key="parent" ref="450916897"/>
+						<string key="objectName">backgroundView</string>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1279,6 +1409,12 @@
 				<string key="6.CustomClassName">UIAddressTextField</string>
 				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="70.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="71.CustomClassName">UICamSwitch</string>
+				<string key="71.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<real value="1" key="71.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
+				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="76.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="8.CustomClassName">UIDigitButton</string>
 				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="8.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
@@ -1290,7 +1426,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">69</int>
+			<int key="maxID">77</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1321,6 +1457,7 @@
 						<string key="addContactButton">UIButton</string>
 						<string key="addressField">UITextField</string>
 						<string key="backButton">UIButton</string>
+						<string key="backgroundView">UIView</string>
 						<string key="callButton">UICallButton</string>
 						<string key="eightButton">UIDigitButton</string>
 						<string key="eraseButton">UIEraseButton</string>
@@ -1335,6 +1472,8 @@
 						<string key="threeButton">UIDigitButton</string>
 						<string key="transferButton">UITransferButton</string>
 						<string key="twoButton">UIDigitButton</string>
+						<string key="videoCameraSwitch">UICamSwitch</string>
+						<string key="videoPreview">UIView</string>
 						<string key="zeroButton">UIDigitButton</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -1354,6 +1493,10 @@
 							<string key="name">backButton</string>
 							<string key="candidateClassName">UIButton</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="backgroundView">
+							<string key="name">backgroundView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="callButton">
 							<string key="name">callButton</string>
 							<string key="candidateClassName">UICallButton</string>
@@ -1410,6 +1553,14 @@
 							<string key="name">twoButton</string>
 							<string key="candidateClassName">UIDigitButton</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="videoCameraSwitch">
+							<string key="name">videoCameraSwitch</string>
+							<string key="candidateClassName">UICamSwitch</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="videoPreview">
+							<string key="name">videoPreview</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="zeroButton">
 							<string key="name">zeroButton</string>
 							<string key="candidateClassName">UIDigitButton</string>
@@ -1447,6 +1598,25 @@
 						<string key="minorKey">./Classes/UICallButton.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UICamSwitch</string>
+					<string key="superclassName">UIButton</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">preview</string>
+						<string key="NS.object.0">UIView</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">preview</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">preview</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/UICamSwitch.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">UIDigitButton</string>
 					<string key="superclassName">UILongTouchButton</string>
@@ -1532,6 +1702,7 @@
 			<string key="back_default~ipad.png">{251, 170}</string>
 			<string key="back_disabled~ipad.png">{251, 170}</string>
 			<string key="back_over~ipad.png">{251, 170}</string>
+			<string key="background_alt.png">{640, 561}</string>
 			<string key="backspace_default~ipad.png">{81, 43}</string>
 			<string key="backspace_disabled~ipad.png">{81, 43}</string>
 			<string key="backspace_over~ipad.png">{81, 43}</string>
@@ -1563,6 +1734,8 @@
 			<string key="numpad_two_over.png">{220, 113}</string>
 			<string key="numpad_zero_default.png">{220, 113}</string>
 			<string key="numpad_zero_over.png">{220, 113}</string>
+			<string key="switch_camera_default.png">{170, 65}</string>
+			<string key="switch_camera_over.png">{170, 65}</string>
 			<string key="transfer_call_default~ipad.png">{371, 170}</string>
 			<string key="transfer_call_disabled~ipad.png">{371, 170}</string>
 			<string key="transfer_call_over~ipad.png">{371, 170}</string>

linphone.ldb/Resources/Classes/HistoryViewController/2/HistoryViewController.xib

@@ -186,7 +186,7 @@
 								<reference key="IBUIFont" ref="590723448"/>
 							</object>
 						</array>
-						<string key="NSFrameSize">{320, 58}</string>
+						<string key="NSFrameSize">{320, 44}</string>
 						<reference key="NSSuperview" ref="812520855"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="929072924"/>

linphone.ldb/Resources/Classes/ImageViewController/3/ImageViewController.xib

@@ -0,0 +1,299 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1296</int>
+		<string key="IBDocument.SystemVersion">11E53</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2549</string>
+		<string key="IBDocument.AppKitVersion">1138.47</string>
+		<string key="IBDocument.HIToolboxVersion">569.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+			<string key="NS.object.0">1498</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBProxyObject</string>
+			<string>IBUIButton</string>
+			<string>IBUIImageView</string>
+			<string>IBUIView</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<object class="IBProxyObject" id="372490531">
+				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+			<object class="IBProxyObject" id="975951072">
+				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+			<object class="IBUIView" id="191373211">
+				<reference key="NSNextResponder"/>
+				<int key="NSvFlags">274</int>
+				<array class="NSMutableArray" key="NSSubviews">
+					<object class="IBUIImageView" id="170933358">
+						<reference key="NSNextResponder" ref="191373211"/>
+						<int key="NSvFlags">274</int>
+						<string key="NSFrame">{{0, 44}, {320, 416}}</string>
+						<reference key="NSSuperview" ref="191373211"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<object class="NSColor" key="IBUIBackgroundColor" id="986758619">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MCAwAA</bytes>
+						</object>
+						<int key="IBUIContentMode">4</int>
+						<bool key="IBUIUserInteractionEnabled">NO</bool>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
+					<object class="IBUIView" id="350805517">
+						<reference key="NSNextResponder" ref="191373211"/>
+						<int key="NSvFlags">290</int>
+						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUIImageView" id="714444944">
+								<reference key="NSNextResponder" ref="350805517"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrameSize">{320, 44}</string>
+								<reference key="NSSuperview" ref="350805517"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="771824371"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<object class="NSCustomResource" key="IBUIImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">toolsbar_background.png</string>
+								</object>
+							</object>
+							<object class="IBUIButton" id="771824371">
+								<reference key="NSNextResponder" ref="350805517"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrameSize">{80, 44}</string>
+								<reference key="NSSuperview" ref="350805517"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="170933358"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<bool key="IBUIOpaque">NO</bool>
+								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+									<string key="IBUIAccessibilityLabel">Back</string>
+								</object>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<int key="IBUIContentHorizontalAlignment">0</int>
+								<int key="IBUIContentVerticalAlignment">0</int>
+								<object class="NSColor" key="IBUIHighlightedTitleColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MQA</bytes>
+								</object>
+								<object class="NSColor" key="IBUINormalTitleColor">
+									<int key="NSColorSpace">1</int>
+									<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
+								</object>
+								<object class="NSColor" key="IBUINormalTitleShadowColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MC41AA</bytes>
+								</object>
+								<object class="NSCustomResource" key="IBUINormalImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">chat_back_default.png</string>
+								</object>
+								<object class="NSCustomResource" key="IBUINormalBackgroundImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">chat_back_over.png</string>
+								</object>
+								<object class="IBUIFontDescription" key="IBUIFontDescription">
+									<int key="type">2</int>
+									<double key="pointSize">15</double>
+								</object>
+								<object class="NSFont" key="IBUIFont">
+									<string key="NSName">Helvetica-Bold</string>
+									<double key="NSSize">15</double>
+									<int key="NSfFlags">16</int>
+								</object>
+							</object>
+						</array>
+						<string key="NSFrameSize">{320, 44}</string>
+						<reference key="NSSuperview" ref="191373211"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="714444944"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<reference key="IBUIBackgroundColor" ref="986758619"/>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
+				</array>
+				<string key="NSFrame">{{0, 20}, {320, 460}}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView" ref="350805517"/>
+				<reference key="IBUIBackgroundColor" ref="986758619"/>
+				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">view</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="191373211"/>
+					</object>
+					<int key="connectionID">3</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">imageView</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="170933358"/>
+					</object>
+					<int key="connectionID">9</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">backButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="771824371"/>
+					</object>
+					<int key="connectionID">8</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">onBackClick:</string>
+						<reference key="source" ref="771824371"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">10</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1</int>
+						<reference key="object" ref="191373211"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="170933358"/>
+							<reference ref="350805517"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="372490531"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="975951072"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">4</int>
+						<reference key="object" ref="170933358"/>
+						<reference key="parent" ref="191373211"/>
+						<string key="objectName">imageView</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">11</int>
+						<reference key="object" ref="350805517"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="714444944"/>
+							<reference ref="771824371"/>
+						</array>
+						<reference key="parent" ref="191373211"/>
+						<string key="objectName">toolbar</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">7</int>
+						<reference key="object" ref="771824371"/>
+						<reference key="parent" ref="350805517"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="714444944"/>
+						<reference key="parent" ref="350805517"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.CustomClassName">ImageViewController</string>
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="-2.CustomClassName">UIResponder</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">11</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">ImageViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">onBackClick:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">onBackClick:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">onBackClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="backButton">UIButton</string>
+						<string key="imageView">UIImageView</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="backButton">
+							<string key="name">backButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="imageView">
+							<string key="name">imageView</string>
+							<string key="candidateClassName">UIImageView</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/ImageViewController.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+			<real value="1296" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="chat_back_default.png">{320, 88}</string>
+			<string key="chat_back_over.png">{320, 88}</string>
+			<string key="toolsbar_background.png">{5, 117}</string>
+		</dictionary>
+		<string key="IBCocoaTouchPluginVersion">1498</string>
+	</data>
+</archive>

linphone.ldb/Resources/Classes/InCallViewController/2/InCallViewController.xib

@@ -146,7 +146,6 @@
 						<string key="NSFrame">{{0, 23}, {85, 33}}</string>
 						<reference key="NSSuperview" ref="858247959"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">

linphone.ldb/Resources/Classes/WizardViewController/3/WizardViewController.xib

@@ -136,7 +136,6 @@
 								<string key="NSFrame">{{160, 0}, {160, 77}}</string>
 								<reference key="NSSuperview" ref="1057285194"/>
 								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="IBUIOpaque">NO</bool>
 								<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -243,7 +242,6 @@
 						<string key="NSFrame">{{40, 290}, {240, 44}}</string>
 						<reference key="NSSuperview" ref="741268807"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -372,7 +370,6 @@
 						<string key="NSFrame">{{33, 269}, {255, 50}}</string>
 						<reference key="NSSuperview" ref="361414027"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -473,6 +470,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
 						<object class="NSCustomResource" key="IBUIBackground" id="814678829">
@@ -515,6 +513,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<bool key="IBUISecureTextEntry">YES</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
@@ -548,6 +547,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<bool key="IBUISecureTextEntry">YES</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
@@ -581,6 +581,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
 						<reference key="IBUIBackground" ref="814678829"/>
@@ -593,7 +594,6 @@
 						<string key="NSFrame">{{33, 330}, {255, 50}}</string>
 						<reference key="NSSuperview" ref="183617546"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -678,7 +678,6 @@
 						<string key="NSFrame">{{32, 330}, {255, 50}}</string>
 						<reference key="NSSuperview" ref="101753691"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -722,6 +721,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<bool key="IBUISecureTextEntry">YES</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
@@ -755,6 +755,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
 						<reference key="IBUIBackground" ref="814678829"/>
@@ -841,6 +842,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
 						<reference key="IBUIBackground" ref="814678829"/>
@@ -873,6 +875,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<bool key="IBUISecureTextEntry">YES</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
@@ -906,6 +909,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
 						<reference key="IBUIBackground" ref="814678829"/>
@@ -918,7 +922,6 @@
 						<string key="NSFrame">{{34, 330}, {255, 50}}</string>
 						<reference key="NSSuperview" ref="71390966"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -996,7 +999,6 @@
 						<string key="NSFrame">{{32, 330}, {255, 50}}</string>
 						<reference key="NSSuperview" ref="611643284"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
@@ -1040,6 +1042,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<bool key="IBUISecureTextEntry">YES</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
@@ -1073,6 +1076,7 @@
 						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
 						<float key="IBUIMinimumFontSize">17</float>
 						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
 						<reference key="IBUIBackground" ref="814678829"/>

linphone.ldb/Resources/InAppSettings.bundle/Advanced/1/Advanced.strings

@@ -34,6 +34,9 @@
 /* Display name */
 "Display name" = "Display name";
 
+/* Sharing server */
+"Sharing server" = "Sharing server";
+
 /* Username */
 "Username" = "Username";
 

linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings

@@ -0,0 +1,51 @@
+/* Wifi only */
+"Wifi only" = "Wifi only";
+
+/* Stun server */
+"Stun server" = "Stun server";
+
+/* ICE */
+"ICE" = "ICE";
+
+/* Random Port */
+"Random Port" = "Random Port";
+
+/* Port */
+"Port" = "Port";
+
+/* Audio Port */
+"Audio Port" = "Audio Port";
+
+/* Video Port */
+"Video Port" = "Video Port";
+
+/* Transport */
+"Transport" = "Transport";
+
+/* Media Encryption */
+"Media Encryption" = "Media Encryption";
+
+/* Push Notifications */
+"Push Notification" = "Push Notification";
+
+/* Transport */
+"Transport" = "Transport";
+
+/* udp */
+"udp" = "udp";
+
+/* tcp */
+"tcp" = "tcp";
+
+/* tls */
+"tls" = "tls";
+
+/* None */
+"None" = "None";
+
+/* SRTP */
+"SRTP" = "SRTP";
+
+/* ZRTP */
+"ZRTP" = "ZRTP";
+

linphone.ldb/Resources/InAppSettings.bundle/Root/1/Root.strings

@@ -1,6 +1,9 @@
 /* SIP account */
 "SIP account" = "SIP account";
 
+/* Wizard */
+"Wizard" = "Wizard";
+
 /* User name */
 "User name" = "User name";
 

linphone.ldb/Resources/InAppSettings.bundle/Video/1/Video.strings

@@ -7,6 +7,9 @@
 /* Show self view */
 "Show self view" = "Show self view";
 
+/* Show preview */
+"Show preview" = "Show preview";
+
 /* Codecs */
 "Codecs" = "Codecs";
 

linphone.xcodeproj/project.pbxproj

@@ -18,8 +18,6 @@
 		220FAD3710765B400068D98F /* libosipparser2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2E10765B400068D98F /* libosipparser2.a */; };
 		220FAD3810765B400068D98F /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2F10765B400068D98F /* libspeex.a */; };
 		220FAD3910765B400068D98F /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD3010765B400068D98F /* libspeexdsp.a */; };
-		2211DBBE14769C8300DEE054 /* CallDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 2211DBBB14769C8200DEE054 /* CallDelegate.m */; };
-		2211DBBF14769C8300DEE054 /* CallDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 2211DBBB14769C8200DEE054 /* CallDelegate.m */; };
 		2214783D1386A2030020F8B8 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2214783B1386A2030020F8B8 /* Localizable.strings */; };
 		2214EB7A12F846B1002A5394 /* UICallButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2214EB7912F846B1002A5394 /* UICallButton.m */; };
 		2214EB8912F84EBB002A5394 /* UIHangUpButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2214EB8812F84EBB002A5394 /* UIHangUpButton.m */; };
@@ -39,6 +37,9 @@
 		2234C8EE15EE744200E18E83 /* chat_message_inprogress.png in Resources */ = {isa = PBXBuildFile; fileRef = 2234C8ED15EE744200E18E83 /* chat_message_inprogress.png */; };
 		2234C8EF15EE744200E18E83 /* chat_message_inprogress.png in Resources */ = {isa = PBXBuildFile; fileRef = 2234C8ED15EE744200E18E83 /* chat_message_inprogress.png */; };
 		2237D4091084D7A9001383EE /* ring.wav in Resources */ = {isa = PBXBuildFile; fileRef = 2237D4081084D7A9001383EE /* ring.wav */; };
+		22405EEE1600B4E400B92522 /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22405EED1600B4E400B92522 /* AssetsLibrary.framework */; };
+		22405F001601C19200B92522 /* ImageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22405EFE1601C19100B92522 /* ImageViewController.m */; };
+		22405F011601C19200B92522 /* ImageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22405EFE1601C19100B92522 /* ImageViewController.m */; };
 		2242E313125235120061DDCE /* ring.caf in Resources */ = {isa = PBXBuildFile; fileRef = 2242E312125235120061DDCE /* ring.caf */; };
 		224567C2107B968500F10948 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 224567C1107B968500F10948 /* AVFoundation.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		2245F78A1201D38000C4179D /* MoreViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E0A81B111C44E100B04932 /* MoreViewController.xib */; };
@@ -50,6 +51,7 @@
 		2264B6D211200342002C2C53 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2264B6D111200342002C2C53 /* SystemConfiguration.framework */; };
 		226CDADF14E2D0B800513B67 /* libbcg729.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226CDADD14E2D0B800513B67 /* libbcg729.a */; };
 		226CDAE014E2D0B800513B67 /* libmsbcg729.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226CDADE14E2D0B800513B67 /* libmsbcg729.a */; };
+		226EF06C15FA256B005865C7 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 226EF06B15FA256B005865C7 /* MobileCoreServices.framework */; };
 		226F2ED61344B0EF00F6EF27 /* libopencore-amrwb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226F2ED31344B0EF00F6EF27 /* libopencore-amrwb.a */; };
 		226F2ED71344B0EF00F6EF27 /* libopencore-amrnb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226F2ED41344B0EF00F6EF27 /* libopencore-amrnb.a */; };
 		226F2ED81344B0EF00F6EF27 /* libmsamr.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226F2ED51344B0EF00F6EF27 /* libmsamr.a */; };
@@ -130,8 +132,6 @@
 		344ABDF114850AE9007420B6 /* libc++.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 344ABDEF14850AE9007420B6 /* libc++.1.dylib */; settings = {ATTRIBUTES = (Weak, ); }; };
 		344ABDF214850AE9007420B6 /* libstdc++.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 344ABDF014850AE9007420B6 /* libstdc++.6.dylib */; settings = {ATTRIBUTES = (Weak, ); }; };
 		34A6ECEB14CF13CB00460C04 /* linphone_icon_72.png in Resources */ = {isa = PBXBuildFile; fileRef = 34A6ECEA14CF13CB00460C04 /* linphone_icon_72.png */; };
-		570B130115FE44AF00DE62B6 /* libmediastreamer_voip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 570B130015FE44AF00DE62B6 /* libmediastreamer_voip.a */; };
-		570B130315FE44ED00DE62B6 /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 570B130215FE44ED00DE62B6 /* libmediastreamer_base.a */; };
 		57F005C415EE2CCF00914747 /* linphonerc in Resources */ = {isa = PBXBuildFile; fileRef = 57F005C315EE2CCF00914747 /* linphonerc */; };
 		57F005C515EE2CCF00914747 /* linphonerc in Resources */ = {isa = PBXBuildFile; fileRef = 57F005C315EE2CCF00914747 /* linphonerc */; };
 		57F005C815EE2D9200914747 /* linphonerc-factory in Resources */ = {isa = PBXBuildFile; fileRef = 57F005C615EE2D9200914747 /* linphonerc-factory */; };
@@ -317,7 +317,6 @@
 		D347347F1580E5F8003C7B8C /* history_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = D347347D1580E5F8003C7B8C /* history_selected.png */; };
 		D34BD61515C13B7B0070C209 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D32B6E2E15A5C0AC0033019F /* libsqlite3.dylib */; };
 		D34BD61815C13D0B0070C209 /* liblinphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2211DB911475562600DEE054 /* liblinphone.a */; };
-		D34BD61915C13D0B0070C209 /* libmediastreamer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2211DB8F147555C800DEE054 /* libmediastreamer.a */; };
 		D34BD61A15C13DB60070C209 /* accept_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F83F741582253100336684 /* accept_default.png */; };
 		D34BD61B15C13DB60070C209 /* accept_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F83F751582253100336684 /* accept_over.png */; };
 		D34BD61C15C13DB60070C209 /* add_call_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3D6A39B159B0EEF005F692C /* add_call_default.png */; };
@@ -651,11 +650,13 @@
 		D36FB2D51589EF7C0036F6F2 /* UIPauseButton.m in Sources */ = {isa = PBXBuildFile; fileRef = D36FB2D41589EF7C0036F6F2 /* UIPauseButton.m */; };
 		D36FB2D61589EF7C0036F6F2 /* UIPauseButton.m in Sources */ = {isa = PBXBuildFile; fileRef = D36FB2D41589EF7C0036F6F2 /* UIPauseButton.m */; };
 		D37295DB158B3C9600D2C0C7 /* video_off_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D37295DA158B3C9600D2C0C7 /* video_off_disabled.png */; };
+		D374D3FD16071762003D25FF /* ImageSharing.m in Sources */ = {isa = PBXBuildFile; fileRef = D374D3FC16071762003D25FF /* ImageSharing.m */; };
+		D374D3FE16071762003D25FF /* ImageSharing.m in Sources */ = {isa = PBXBuildFile; fileRef = D374D3FC16071762003D25FF /* ImageSharing.m */; };
 		D377BBFA15A19DA6002B696B /* video_on_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D377BBF915A19DA6002B696B /* video_on_disabled.png */; };
 		D378906515AC373B00BD776C /* ContactDetailsLabelViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D378906315AC373B00BD776C /* ContactDetailsLabelViewController.m */; };
 		D378906615AC373B00BD776C /* ContactDetailsLabelViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D378906315AC373B00BD776C /* ContactDetailsLabelViewController.m */; };
-		D378AB2A15DCDB4A0098505D /* ContactDetailsImagePickerController.m in Sources */ = {isa = PBXBuildFile; fileRef = D378AB2915DCDB490098505D /* ContactDetailsImagePickerController.m */; };
-		D378AB2B15DCDB4A0098505D /* ContactDetailsImagePickerController.m in Sources */ = {isa = PBXBuildFile; fileRef = D378AB2915DCDB490098505D /* ContactDetailsImagePickerController.m */; };
+		D378AB2A15DCDB4A0098505D /* ImagePickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D378AB2915DCDB490098505D /* ImagePickerViewController.m */; };
+		D378AB2B15DCDB4A0098505D /* ImagePickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D378AB2915DCDB490098505D /* ImagePickerViewController.m */; };
 		D37B96B715A1A6F20005CCD2 /* call_state_delete_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D37B96B515A1A6F20005CCD2 /* call_state_delete_default.png */; };
 		D37B96B915A1A6F20005CCD2 /* call_state_delete_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D37B96B615A1A6F20005CCD2 /* call_state_delete_over.png */; };
 		D37C638E15AAD251009D0BAC /* contact_number_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D37C638C15AAD251009D0BAC /* contact_number_over.png */; };
@@ -668,6 +669,14 @@
 		D37DC6C21594AE1800B2A5EB /* LinphoneCoreSettingsStore.m in Sources */ = {isa = PBXBuildFile; fileRef = D37DC6C01594AE1800B2A5EB /* LinphoneCoreSettingsStore.m */; };
 		D37DC7181594AF3400B2A5EB /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D37DC7171594AF3400B2A5EB /* MessageUI.framework */; };
 		D37DC7191594AF3F00B2A5EB /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D37DC7171594AF3400B2A5EB /* MessageUI.framework */; };
+		D37EE10916032DA4003608A6 /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22405EE916006F0700B92522 /* libmediastreamer_base.a */; };
+		D37EE10A16032DA4003608A6 /* libmediastreamer_voip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22405EEA16006F0700B92522 /* libmediastreamer_voip.a */; };
+		D37EE10B16032DC2003608A6 /* libmediastreamer_base.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22405EE916006F0700B92522 /* libmediastreamer_base.a */; };
+		D37EE10C16032DC2003608A6 /* libmediastreamer_voip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22405EEA16006F0700B92522 /* libmediastreamer_voip.a */; };
+		D37EE10D16035793003608A6 /* ImageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D37EE11016035793003608A6 /* ImageViewController.xib */; };
+		D37EE10E16035793003608A6 /* ImageViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D37EE11016035793003608A6 /* ImageViewController.xib */; };
+		D37EE162160377D7003608A6 /* DTActionSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = D37EE161160377D7003608A6 /* DTActionSheet.m */; };
+		D37EE163160377D7003608A6 /* DTActionSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = D37EE161160377D7003608A6 /* DTActionSheet.m */; };
 		D3804E6015D92A57008072A5 /* msg.caf in Resources */ = {isa = PBXBuildFile; fileRef = D3804E5E15D92A57008072A5 /* msg.caf */; };
 		D3804E6115D92A57008072A5 /* msg.caf in Resources */ = {isa = PBXBuildFile; fileRef = D3804E5E15D92A57008072A5 /* msg.caf */; };
 		D3804E6215D92A57008072A5 /* msg.wav in Resources */ = {isa = PBXBuildFile; fileRef = D3804E5F15D92A57008072A5 /* msg.wav */; };
@@ -778,6 +787,8 @@
 		D389363B15A6D53200A3A3AA /* chat_bubble_outgoing.9.png in Resources */ = {isa = PBXBuildFile; fileRef = D389363815A6D53200A3A3AA /* chat_bubble_outgoing.9.png */; };
 		D38D14AF15A30B3D008497E8 /* cell_call_first_highlight.png in Resources */ = {isa = PBXBuildFile; fileRef = D38D14AD15A30B3D008497E8 /* cell_call_first_highlight.png */; };
 		D38D14B115A30B3D008497E8 /* cell_call_highlight.png in Resources */ = {isa = PBXBuildFile; fileRef = D38D14AE15A30B3D008497E8 /* cell_call_highlight.png */; };
+		D3998D0416031937009DD22C /* background_alt.png in Resources */ = {isa = PBXBuildFile; fileRef = D3998D0316031937009DD22C /* background_alt.png */; };
+		D3998D0516031937009DD22C /* background_alt.png in Resources */ = {isa = PBXBuildFile; fileRef = D3998D0316031937009DD22C /* background_alt.png */; };
 		D3A55FBC15877E5E003FD403 /* UIContactCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A55FBB15877E5E003FD403 /* UIContactCell.m */; };
 		D3A55FBD15877E5E003FD403 /* UIContactCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A55FBB15877E5E003FD403 /* UIContactCell.m */; };
 		D3A55FBF15877E69003FD403 /* UIContactCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3A55FBE15877E69003FD403 /* UIContactCell.xib */; };
@@ -1338,9 +1349,7 @@
 		220FAD2E10765B400068D98F /* libosipparser2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libosipparser2.a; path = "liblinphone-sdk/apple-darwin/lib/libosipparser2.a"; sourceTree = "<group>"; };
 		220FAD2F10765B400068D98F /* libspeex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeex.a; path = "liblinphone-sdk/apple-darwin/lib/libspeex.a"; sourceTree = "<group>"; };
 		220FAD3010765B400068D98F /* libspeexdsp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeexdsp.a; path = "liblinphone-sdk/apple-darwin/lib/libspeexdsp.a"; sourceTree = "<group>"; };
-		2211DB8F147555C800DEE054 /* libmediastreamer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer.a; path = "liblinphone-sdk/apple-darwin/lib/libmediastreamer.a"; sourceTree = "<group>"; };
 		2211DB911475562600DEE054 /* liblinphone.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblinphone.a; path = "liblinphone-sdk/apple-darwin/lib/liblinphone.a"; sourceTree = "<group>"; };
-		2211DBBB14769C8200DEE054 /* CallDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CallDelegate.m; sourceTree = "<group>"; };
 		2214783C1386A2030020F8B8 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = Resources/en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		2214EB7812F846B1002A5394 /* UICallButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UICallButton.h; sourceTree = "<group>"; };
 		2214EB7912F846B1002A5394 /* UICallButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UICallButton.m; sourceTree = "<group>"; };
@@ -1361,6 +1370,11 @@
 		2234C8E815EE2F7F00E18E83 /* chat_message_not_delivered.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_message_not_delivered.png; path = Resources/chat_message_not_delivered.png; sourceTree = "<group>"; };
 		2234C8ED15EE744200E18E83 /* chat_message_inprogress.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_message_inprogress.png; path = Resources/chat_message_inprogress.png; sourceTree = "<group>"; };
 		2237D4081084D7A9001383EE /* ring.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = ring.wav; path = Resources/ring.wav; sourceTree = "<group>"; };
+		22405EE916006F0700B92522 /* libmediastreamer_base.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer_base.a; path = "liblinphone-sdk/apple-darwin/lib/libmediastreamer_base.a"; sourceTree = "<group>"; };
+		22405EEA16006F0700B92522 /* libmediastreamer_voip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer_voip.a; path = "liblinphone-sdk/apple-darwin/lib/libmediastreamer_voip.a"; sourceTree = "<group>"; };
+		22405EED1600B4E400B92522 /* AssetsLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AssetsLibrary.framework; path = System/Library/Frameworks/AssetsLibrary.framework; sourceTree = SDKROOT; };
+		22405EFD1601C19000B92522 /* ImageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageViewController.h; sourceTree = "<group>"; };
+		22405EFE1601C19100B92522 /* ImageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ImageViewController.m; sourceTree = "<group>"; };
 		2242E312125235120061DDCE /* ring.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = ring.caf; path = Resources/ring.caf; sourceTree = "<group>"; };
 		224567C1107B968500F10948 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
 		2248E90C12F7E4CF00220D9C /* UIDigitButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIDigitButton.h; sourceTree = "<group>"; };
@@ -1373,6 +1387,7 @@
 		2264B6D111200342002C2C53 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
 		226CDADD14E2D0B800513B67 /* libbcg729.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbcg729.a; path = "liblinphone-sdk/apple-darwin/lib/libbcg729.a"; sourceTree = "<group>"; };
 		226CDADE14E2D0B800513B67 /* libmsbcg729.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmsbcg729.a; path = "liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmsbcg729.a"; sourceTree = "<group>"; };
+		226EF06B15FA256B005865C7 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
 		226F2ED31344B0EF00F6EF27 /* libopencore-amrwb.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libopencore-amrwb.a"; path = "liblinphone-sdk/apple-darwin/lib/libopencore-amrwb.a"; sourceTree = "<group>"; };
 		226F2ED41344B0EF00F6EF27 /* libopencore-amrnb.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libopencore-amrnb.a"; path = "liblinphone-sdk/apple-darwin/lib/libopencore-amrnb.a"; sourceTree = "<group>"; };
 		226F2ED51344B0EF00F6EF27 /* libmsamr.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmsamr.a; path = "liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmsamr.a"; sourceTree = "<group>"; };
@@ -1481,7 +1496,6 @@
 		29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		32CA4F630368D1EE00C91783 /* linphone_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = linphone_Prefix.pch; sourceTree = "<group>"; };
 		340751961506459A00B89C47 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
-		340751E4150E4D0200B89C47 /* CallDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CallDelegate.h; sourceTree = "<group>"; };
 		340751E5150F38FC00B89C47 /* UIVideoButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIVideoButton.h; sourceTree = "<group>"; };
 		340751E6150F38FD00B89C47 /* UIVideoButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIVideoButton.m; sourceTree = "<group>"; };
 		34216F3E1547EBCD00EA9777 /* VideoZoomHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VideoZoomHandler.h; path = LinphoneUI/VideoZoomHandler.h; sourceTree = "<group>"; };
@@ -1490,8 +1504,6 @@
 		344ABDEF14850AE9007420B6 /* libc++.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libc++.1.dylib"; path = "usr/lib/libc++.1.dylib"; sourceTree = SDKROOT; };
 		344ABDF014850AE9007420B6 /* libstdc++.6.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.6.dylib"; path = "usr/lib/libstdc++.6.dylib"; sourceTree = SDKROOT; };
 		34A6ECEA14CF13CB00460C04 /* linphone_icon_72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = linphone_icon_72.png; path = Resources/linphone_icon_72.png; sourceTree = "<group>"; };
-		570B130015FE44AF00DE62B6 /* libmediastreamer_voip.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer_voip.a; path = "liblinphone-sdk/apple-darwin/lib/libmediastreamer_voip.a"; sourceTree = "<group>"; };
-		570B130215FE44ED00DE62B6 /* libmediastreamer_base.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmediastreamer_base.a; path = "liblinphone-sdk/apple-darwin/lib/libmediastreamer_base.a"; sourceTree = "<group>"; };
 		57F005C315EE2CCF00914747 /* linphonerc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = linphonerc; path = Resources/linphonerc; sourceTree = "<group>"; };
 		57F005C615EE2D9200914747 /* linphonerc-factory */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "linphonerc-factory"; path = "Resources/linphonerc-factory"; sourceTree = "<group>"; };
 		57F005C715EE2D9200914747 /* linphonerc-factory~ipad */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "linphonerc-factory~ipad"; path = "Resources/linphonerc-factory~ipad"; sourceTree = "<group>"; };
@@ -1690,11 +1702,13 @@
 		D36FB2D31589EF7C0036F6F2 /* UIPauseButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIPauseButton.h; sourceTree = "<group>"; };
 		D36FB2D41589EF7C0036F6F2 /* UIPauseButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIPauseButton.m; sourceTree = "<group>"; };
 		D37295DA158B3C9600D2C0C7 /* video_off_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = video_off_disabled.png; path = Resources/video_off_disabled.png; sourceTree = "<group>"; };
+		D374D3FB16071762003D25FF /* ImageSharing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageSharing.h; sourceTree = "<group>"; };
+		D374D3FC16071762003D25FF /* ImageSharing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ImageSharing.m; sourceTree = "<group>"; };
 		D377BBF915A19DA6002B696B /* video_on_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = video_on_disabled.png; path = Resources/video_on_disabled.png; sourceTree = "<group>"; };
 		D378906215AC373B00BD776C /* ContactDetailsLabelViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContactDetailsLabelViewController.h; sourceTree = "<group>"; };
 		D378906315AC373B00BD776C /* ContactDetailsLabelViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContactDetailsLabelViewController.m; sourceTree = "<group>"; };
-		D378AB2815DCDB480098505D /* ContactDetailsImagePickerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContactDetailsImagePickerController.h; sourceTree = "<group>"; };
-		D378AB2915DCDB490098505D /* ContactDetailsImagePickerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContactDetailsImagePickerController.m; sourceTree = "<group>"; };
+		D378AB2815DCDB480098505D /* ImagePickerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImagePickerViewController.h; sourceTree = "<group>"; };
+		D378AB2915DCDB490098505D /* ImagePickerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ImagePickerViewController.m; sourceTree = "<group>"; };
 		D37B96B515A1A6F20005CCD2 /* call_state_delete_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = call_state_delete_default.png; path = Resources/call_state_delete_default.png; sourceTree = "<group>"; };
 		D37B96B615A1A6F20005CCD2 /* call_state_delete_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = call_state_delete_over.png; path = Resources/call_state_delete_over.png; sourceTree = "<group>"; };
 		D37C638C15AAD251009D0BAC /* contact_number_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contact_number_over.png; path = Resources/contact_number_over.png; sourceTree = "<group>"; };
@@ -1706,6 +1720,10 @@
 		D37DC6BF1594AE1800B2A5EB /* LinphoneCoreSettingsStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinphoneCoreSettingsStore.h; sourceTree = "<group>"; };
 		D37DC6C01594AE1800B2A5EB /* LinphoneCoreSettingsStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LinphoneCoreSettingsStore.m; sourceTree = "<group>"; };
 		D37DC7171594AF3400B2A5EB /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
+		D37EE10F16035793003608A6 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ImageViewController.xib; sourceTree = "<group>"; };
+		D37EE11116036197003608A6 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = fr.lproj/ImageViewController.xib; sourceTree = "<group>"; };
+		D37EE160160377D7003608A6 /* DTActionSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DTActionSheet.h; sourceTree = "<group>"; };
+		D37EE161160377D7003608A6 /* DTActionSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DTActionSheet.m; sourceTree = "<group>"; };
 		D3804E5E15D92A57008072A5 /* msg.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = msg.caf; path = Resources/msg.caf; sourceTree = "<group>"; };
 		D3804E5F15D92A57008072A5 /* msg.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = msg.wav; path = Resources/msg.wav; sourceTree = "<group>"; };
 		D3807FB715C28940005BE9BC /* DCRoundSwitch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DCRoundSwitch.h; sourceTree = "<group>"; };
@@ -1807,6 +1825,7 @@
 		D389363815A6D53200A3A3AA /* chat_bubble_outgoing.9.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chat_bubble_outgoing.9.png; path = Resources/chat_bubble_outgoing.9.png; sourceTree = "<group>"; };
 		D38D14AD15A30B3D008497E8 /* cell_call_first_highlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = cell_call_first_highlight.png; path = Resources/cell_call_first_highlight.png; sourceTree = "<group>"; };
 		D38D14AE15A30B3D008497E8 /* cell_call_highlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = cell_call_highlight.png; path = Resources/cell_call_highlight.png; sourceTree = "<group>"; };
+		D3998D0316031937009DD22C /* background_alt.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = background_alt.png; path = Resources/background_alt.png; sourceTree = "<group>"; };
 		D3A55FBA15877E5E003FD403 /* UIContactCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIContactCell.h; sourceTree = "<group>"; };
 		D3A55FBB15877E5E003FD403 /* UIContactCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIContactCell.m; sourceTree = "<group>"; };
 		D3A55FBE15877E69003FD403 /* UIContactCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UIContactCell.xib; sourceTree = "<group>"; };
@@ -2098,6 +2117,7 @@
 			files = (
 				22B5F03510CE6B2F00777D97 /* AddressBook.framework in Frameworks */,
 				22B5EFA310CE50BD00777D97 /* AddressBookUI.framework in Frameworks */,
+				22405EEE1600B4E400B92522 /* AssetsLibrary.framework in Frameworks */,
 				2274402F106F335E006EC466 /* AudioToolbox.framework in Frameworks */,
 				224567C2107B968500F10948 /* AVFoundation.framework in Frameworks */,
 				228697C411AC29B800E9E0CA /* CFNetwork.framework in Frameworks */,
@@ -2108,6 +2128,7 @@
 				22276E8713C73D8A00210156 /* CoreVideo.framework in Frameworks */,
 				1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
 				D37DC7181594AF3400B2A5EB /* MessageUI.framework in Frameworks */,
+				226EF06C15FA256B005865C7 /* MobileCoreServices.framework in Frameworks */,
 				70E542F313E147E3002BA2C0 /* OpenGLES.framework in Frameworks */,
 				70E542F513E147EB002BA2C0 /* QuartzCore.framework in Frameworks */,
 				2264B6D211200342002C2C53 /* SystemConfiguration.framework in Frameworks */,
@@ -2123,9 +2144,9 @@
 				220FAD3110765B400068D98F /* libeXosip2.a in Frameworks */,
 				220FAD3210765B400068D98F /* libgsm.a in Frameworks */,
 				223148E41178A08200637D6A /* libilbc.a in Frameworks */,
-				570B130315FE44ED00DE62B6 /* libmediastreamer_base.a in Frameworks */,
-				570B130115FE44AF00DE62B6 /* libmediastreamer_voip.a in Frameworks */,
 				F476004B147AAF2800FFF19B /* liblinphone.a in Frameworks */,
+				D37EE10916032DA4003608A6 /* libmediastreamer_base.a in Frameworks */,
+				D37EE10A16032DA4003608A6 /* libmediastreamer_voip.a in Frameworks */,
 				226F2ED81344B0EF00F6EF27 /* libmsamr.a in Frameworks */,
 				223148E61178A09900637D6A /* libmsilbc.a in Frameworks */,
 				226183B0147259670037138E /* libmssilk.a in Frameworks */,
@@ -2175,7 +2196,8 @@
 				22D8F174147548E2008C97DB /* libilbc.a in Frameworks */,
 				22D8F16B147548E2008C97DB /* libgsm.a in Frameworks */,
 				D34BD61815C13D0B0070C209 /* liblinphone.a in Frameworks */,
-				D34BD61915C13D0B0070C209 /* libmediastreamer.a in Frameworks */,
+				D37EE10B16032DC2003608A6 /* libmediastreamer_base.a in Frameworks */,
+				D37EE10C16032DC2003608A6 /* libmediastreamer_voip.a in Frameworks */,
 				22D8F17B147548E2008C97DB /* libmsamr.a in Frameworks */,
 				22D8F175147548E2008C97DB /* libmsilbc.a in Frameworks */,
 				22D8F179147548E2008C97DB /* libopencore-amrwb.a in Frameworks */,
@@ -2198,8 +2220,6 @@
 		080E96DDFE201D6D7F000001 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
-				340751E4150E4D0200B89C47 /* CallDelegate.h */,
-				2211DBBB14769C8200DEE054 /* CallDelegate.m */,
 				D32B6E2715A5BC430033019F /* ChatRoomTableViewController.h */,
 				D32B6E2815A5BC430033019F /* ChatRoomTableViewController.m */,
 				D3F795D315A582800077328B /* ChatRoomViewController.h */,
@@ -2214,8 +2234,6 @@
 				22E0A81F111C44E100B04932 /* ConsoleViewController.m */,
 				22E0A81E111C44E100B04932 /* ConsoleViewController.xib */,
 				D30BBD1215D3EFEB000F93DD /* ContactDetailsDelegate.h */,
-				D378AB2815DCDB480098505D /* ContactDetailsImagePickerController.h */,
-				D378AB2915DCDB490098505D /* ContactDetailsImagePickerController.m */,
 				D378906215AC373B00BD776C /* ContactDetailsLabelViewController.h */,
 				D378906315AC373B00BD776C /* ContactDetailsLabelViewController.m */,
 				D38187B815FE341B00C3EDCA /* ContactDetailsLabelViewController.xib */,
@@ -2244,6 +2262,13 @@
 				D3ED3EB515873928006C0DE4 /* HistoryViewController.h */,
 				D3ED3EB615873929006C0DE4 /* HistoryViewController.m */,
 				D38187D415FE346B00C3EDCA /* HistoryViewController.xib */,
+				D378AB2815DCDB480098505D /* ImagePickerViewController.h */,
+				D378AB2915DCDB490098505D /* ImagePickerViewController.m */,
+				D374D3FB16071762003D25FF /* ImageSharing.h */,
+				D374D3FC16071762003D25FF /* ImageSharing.m */,
+				22405EFD1601C19000B92522 /* ImageViewController.h */,
+				22405EFE1601C19100B92522 /* ImageViewController.m */,
+				D37EE11016035793003608A6 /* ImageViewController.xib */,
 				D31AAF5C159B3919002C6B02 /* InCallTableViewController.h */,
 				D31AAF5D159B3919002C6B02 /* InCallTableViewController.m */,
 				D3F83EE91582021700336684 /* InCallViewController.h */,
@@ -2637,8 +2662,6 @@
 		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
 			isa = PBXGroup;
 			children = (
-				570B130215FE44ED00DE62B6 /* libmediastreamer_base.a */,
-				570B130015FE44AF00DE62B6 /* libmediastreamer_voip.a */,
 				2258633C11410BAC00C5A737 /* README */,
 				22276E8013C73D3100210156 /* libavcodec.a */,
 				22276E8113C73D3100210156 /* libavutil.a */,
@@ -2648,7 +2671,8 @@
 				220FAD2910765B400068D98F /* libgsm.a */,
 				223148E31178A08200637D6A /* libilbc.a */,
 				2211DB911475562600DEE054 /* liblinphone.a */,
-				2211DB8F147555C800DEE054 /* libmediastreamer.a */,
+				22405EE916006F0700B92522 /* libmediastreamer_base.a */,
+				22405EEA16006F0700B92522 /* libmediastreamer_voip.a */,
 				226F2ED51344B0EF00F6EF27 /* libmsamr.a */,
 				226CDADE14E2D0B800513B67 /* libmsbcg729.a */,
 				223148E51178A09900637D6A /* libmsilbc.a */,
@@ -2674,6 +2698,7 @@
 				344ABDF014850AE9007420B6 /* libstdc++.6.dylib */,
 				22B5F03410CE6B2F00777D97 /* AddressBook.framework */,
 				22B5EFA210CE50BD00777D97 /* AddressBookUI.framework */,
+				22405EED1600B4E400B92522 /* AssetsLibrary.framework */,
 				2274402E106F335E006EC466 /* AudioToolbox.framework */,
 				224567C1107B968500F10948 /* AVFoundation.framework */,
 				228697C311AC29B800E9E0CA /* CFNetwork.framework */,
@@ -2683,6 +2708,7 @@
 				340751961506459A00B89C47 /* CoreTelephony.framework */,
 				22276E8613C73D8A00210156 /* CoreVideo.framework */,
 				D37DC7171594AF3400B2A5EB /* MessageUI.framework */,
+				226EF06B15FA256B005865C7 /* MobileCoreServices.framework */,
 				70E542F213E147E3002BA2C0 /* OpenGLES.framework */,
 				70E542F413E147EB002BA2C0 /* QuartzCore.framework */,
 				22744043106F33FC006EC466 /* Security.framework */,
@@ -2735,6 +2761,7 @@
 				D3211BBD159CBFD60098460B /* back_over.png */,
 				D3A74E6615C69392001500B9 /* back_over~ipad.png */,
 				D3ED3E401585FB4A006C0DE4 /* background.png */,
+				D3998D0316031937009DD22C /* background_alt.png */,
 				D3A74E6715C69392001500B9 /* background_top~ipad.png */,
 				D3ED3E7615861B1B006C0DE4 /* backspace_default.png */,
 				D3A74E6815C69392001500B9 /* backspace_default~ipad.png */,
@@ -3139,6 +3166,7 @@
 				D380801215C299D0005BE9BC /* ColorSpaceUtilites.m */,
 				D380801115C29984005BE9BC /* ColorSpaceUtilities.h */,
 				D3807FB615C28940005BE9BC /* DCRoundSwitch */,
+				D37EE15F160377D7003608A6 /* DTFoundation */,
 				D32B9DFA15A2F131000B6DEC /* FastAddressBook.h */,
 				D32B9DFB15A2F131000B6DEC /* FastAddressBook.m */,
 				D3ED40141602172200BF332B /* GrowingTextView */,
@@ -3172,6 +3200,16 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		D37EE15F160377D7003608A6 /* DTFoundation */ = {
+			isa = PBXGroup;
+			children = (
+				D37EE160160377D7003608A6 /* DTActionSheet.h */,
+				D37EE161160377D7003608A6 /* DTActionSheet.m */,
+			);
+			name = DTFoundation;
+			path = Utils/DTFoundation;
+			sourceTree = "<group>";
+		};
 		D3807FB615C28940005BE9BC /* DCRoundSwitch */ = {
 			isa = PBXGroup;
 			children = (
@@ -3837,6 +3875,7 @@
 				2234C8E915EE2F7F00E18E83 /* chat_message_delivered.png in Resources */,
 				2234C8EB15EE2F7F00E18E83 /* chat_message_not_delivered.png in Resources */,
 				2234C8EE15EE744200E18E83 /* chat_message_inprogress.png in Resources */,
+				D37EE10D16035793003608A6 /* ImageViewController.xib in Resources */,
 				D381881115FE3F0B00C3EDCA /* UICallCell.xib in Resources */,
 				D381881915FE3FCA00C3EDCA /* InCallViewController.xib in Resources */,
 				D381883E15FE447200C3EDCA /* ChatRoomViewController.xib in Resources */,
@@ -3845,6 +3884,7 @@
 				D381885615FE448400C3EDCA /* UICallBar~ipad.xib in Resources */,
 				D3ED40241602257400BF332B /* chat_background.9.png in Resources */,
 				D3ED40261602257400BF332B /* chat_background.9@2x.png in Resources */,
+				D3998D0416031937009DD22C /* background_alt.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4287,6 +4327,7 @@
 				2234C8EA15EE2F7F00E18E83 /* chat_message_delivered.png in Resources */,
 				2234C8EC15EE2F7F00E18E83 /* chat_message_not_delivered.png in Resources */,
 				2234C8EF15EE744200E18E83 /* chat_message_inprogress.png in Resources */,
+				D37EE10E16035793003608A6 /* ImageViewController.xib in Resources */,
 				D381881215FE3F0B00C3EDCA /* UICallCell.xib in Resources */,
 				D381881A15FE3FCA00C3EDCA /* InCallViewController.xib in Resources */,
 				D381883F15FE447200C3EDCA /* ChatRoomViewController.xib in Resources */,
@@ -4295,6 +4336,7 @@
 				D381885715FE448400C3EDCA /* UICallBar~ipad.xib in Resources */,
 				D3ED40251602257400BF332B /* chat_background.9.png in Resources */,
 				D3ED40271602257400BF332B /* chat_background.9@2x.png in Resources */,
+				D3998D0516031937009DD22C /* background_alt.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4348,7 +4390,6 @@
 				22C755601317E59C007BC101 /* UIBluetoothButton.m in Sources */,
 				22BB1A69132FF16A005CD7AA /* UIEraseButton.m in Sources */,
 				22AA8B0113D83F6300B30535 /* UICamSwitch.m in Sources */,
-				2211DBBE14769C8300DEE054 /* CallDelegate.m in Sources */,
 				340751E7150F38FD00B89C47 /* UIVideoButton.m in Sources */,
 				34216F401547EBCD00EA9777 /* VideoZoomHandler.m in Sources */,
 				D3F83EEC1582021700336684 /* InCallViewController.m in Sources */,
@@ -4416,9 +4457,12 @@
 				D380800215C2894A005BE9BC /* IASKTextField.m in Sources */,
 				D380800515C28A7A005BE9BC /* UILinphone.m in Sources */,
 				D380801315C299D0005BE9BC /* ColorSpaceUtilites.m in Sources */,
-				D378AB2A15DCDB4A0098505D /* ContactDetailsImagePickerController.m in Sources */,
+				D378AB2A15DCDB4A0098505D /* ImagePickerViewController.m in Sources */,
+				22405F001601C19200B92522 /* ImageViewController.m in Sources */,
 				D3ED40191602172200BF332B /* HPGrowingTextView.m in Sources */,
 				D3ED401B1602172200BF332B /* HPTextViewInternal.m in Sources */,
+				D37EE162160377D7003608A6 /* DTActionSheet.m in Sources */,
+				D374D3FD16071762003D25FF /* ImageSharing.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4440,7 +4484,6 @@
 				22D8F155147548E2008C97DB /* UIBluetoothButton.m in Sources */,
 				22D8F156147548E2008C97DB /* UIEraseButton.m in Sources */,
 				22D8F159147548E2008C97DB /* UICamSwitch.m in Sources */,
-				2211DBBF14769C8300DEE054 /* CallDelegate.m in Sources */,
 				340751E8150F38FD00B89C47 /* UIVideoButton.m in Sources */,
 				34216F411547EBCD00EA9777 /* VideoZoomHandler.m in Sources */,
 				D3F83EED1582021700336684 /* InCallViewController.m in Sources */,
@@ -4508,9 +4551,12 @@
 				D380800315C2894A005BE9BC /* IASKTextField.m in Sources */,
 				D380800615C28A7A005BE9BC /* UILinphone.m in Sources */,
 				D380801415C299D0005BE9BC /* ColorSpaceUtilites.m in Sources */,
-				D378AB2B15DCDB4A0098505D /* ContactDetailsImagePickerController.m in Sources */,
+				D378AB2B15DCDB4A0098505D /* ImagePickerViewController.m in Sources */,
+				22405F011601C19200B92522 /* ImageViewController.m in Sources */,
 				D3ED401A1602172200BF332B /* HPGrowingTextView.m in Sources */,
 				D3ED401C1602172200BF332B /* HPTextViewInternal.m in Sources */,
+				D37EE163160377D7003608A6 /* DTActionSheet.m in Sources */,
+				D374D3FE16071762003D25FF /* ImageSharing.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4549,6 +4595,15 @@
 			name = Localizable.strings;
 			sourceTree = "<group>";
 		};
+		D37EE11016035793003608A6 /* ImageViewController.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				D37EE10F16035793003608A6 /* en */,
+				D37EE11116036197003608A6 /* fr */,
+			);
+			name = ImageViewController.xib;
+			sourceTree = "<group>";
+		};
 		D38187B015FE340100C3EDCA /* ChatRoomViewController.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -4760,6 +4815,7 @@
 					HAVE_SILK,
 					DEBUG,
 				);
+				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
 				HEADER_SEARCH_PATHS = (
 					submodules/linphone/coreapi,
 					submodules/linphone/mediastreamer2/include,
@@ -4833,6 +4889,7 @@
 					HAVE_X264,
 					HAVE_SILK,
 				);
+				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
 				HEADER_SEARCH_PATHS = (
 					submodules/linphone/coreapi,
 					submodules/linphone/mediastreamer2/include,
@@ -5100,6 +5157,7 @@
 					HAVE_X264,
 					HAVE_SILK,
 				);
+				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
 				HEADER_SEARCH_PATHS = (
 					submodules/linphone/coreapi,
 					submodules/linphone/mediastreamer2/include,
@@ -5173,6 +5231,7 @@
 					HAVE_X264,
 					HAVE_SILK,
 				);
+				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
 				HEADER_SEARCH_PATHS = (
 					submodules/linphone/coreapi,
 					submodules/linphone/mediastreamer2/include,

submodules/liblinphone.xcodeproj/project.pbxproj

@@ -29,7 +29,6 @@
 		221DCB6E153584410025E54D /* yuv2rgb.vs in Sources */ = {isa = PBXBuildFile; fileRef = 221DCB6B153584410025E54D /* yuv2rgb.vs */; };
 		221DCB6F153584410025E54D /* yuv2rgb.vs in Sources */ = {isa = PBXBuildFile; fileRef = 221DCB6B153584410025E54D /* yuv2rgb.vs */; };
 		221F58A013AB50F800D603C9 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 221F589F13AB50F800D603C9 /* CoreMedia.framework */; };
-		221F58A413AB708C00D603C9 /* alldescs.h in Headers */ = {isa = PBXBuildFile; fileRef = 221F58A313AB708C00D603C9 /* alldescs.h */; };
 		221F58E413AF44B300D603C9 /* scaler.h in Headers */ = {isa = PBXBuildFile; fileRef = 221F58E313AF44B300D603C9 /* scaler.h */; };
 		222CA63211F6CF7600621220 /* allfilters.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5BE11F6CF7600621220 /* allfilters.h */; };
 		222CA63311F6CF7600621220 /* dsptools.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA5BF11F6CF7600621220 /* dsptools.h */; };
@@ -113,6 +112,12 @@
 		222CA78411F6CFB100621220 /* siplogin.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA76211F6CFB100621220 /* siplogin.c */; };
 		222CA78511F6CFB100621220 /* sipsetup.c in Sources */ = {isa = PBXBuildFile; fileRef = 222CA76311F6CFB100621220 /* sipsetup.c */; };
 		222CA78611F6CFB100621220 /* sipsetup.h in Headers */ = {isa = PBXBuildFile; fileRef = 222CA76411F6CFB100621220 /* sipsetup.h */; };
+		22405EDD160065C200B92522 /* basedescs.h in Headers */ = {isa = PBXBuildFile; fileRef = 22405EDC160065C200B92522 /* basedescs.h */; };
+		22405EE01600668800B92522 /* msvoip.c in Sources */ = {isa = PBXBuildFile; fileRef = 22405EDF1600668800B92522 /* msvoip.c */; };
+		22405EE2160066C700B92522 /* voipdescs.h in Headers */ = {isa = PBXBuildFile; fileRef = 22405EE1160066C700B92522 /* voipdescs.h */; };
+		22405EE51600671D00B92522 /* logging.c in Sources */ = {isa = PBXBuildFile; fileRef = 22405EE31600671D00B92522 /* logging.c */; };
+		22405EE61600671D00B92522 /* rtpprofile.c in Sources */ = {isa = PBXBuildFile; fileRef = 22405EE41600671D00B92522 /* rtpprofile.c */; };
+		22405EE81600675C00B92522 /* genericplc.c in Sources */ = {isa = PBXBuildFile; fileRef = 22405EE71600675C00B92522 /* genericplc.c */; };
 		2258C44113A9377B0087A596 /* swscale.h in Headers */ = {isa = PBXBuildFile; fileRef = 2258C44013A9377B0087A596 /* swscale.h */; };
 		2258C44513A945520087A596 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2258C44213A945520087A596 /* libswscale.a */; };
 		2258C44613A945520087A596 /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2258C44313A945520087A596 /* libavutil.a */; };
@@ -191,7 +196,6 @@
 		225D64761521BFA6008B2E81 /* linphonecore_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 229B9D5813043EAB00EFCD1C /* linphonecore_utils.h */; };
 		225D64781521BFA6008B2E81 /* nowebcam.h in Headers */ = {isa = PBXBuildFile; fileRef = 220ED1AA13A9062500AC21E0 /* nowebcam.h */; };
 		225D64791521BFA6008B2E81 /* swscale.h in Headers */ = {isa = PBXBuildFile; fileRef = 2258C44013A9377B0087A596 /* swscale.h */; };
-		225D647A1521BFA6008B2E81 /* alldescs.h in Headers */ = {isa = PBXBuildFile; fileRef = 221F58A313AB708C00D603C9 /* alldescs.h */; };
 		225D647B1521BFA6008B2E81 /* scaler.h in Headers */ = {isa = PBXBuildFile; fileRef = 221F58E313AF44B300D603C9 /* scaler.h */; };
 		225D647C1521BFA6008B2E81 /* g722.h in Headers */ = {isa = PBXBuildFile; fileRef = 229A614B13DDFE3500090183 /* g722.h */; };
 		225D647D1521BFA6008B2E81 /* shaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 70E542F613E14816002BA2C0 /* shaders.h */; };
@@ -339,7 +343,6 @@
 		225D65431521C009008B2E81 /* linphonecore_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 229B9D5813043EAB00EFCD1C /* linphonecore_utils.h */; };
 		225D65451521C009008B2E81 /* nowebcam.h in Headers */ = {isa = PBXBuildFile; fileRef = 220ED1AA13A9062500AC21E0 /* nowebcam.h */; };
 		225D65461521C009008B2E81 /* swscale.h in Headers */ = {isa = PBXBuildFile; fileRef = 2258C44013A9377B0087A596 /* swscale.h */; };
-		225D65471521C009008B2E81 /* alldescs.h in Headers */ = {isa = PBXBuildFile; fileRef = 221F58A313AB708C00D603C9 /* alldescs.h */; };
 		225D65481521C009008B2E81 /* scaler.h in Headers */ = {isa = PBXBuildFile; fileRef = 221F58E313AF44B300D603C9 /* scaler.h */; };
 		225D65491521C009008B2E81 /* g722.h in Headers */ = {isa = PBXBuildFile; fileRef = 229A614B13DDFE3500090183 /* g722.h */; };
 		225D654A1521C009008B2E81 /* shaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 70E542F613E14816002BA2C0 /* shaders.h */; };
@@ -466,7 +469,6 @@
 		221F589D13AB503F00D603C9 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
 		221F589F13AB50F800D603C9 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
 		221F58A113AB6F8000D603C9 /* pixconv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pixconv.c; sourceTree = "<group>"; };
-		221F58A313AB708C00D603C9 /* alldescs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = alldescs.h; path = build/iphone/alldescs.h; sourceTree = "<group>"; };
 		221F58A513AB716300D603C9 /* tonedetector.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tonedetector.c; sourceTree = "<group>"; };
 		221F58A613AB716300D603C9 /* jpegwriter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jpegwriter.c; sourceTree = "<group>"; };
 		221F58A713AB716300D603C9 /* h264dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = h264dec.c; sourceTree = "<group>"; };
@@ -639,6 +641,12 @@
 		222CA76311F6CFB100621220 /* sipsetup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sipsetup.c; sourceTree = "<group>"; };
 		222CA76411F6CFB100621220 /* sipsetup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sipsetup.h; sourceTree = "<group>"; };
 		22313679143DED490035C1F4 /* msandroidvideo.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = msandroidvideo.cpp; sourceTree = "<group>"; };
+		22405EDC160065C200B92522 /* basedescs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = basedescs.h; path = build/iphone/basedescs.h; sourceTree = "<group>"; };
+		22405EDF1600668800B92522 /* msvoip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = msvoip.c; sourceTree = "<group>"; };
+		22405EE1160066C700B92522 /* voipdescs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = voipdescs.h; path = build/iphone/voipdescs.h; sourceTree = "<group>"; };
+		22405EE31600671D00B92522 /* logging.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = logging.c; sourceTree = "<group>"; };
+		22405EE41600671D00B92522 /* rtpprofile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rtpprofile.c; sourceTree = "<group>"; };
+		22405EE71600675C00B92522 /* genericplc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = genericplc.c; sourceTree = "<group>"; };
 		224AD571143208BB00510FF3 /* android-display.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "android-display.c"; path = "../../../../../../workspace-android/linphone-android/submodules/linphone/mediastreamer2/src/android-display.c"; sourceTree = "<group>"; };
 		224AD57314320EB400510FF3 /* scaler_arm.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = scaler_arm.S; path = "../../../../../../workspace-android/linphone-android/submodules/linphone/mediastreamer2/src/scaler_arm.S"; sourceTree = "<group>"; };
 		22512698145F13CE0041FBF2 /* aqsnd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = aqsnd.c; sourceTree = "<group>"; };
@@ -846,8 +854,9 @@
 		222CA4CF11F6CF2000621220 /* mediastreamer2 */ = {
 			isa = PBXGroup;
 			children = (
+				22405EE1160066C700B92522 /* voipdescs.h */,
+				22405EDC160065C200B92522 /* basedescs.h */,
 				22B5106813AFD37B00CD87DA /* nowebcamCIF.jpg */,
-				221F58A313AB708C00D603C9 /* alldescs.h */,
 				22DD19E013A8D82C0018ECD4 /* tests */,
 				222CA5B811F6CF7600621220 /* include */,
 				222CA5DC11F6CF7600621220 /* src */,
@@ -916,6 +925,8 @@
 		222CA5DC11F6CF7600621220 /* src */ = {
 			isa = PBXGroup;
 			children = (
+				22405EE71600675C00B92522 /* genericplc.c */,
+				22405EDF1600668800B92522 /* msvoip.c */,
 				221DCB6A153584410025E54D /* yuv2rgb.fs */,
 				221DCB6B153584410025E54D /* yuv2rgb.vs */,
 				221DCB6715347EF80025E54D /* opengles_display.c */,
@@ -1045,6 +1056,8 @@
 		222CA6B611F6CF9F00621220 /* src */ = {
 			isa = PBXGroup;
 			children = (
+				22405EE31600671D00B92522 /* logging.c */,
+				22405EE41600671D00B92522 /* rtpprofile.c */,
 				F4D9F23D145710540035B0D0 /* netsim.c */,
 				F4D9F23E145710540035B0D0 /* ortp_srtp.c */,
 				7014533D13FA841E00A01D86 /* zrtp.c */,
@@ -1281,11 +1294,12 @@
 				225D64761521BFA6008B2E81 /* linphonecore_utils.h in Headers */,
 				225D64781521BFA6008B2E81 /* nowebcam.h in Headers */,
 				225D64791521BFA6008B2E81 /* swscale.h in Headers */,
-				225D647A1521BFA6008B2E81 /* alldescs.h in Headers */,
 				225D647B1521BFA6008B2E81 /* scaler.h in Headers */,
 				225D647C1521BFA6008B2E81 /* g722.h in Headers */,
 				225D647D1521BFA6008B2E81 /* shaders.h in Headers */,
 				225D64811521BFA6008B2E81 /* zrtp.h in Headers */,
+				22405EDD160065C200B92522 /* basedescs.h in Headers */,
+				22405EE2160066C700B92522 /* voipdescs.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1367,7 +1381,6 @@
 				225D65431521C009008B2E81 /* linphonecore_utils.h in Headers */,
 				225D65451521C009008B2E81 /* nowebcam.h in Headers */,
 				225D65461521C009008B2E81 /* swscale.h in Headers */,
-				225D65471521C009008B2E81 /* alldescs.h in Headers */,
 				225D65481521C009008B2E81 /* scaler.h in Headers */,
 				225D65491521C009008B2E81 /* g722.h in Headers */,
 				225D654A1521C009008B2E81 /* shaders.h in Headers */,
@@ -1453,7 +1466,6 @@
 				229B9D5913043EAB00EFCD1C /* linphonecore_utils.h in Headers */,
 				220ED1AC13A9062600AC21E0 /* nowebcam.h in Headers */,
 				2258C44113A9377B0087A596 /* swscale.h in Headers */,
-				221F58A413AB708C00D603C9 /* alldescs.h in Headers */,
 				221F58E413AF44B300D603C9 /* scaler.h in Headers */,
 				229A614F13DDFE3500090183 /* g722.h in Headers */,
 				70E542FA13E14816002BA2C0 /* shaders.h in Headers */,
@@ -1658,6 +1670,8 @@
 				221DCB6915347EF80025E54D /* opengles_display.c in Sources */,
 				221DCB6D153584410025E54D /* yuv2rgb.fs in Sources */,
 				221DCB6F153584410025E54D /* yuv2rgb.vs in Sources */,
+				22405EE01600668800B92522 /* msvoip.c in Sources */,
+				22405EE81600675C00B92522 /* genericplc.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1690,6 +1704,8 @@
 				225D65B41521C009008B2E81 /* zrtp.c in Sources */,
 				225D65B81521C009008B2E81 /* netsim.c in Sources */,
 				225D65B91521C009008B2E81 /* ortp_srtp.c in Sources */,
+				22405EE51600671D00B92522 /* logging.c in Sources */,
+				22405EE61600671D00B92522 /* rtpprofile.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

submodules/mssilk

@@ -1 +1 @@
-Subproject commit f9015a91ca056cc5be577dfb78c7c224f1fd77b2
+Subproject commit 1d81e34d6e3234797a726f9e66fc02ac5f28a637