diff --git a/Classes/ChatRoomViewController.h b/Classes/ChatRoomViewController.h index 350aede1c..c39d7d93d 100644 --- a/Classes/ChatRoomViewController.h +++ b/Classes/ChatRoomViewController.h @@ -34,12 +34,13 @@ @property (nonatomic, retain) IBOutlet ChatRoomTableViewController* tableController; @property (nonatomic, retain) IBOutlet UIToggleButton *editButton; -@property (nonatomic, retain) IBOutlet UITextField* messageField; +@property (nonatomic, retain) IBOutlet UITextView* messageField; @property (nonatomic, retain) IBOutlet UIButton* sendButton; @property (nonatomic, retain) IBOutlet UILabel *addressLabel; @property (nonatomic, retain) IBOutlet UIImageView *avatarImage; @property (nonatomic, retain) IBOutlet UIView *headerView; @property (nonatomic, retain) IBOutlet UIView *footerView; +@property (nonatomic, retain) IBOutlet UIView *chatView; @property (nonatomic, retain) IBOutlet UIImageView *fieldBackgroundImage; @property (nonatomic, copy) NSString *remoteAddress; diff --git a/Classes/ChatRoomViewController.m b/Classes/ChatRoomViewController.m index ba620059b..7d945b531 100644 --- a/Classes/ChatRoomViewController.m +++ b/Classes/ChatRoomViewController.m @@ -33,6 +33,7 @@ @synthesize avatarImage; @synthesize headerView; @synthesize footerView; +@synthesize chatView; @synthesize fieldBackgroundImage; @@ -73,7 +74,7 @@ static UICompositeViewDescription *compositeDescription = nil; stateBar:nil stateBarEnabled:false tabBar:@"UIMainBar" - tabBarEnabled:true + tabBarEnabled:false /*to keep room for chat*/ fullscreen:false landscapeMode:[LinphoneManager runningOnIpad] portraitMode:true]; @@ -108,7 +109,11 @@ static UICompositeViewDescription *compositeDescription = nil; selector:@selector(textReceivedEvent:) name:kLinphoneTextReceived object:nil]; - if([tableController isEditing]) + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(onMessageChange:) + name:UITextViewTextDidChangeNotification + object:nil]; + if([tableController isEditing]) [tableController setEditing:FALSE animated:FALSE]; [editButton setOff]; [[tableController tableView] reloadData]; @@ -132,6 +137,9 @@ static UICompositeViewDescription *compositeDescription = nil; [[NSNotificationCenter defaultCenter] removeObserver:self name:kLinphoneTextReceived object:nil]; + [[NSNotificationCenter defaultCenter] removeObserver:self + name:UITextViewTextDidChangeNotification + object:nil]; } -(void)didReceiveMemoryWarning { @@ -189,7 +197,20 @@ static UICompositeViewDescription *compositeDescription = nil; return FALSE; } if(chatRoom == NULL) { - chatRoom = linphone_core_create_chat_room([LinphoneManager getLc], [remoteAddress UTF8String]); + LinphoneProxyConfig* proxyCfg; + linphone_core_get_default_proxy([LinphoneManager getLc], &proxyCfg); + if (![remoteAddress hasPrefix:@"sip:"] && proxyCfg) { + //hmm probably a username only + char normalizedUserName[256]; + LinphoneAddress* linphoneAddress = linphone_address_new(linphone_core_get_identity([LinphoneManager getLc])); + linphone_proxy_config_normalize_number(proxyCfg,[remoteAddress cStringUsingEncoding:[NSString defaultCStringEncoding]],normalizedUserName,sizeof(normalizedUserName)); + linphone_address_set_username(linphoneAddress, normalizedUserName); + remoteAddress=[NSString stringWithUTF8String:normalizedUserName]; + linphone_address_destroy(linphoneAddress); + + } + + chatRoom = linphone_core_create_chat_room([LinphoneManager getLc], [remoteAddress UTF8String]); } // Save message in database @@ -271,7 +292,7 @@ static UICompositeViewDescription *compositeDescription = nil; - (void)keyboardWillHide:(NSNotification *)notif { //CGRect beginFrame = [[[notif userInfo] objectForKey:UIKeyboardFrameBeginUserInfoKey] CGRectValue]; - //CGRect endFrame = [[[notif userInfo] objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue]; + CGRect endFrame = [[[notif userInfo] objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue]; UIViewAnimationCurve curve = [[[notif userInfo] objectForKey:UIKeyboardAnimationCurveUserInfoKey] intValue]; NSTimeInterval duration = [[[notif userInfo] objectForKey:UIKeyboardAnimationDurationUserInfoKey] doubleValue]; [UIView beginAnimations:@"resize" context:nil]; @@ -280,9 +301,9 @@ static UICompositeViewDescription *compositeDescription = nil; [UIView setAnimationBeginsFromCurrentState:TRUE]; // Move view - CGRect frame = [[self view] frame]; - frame.origin.y = 0; - [[self view] setFrame:frame]; + CGRect frame = [[self chatView/*view*/] frame]; + frame.origin.y = frame.origin.y + endFrame.size.height /*0*/; + [[self /*view*/chatView] setFrame:frame]; // Resize table view CGRect tableFrame = [tableController.view frame]; @@ -311,25 +332,26 @@ static UICompositeViewDescription *compositeDescription = nil; // Move view { - CGRect frame = [[self view] frame]; - CGRect rect = [PhoneMainView instance].view.bounds; - CGPoint pos = {frame.size.width, frame.size.height}; - CGPoint gPos = [self.view convertPoint:pos toView:[UIApplication sharedApplication].keyWindow.rootViewController.view]; // Bypass IOS bug on landscape mode - frame.origin.y = (rect.size.height - gPos.y - endFrame.size.height); + CGRect frame = [[self chatView/*view*/] frame]; + // CGRect rect = [PhoneMainView instance].view.bounds; + + // CGPoint pos = {frame.size.width, frame.size.height}; + // CGPoint gPos = [self.view convertPoint:pos toView:[UIApplication sharedApplication].keyWindow.rootViewController.view]; // Bypass IOS bug on landscape mode + frame.origin.y = /*(rect.size.height - gPos.y*/ frame.origin.y - endFrame.size.height; if(frame.origin.y > 0) frame.origin.y = 0; - [[self view] setFrame:frame]; + [[self chatView] setFrame:frame]; } // Resize table view { - CGPoint pos = {0, 0}; - CGPoint gPos = [[self.view superview] convertPoint:pos toView:self.view]; + /*CGPoint pos = {0, 0}; + CGPoint gPos = [[self.view superview] convertPoint:pos toView:self.view];*/ CGRect tableFrame = [tableController.view frame]; - tableFrame.origin.y = gPos.y; - tableFrame.size.height = [footerView frame].origin.y - tableFrame.origin.y; + tableFrame.origin.y += endFrame.size.height - headerView.frame.size.height/*gPos.y*/; + tableFrame.size.height = tableFrame.size.height - endFrame.size.height+headerView.frame.size.height; [tableController.view setFrame:tableFrame]; } - + // Scroll int lastSection = [tableController.tableView numberOfSections] -1; if(lastSection >= 0) { diff --git a/Classes/ChatRoomViewController.xib b/Classes/ChatRoomViewController.xib index 140f53cfe..fa18a7f31 100644 --- a/Classes/ChatRoomViewController.xib +++ b/Classes/ChatRoomViewController.xib @@ -3,22 +3,23 @@ 1296 11E53 - 2549 + 2182 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1181 - IBProxyObject - IBUIButton + IBUIView IBUIImageView IBUILabel - IBUITableView - IBUITableViewController + IBProxyObject IBUITextField - IBUIView + IBUITableViewController + IBUITableView + IBUITextView + IBUIButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -40,6 +41,258 @@ 292 + + + 310 + + + + 290 + + + + 292 + {{-13, -5}, {131, 107}} + + + + _NS:9 + NO + IBCocoaTouchFramework + + NSImage + avatar_shadow_small.png + + + + + 292 + {{20, 6}, {65, 65}} + + + + _NS:9 + NO + IBCocoaTouchFramework + + NSImage + avatar_unknown_small.png + + + + + 290 + {{101, 37}, {199, 43}} + + + + _NS:9 + NO + YES + 7 + NO + IBCocoaTouchFramework + Contact1 + + 3 + MC4zMzMzMzMzMzMzAA + + + 0 + 10 + + 1 + 22 + + + Helvetica + 22 + 16 + + + + {320, 80} + + + + _NS:9 + + 3 + MCAwAA + + YES + IBCocoaTouchFramework + + + + 274 + {{0, 80}, {320, 277}} + + + + _NS:9 + + 3 + MQA + + YES + IBCocoaTouchFramework + YES + 0 + YES + 44 + 22 + 22 + + + + 266 + + + + 257 + {{250, 0}, {70, 59}} + + + + _NS:9 + NO + + Missed + + IBCocoaTouchFramework + NO + 0 + 0 + NO + NO + + 3 + MC41AA + + + NSImage + chat_send_over.png + + + NSImage + chat_send_disabled.png + + + NSImage + chat_send_default.png + + + 2 + 15 + + + Helvetica-Bold + 15 + 16 + + + + + 258 + {250, 59} + + + + _NS:9 + NO + IBCocoaTouchFramework + + NSImage + chat_field.png + + + + + -2147483390 + {{10, 10}, {230, 39}} + + + + _NS:9 + NO + YES + IBCocoaTouchFramework + 0 + + Type your message here + + 3 + MAA + + 2 + + + 17 + + 2 + 2 + IBCocoaTouchFramework + + + 1 + 18 + + + Helvetica + 18 + 16 + + + + + 292 + {{10, 10}, {230, 39}} + + + + _NS:9 + YES + YES + + + + IBCocoaTouchFramework + YES + + + 2 + IBCocoaTouchFramework + + + + + + {{0, 357}, {320, 59}} + + + + _NS:9 + + 3 + MQA + + + IBCocoaTouchFramework + + + {{0, 44}, {320, 416}} + + + + _NS:9 + + 3 + MQA + + + IBCocoaTouchFramework + 290 @@ -47,7 +300,7 @@ 290 - {320, 58} + {320, 44} @@ -62,7 +315,7 @@ 292 - {160, 58} + {160, 44} @@ -75,10 +328,7 @@ 0 0 NO - - 3 - MC41AA - + NSImage chat_back_over.png @@ -87,23 +337,16 @@ NSImage chat_back_default.png - - 2 - 15 - - - Helvetica-Bold - 15 - 16 - + + 289 - {{160, 0}, {160, 58}} + {{160, 0}, {160, 44}} - + _NS:9 NO @@ -127,216 +370,14 @@ chat_edit_default.png - + - {320, 58} + {320, 44} _NS:9 - - 3 - MQA - - 2 - - - IBCocoaTouchFramework - - - - 290 - - - - 292 - {{-13, -5}, {131, 107}} - - - - _NS:9 - NO - IBCocoaTouchFramework - - NSImage - avatar_shadow_small.png - - - - - 292 - {{20, 6}, {65, 65}} - - - - _NS:9 - NO - IBCocoaTouchFramework - - NSImage - avatar_unknown_small.png - - - - - 290 - {{101, 37}, {199, 43}} - - - - _NS:9 - NO - YES - 7 - NO - IBCocoaTouchFramework - Contact1 - - 3 - MC4zMzMzMzMzMzMzAA - - - 0 - 10 - - 1 - 22 - - - Helvetica - 22 - 16 - - - - {{0, 58}, {320, 80}} - - - - _NS:9 - - 3 - MCAwAA - - YES - IBCocoaTouchFramework - - - - 274 - {{0, 138}, {320, 263}} - - - - _NS:9 - - 3 - MQA - - YES - IBCocoaTouchFramework - YES - 0 - YES - 44 - 22 - 22 - - - - 266 - - - - 257 - {{250, 0}, {70, 59}} - - - - _NS:9 - NO - - Missed - - IBCocoaTouchFramework - NO - 0 - 0 - NO - NO - - - NSImage - chat_send_over.png - - - NSImage - chat_send_disabled.png - - - NSImage - chat_send_default.png - - - - - - - 258 - {250, 59} - - - - _NS:9 - NO - IBCocoaTouchFramework - - NSImage - chat_field.png - - - - - 258 - {{10, 10}, {230, 39}} - - - - _NS:9 - NO - YES - IBCocoaTouchFramework - 0 - - Type your message here - - 3 - MAA - - - YES - 17 - - 2 - IBCocoaTouchFramework - - - 1 - 18 - - - Helvetica - 18 - 16 - - - - {{0, 401}, {320, 59}} - - - - _NS:9 3 MQA @@ -374,22 +415,6 @@ 11 - - - messageField - - - - 26 - - - - sendButton - - - - 27 - tableController @@ -414,6 +439,14 @@ 43 + + + headerView + + + + 45 + avatarImage @@ -424,11 +457,11 @@ - headerView + fieldBackgroundImage - + - 45 + 48 @@ -440,11 +473,27 @@ - fieldBackgroundImage + sendButton - + - 48 + 27 + + + + chatView + + + + 54 + + + + messageField + + + + 57 @@ -489,23 +538,6 @@ 25 - - - delegate - - - - 20 - - - - onMessageChange: - - - 18 - - 28 - view @@ -539,9 +571,7 @@ - - - + @@ -556,13 +586,6 @@ toolsView - - 8 - - - - tableView - 9 @@ -575,64 +598,40 @@ editButton - - 14 - - - - - - - - footerView - - - 15 - - - sendButton - - - 19 - - - messageField - - - 21 - - - fieldBackgroundImage - 29 tableController + + 47 + + + background + + + 49 + + + + + + + + chatView + 39 - - + + - + headerView - - 42 - - - avatarShadowBackground - - - 41 - - - avatarImage - 40 @@ -640,10 +639,58 @@ addressLabel - 47 - - - background + 41 + + + avatarImage + + + 42 + + + avatarShadowBackground + + + 8 + + + tableView + + + 14 + + + + + + + + + footerView + + + 21 + + + fieldBackgroundImage + + + 15 + + + sendButton + + + 55 + + + messageField + + + 19 + + + messageFieldOld @@ -667,6 +714,8 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -677,7 +726,7 @@ - 48 + 57 @@ -719,11 +768,12 @@ UILabel UIImageView + UIView UIToggleButton UIImageView UIView UIView - UITextField + UITextView UIButton ChatRoomTableViewController @@ -736,6 +786,10 @@ avatarImage UIImageView + + chatView + UIView + editButton UIToggleButton @@ -754,7 +808,7 @@ messageField - UITextField + UITextView sendButton @@ -791,17 +845,17 @@ {262, 214} {131, 131} - {320, 117} - {320, 117} - {320, 117} - {320, 117} + {320, 88} + {320, 88} + {320, 88} + {320, 88} {500, 117} - {320, 117} + {320, 88} {140, 117} {140, 117} {140, 117} {5, 117} - 1498 + 1181 diff --git a/Classes/ChatViewController.h b/Classes/ChatViewController.h index 17f56d4db..1ac291235 100644 --- a/Classes/ChatViewController.h +++ b/Classes/ChatViewController.h @@ -24,11 +24,12 @@ #import "ChatTableViewController.h" #import "UICompositeViewController.h" -@interface ChatViewController : UIViewController { +@interface ChatViewController : UIViewController { } @property (nonatomic, retain) IBOutlet ChatTableViewController* tableController; @property (nonatomic, retain) IBOutlet UIToggleButton *editButton; +@property (nonatomic, retain) IBOutlet UITextField *addressField; - (IBAction)onAddClick:(id) event; - (IBAction)onEditClick:(id) event; diff --git a/Classes/ChatViewController.m b/Classes/ChatViewController.m index 51c636024..190d9e5a8 100644 --- a/Classes/ChatViewController.m +++ b/Classes/ChatViewController.m @@ -25,6 +25,7 @@ @synthesize tableController; @synthesize editButton; +@synthesize addressField; #pragma mark - Lifecycle Functions @@ -103,14 +104,29 @@ static UICompositeViewDescription *compositeDescription = nil; #pragma mark - Action Functions - (IBAction)onAddClick:(id)event { - [ContactSelection setSelectionMode:ContactSelectionModeMessage]; - [ContactSelection setAddAddress:nil]; - [ContactSelection setSipFilter:TRUE]; - [[PhoneMainView instance] changeCurrentView:[ContactsViewController compositeViewDescription] push:TRUE]; + if ([[addressField text ]length] == 0) { // if no address is manually set, lauch address book + [ContactSelection setSelectionMode:ContactSelectionModeMessage]; + [ContactSelection setAddAddress:nil]; + [ContactSelection setSipFilter:TRUE]; + [[PhoneMainView instance] changeCurrentView:[ContactsViewController compositeViewDescription] push:TRUE]; + } else { + //Push ChatRoom + ChatRoomViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[ChatRoomViewController compositeViewDescription] push:TRUE], ChatRoomViewController); + if(controller != nil) { + [controller setRemoteAddress:[addressField text]]; + } + addressField.text = @""; + } } - (IBAction)onEditClick:(id)event { [tableController setEditing:![tableController isEditing] animated:TRUE]; } +#pragma mark - UITextFieldDelegate Functions + +- (BOOL)textFieldShouldReturn:(UITextField *)textField { + [addressField resignFirstResponder]; + return YES; +} @end diff --git a/Classes/ChatViewController.xib b/Classes/ChatViewController.xib index 456aea221..8a0d0d0e9 100644 --- a/Classes/ChatViewController.xib +++ b/Classes/ChatViewController.xib @@ -3,19 +3,21 @@ 1296 11E53 - 2549 + 2182 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1181 - IBProxyObject IBUIButton IBUIImageView - IBUITableView + IBProxyObject + IBUILabel + IBUITextField IBUITableViewController + IBUITableView IBUIView @@ -45,10 +47,10 @@ 290 - {320, 58} + {320, 44} - + _NS:9 NO IBCocoaTouchFramework @@ -60,10 +62,10 @@ 292 - {160, 58} + {{160, 0}, {160, 44}} - + _NS:9 NO @@ -98,10 +100,10 @@ 289 - {{160, 0}, {160, 58}} + {160, 44} - + _NS:9 NO @@ -128,7 +130,7 @@ - {320, 58} + {320, 44} @@ -145,10 +147,9 @@ 274 - {{0, 58}, {320, 402}} + {{0, 74}, {320, 378}} - _NS:9 1 @@ -172,6 +173,64 @@ 22 22 + + + 292 + {{24, 44}, {296, 30}} + + + + _NS:9 + NO + YES + IBCocoaTouchFramework + 0 + + + 3 + MAA + + + YES + 17 + + IBCocoaTouchFramework + + 1 + + 1 + 17 + + + Helvetica + 17 + 16 + + + + + 292 + {{0, 44}, {24, 30}} + + + + _NS:9 + NO + YES + 7 + NO + IBCocoaTouchFramework + To: + + 1 + MCAwIDAAA + + + 0 + 10 + + + {320, 460} @@ -222,6 +281,14 @@ 22 + + + addressField + + + + 27 + view @@ -264,6 +331,14 @@ 20 + + + delegate + + + + 28 + @@ -296,6 +371,8 @@ + + @@ -334,6 +411,17 @@ background + + 25 + + + address + + + 26 + + + @@ -344,6 +432,8 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin ChatTableViewController com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -357,7 +447,7 @@ - 23 + 28 @@ -387,10 +477,15 @@ + UITextField UIToggleButton ChatTableViewController + + addressField + UITextField + editButton UIToggleButton @@ -424,13 +519,13 @@ YES 3 - {320, 117} - {320, 117} - {320, 117} - {320, 117} - {320, 117} + {320, 88} + {320, 88} + {320, 88} + {320, 88} + {320, 88} {5, 117} - 1498 + 1181 diff --git a/Classes/ContactDetailsLabelViewController.xib b/Classes/ContactDetailsLabelViewController.xib index 337923bac..629bad47d 100644 --- a/Classes/ContactDetailsLabelViewController.xib +++ b/Classes/ContactDetailsLabelViewController.xib @@ -3,19 +3,19 @@ 1296 11E53 - 2549 + 2182 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1181 - IBProxyObject - IBUIButton - IBUIImageView IBUITableView + IBUIButton IBUIView + IBUIImageView + IBProxyObject com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -62,7 +62,7 @@ 290 - {320, 58} + {320, 44} @@ -77,7 +77,7 @@ 292 - {160, 58} + {160, 44} @@ -113,7 +113,7 @@ - {320, 58} + {320, 44} @@ -395,10 +395,10 @@ AAgACAAIAAEAAQABAAE 3 {640, 523} - {320, 117} - {320, 117} + {320, 88} + {320, 88} {5, 117} - 1498 + 1181 diff --git a/Classes/ContactDetailsViewController.xib b/Classes/ContactDetailsViewController.xib index 3e234fe1f..6bb560020 100644 --- a/Classes/ContactDetailsViewController.xib +++ b/Classes/ContactDetailsViewController.xib @@ -3,21 +3,21 @@ 1296 11E53 - 2549 + 2182 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1181 - IBProxyObject - IBUIButton - IBUIImageView - IBUITableView - IBUITableViewController IBUIView + IBUIImageView + IBProxyObject IBUIViewController + IBUITableViewController + IBUITableView + IBUIButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -46,7 +46,7 @@ 290 - {320, 58} + {320, 44} @@ -61,7 +61,7 @@ 292 - {160, 58} + {160, 44} @@ -99,7 +99,7 @@ -2147483356 - {160, 58} + {160, 44} @@ -127,7 +127,7 @@ 289 - {{160, 0}, {160, 58}} + {{160, 0}, {160, 44}} @@ -157,7 +157,7 @@ - {320, 58} + {320, 44} @@ -174,7 +174,7 @@ 306 - {{0, 59}, {320, 401}} + {{0, 44}, {320, 416}} @@ -735,15 +735,15 @@ AAgACAAIAAEAAQABAAE YES 3 - {320, 117} - {320, 117} - {320, 117} - {320, 117} - {320, 117} - {320, 117} + {320, 88} + {320, 88} + {320, 88} + {320, 88} + {320, 88} + {320, 88} {320, 117} {5, 117} - 1498 + 1181 diff --git a/Classes/ContactsViewController.xib b/Classes/ContactsViewController.xib index 33412ac1a..bc8e932eb 100644 --- a/Classes/ContactsViewController.xib +++ b/Classes/ContactsViewController.xib @@ -3,20 +3,20 @@ 1296 11E53 - 2549 + 2182 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1181 - IBProxyObject - IBUIButton IBUIImageView + IBUIButton IBUITableView - IBUITableViewController IBUIView + IBUITableViewController + IBProxyObject com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -45,7 +45,7 @@ 290 - {320, 58} + {320, 44} @@ -60,7 +60,7 @@ 289 - {{108, 0}, {106, 58}} + {{120, 0}, {80, 44}} @@ -99,7 +99,7 @@ 289 - {{214, 0}, {106, 58}} + {{200, 0}, {80, 44}} @@ -128,7 +128,7 @@ 292 - {108, 58} + {80, 44} @@ -156,7 +156,7 @@ -2147483356 - {108, 58} + {80, 44} @@ -182,7 +182,7 @@ - {320, 58} + {320, 44} @@ -199,7 +199,7 @@ 274 - {{0, 58}, {320, 402}} + {{0, 44}, {320, 416}} @@ -579,6 +579,6 @@ {213, 117} {5, 117} - 1498 + 1181 diff --git a/Classes/HistoryDetailsViewController.xib b/Classes/HistoryDetailsViewController.xib index 9b7dc34e8..781846385 100644 --- a/Classes/HistoryDetailsViewController.xib +++ b/Classes/HistoryDetailsViewController.xib @@ -3,19 +3,19 @@ 1296 11E53 - 2549 + 2182 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1181 - IBProxyObject IBUIButton IBUIImageView - IBUILabel IBUIView + IBUILabel + IBProxyObject com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -44,7 +44,7 @@ 290 - {320, 58} + {320, 44} @@ -59,7 +59,7 @@ 292 - {160, 58} + {160, 44} @@ -97,7 +97,7 @@ 289 - {{160, 0}, {160, 58}} + {{160, 0}, {160, 44}} @@ -227,7 +227,7 @@ - {{0, 58}, {320, 100}} + {{0, 44}, {320, 100}} @@ -417,6 +417,7 @@ {{33, 323}, {255, 50}} + _NS:9 NO IBCocoaTouchFramework @@ -894,12 +895,12 @@ {131, 131} {550, 101} {550, 101} - {320, 117} - {320, 117} - {320, 117} + {320, 88} + {320, 88} + {320, 88} {320, 117} {5, 117} - 1498 + 1181 diff --git a/Classes/HistoryTableViewController.h b/Classes/HistoryTableViewController.h index 6214a3b4f..ee6fe80c2 100644 --- a/Classes/HistoryTableViewController.h +++ b/Classes/HistoryTableViewController.h @@ -23,6 +23,7 @@ @private NSMutableArray *callLogs; } +- (void)loadData; @property (nonatomic, assign) BOOL missedFilter; diff --git a/Classes/HistoryViewController.h b/Classes/HistoryViewController.h index 5f21f6a0e..ad4cb89e3 100644 --- a/Classes/HistoryViewController.h +++ b/Classes/HistoryViewController.h @@ -32,9 +32,11 @@ @property (nonatomic, retain) IBOutlet UIButton* allButton; @property (nonatomic, retain) IBOutlet UIButton* missedButton; @property (nonatomic, retain) IBOutlet UIToggleButton* editButton; +@property (nonatomic, retain) IBOutlet UIButton* deleteButton; - (IBAction)onAllClick:(id) event; - (IBAction)onMissedClick:(id) event; - (IBAction)onEditClick:(id) event; +- (IBAction)onDeleteClick:(id) event; @end diff --git a/Classes/HistoryViewController.m b/Classes/HistoryViewController.m index bb37c1108..0883b41aa 100644 --- a/Classes/HistoryViewController.m +++ b/Classes/HistoryViewController.m @@ -27,6 +27,7 @@ @synthesize allButton; @synthesize missedButton; @synthesize editButton; +@synthesize deleteButton; typedef enum _HistoryView { History_All, @@ -48,6 +49,7 @@ typedef enum _HistoryView { [allButton release]; [missedButton release]; [editButton release]; + [deleteButton release]; [super dealloc]; } @@ -162,7 +164,14 @@ static UICompositeViewDescription *compositeDescription = nil; - (IBAction)onEditClick:(id) event { [tableController setEditing:![tableController isEditing] animated:TRUE]; + [deleteButton setHidden:![tableController isEditing]]; } +- (IBAction)onDeleteClick:(id) event { + linphone_core_clear_call_logs([LinphoneManager getLc]); + [tableController loadData]; + [editButton toggle]; + [self onEditClick:nil]; +} @end diff --git a/Classes/HistoryViewController.xib b/Classes/HistoryViewController.xib index 8761d07bb..e782748d0 100644 --- a/Classes/HistoryViewController.xib +++ b/Classes/HistoryViewController.xib @@ -3,20 +3,20 @@ 1296 11E53 - 2549 + 2182 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1498 + 1181 - IBProxyObject - IBUIButton IBUIImageView + IBUIButton IBUITableView - IBUITableViewController IBUIView + IBUITableViewController + IBProxyObject com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -45,10 +45,10 @@ 290 - {320, 58} + {320, 44} - + _NS:9 NO IBCocoaTouchFramework @@ -57,10 +57,45 @@ toolsbar_background.png + + + -2147483356 + {80, 44} + + + + _NS:9 + NO + IBCocoaTouchFramework + 0 + 0 + Del + + 3 + MQA + + + 1 + MCAwIDAAA + + + 3 + MC41AA + + + 2 + 15 + + + Helvetica-Bold + 15 + 16 + + 292 - {106, 58} + {{80, 0}, {80, 44}} @@ -73,10 +108,7 @@ 0 0 NO - - 3 - MC41AA - + NSImage history_all_selected.png @@ -86,20 +118,13 @@ NSImage history_all_default.png - - 2 - 15 - - - Helvetica-Bold - 15 - 16 - + + 292 - {{106, 0}, {106, 58}} + {{160, 0}, {80, 44}} @@ -123,12 +148,12 @@ history_missed_default.png - + 289 - {{212, 0}, {108, 58}} + {{240, 0}, {80, 44}} @@ -155,7 +180,7 @@ history_edit_default.png - + {320, 58} @@ -175,7 +200,7 @@ 274 - {{0, 58}, {320, 402}} + {{0, 44}, {320, 416}} @@ -276,6 +301,14 @@ 33 + + + deleteButton + + + + 36 + onAllClick: @@ -327,6 +360,15 @@ 25 + + + onDeleteClick: + + + 7 + + 37 + @@ -364,6 +406,7 @@ + toolsBar @@ -405,6 +448,11 @@ background + + 35 + + + @@ -418,6 +466,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -430,7 +479,7 @@ - 34 + 37 @@ -447,6 +496,7 @@ UIViewController id + id id id @@ -455,6 +505,10 @@ onAllClick: id + + onDeleteClick: + id + onEditClick: id @@ -466,6 +520,7 @@ UIButton + UIButton UIToggleButton UIButton HistoryTableViewController @@ -476,6 +531,10 @@ allButton UIButton + + deleteButton + UIButton + editButton UIToggleButton @@ -519,13 +578,13 @@ {213, 117} {213, 117} - {214, 117} - {214, 117} + {160, 88} + {160, 88} {213, 117} {213, 117} - {214, 117} + {160, 88} {5, 117} - 1498 + 1181 diff --git a/Classes/LinphoneUI/UISpeakerButton.m b/Classes/LinphoneUI/UISpeakerButton.m index 9151ddbd7..faeba9ad7 100644 --- a/Classes/LinphoneUI/UISpeakerButton.m +++ b/Classes/LinphoneUI/UISpeakerButton.m @@ -38,7 +38,21 @@ static void audioRouteChangeListenerCallback ( const void *inPropertyValue // 4 ) { if (inPropertyID != kAudioSessionProperty_AudioRouteChange) return; // 5 - [(UISpeakerButton*)inUserData update]; + UISpeakerButton* button=(UISpeakerButton*)inUserData; + UInt32 routeSize = sizeof (CFStringRef); + CFStringRef route; + AudioSessionGetProperty (kAudioSessionProperty_AudioRoute, + &routeSize, + &route); + + if (route && + button.selected && + !( [(NSString*)route isEqualToString: @"Speaker"] || [(NSString*)route isEqualToString: @"SpeakerAndMicrophone"])) { + [LinphoneLogger logc:LinphoneLoggerLog format:"Audio route change to [%s] rejected by speaker button", [(NSString*)route cStringUsingEncoding:[NSString defaultCStringEncoding]]]; + // reject change + [button onOn]; + } else + [(UISpeakerButton*)inUserData update]; } diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m index 8939bcc41..dbaba1d44 100644 --- a/Classes/SettingsViewController.m +++ b/Classes/SettingsViewController.m @@ -509,7 +509,7 @@ static UICompositeViewDescription *compositeDescription = nil; [hiddenKeys addObject:@"port_preference"]; } - if([[[[[LinphoneManager instance] settingsStore] objectForKey:@"stun_preference"] stringValue] length] == 0) { + if([[[[LinphoneManager instance] settingsStore] objectForKey:@"stun_preference"] length] == 0) { [hiddenKeys addObject:@"ice_preference"]; } diff --git a/Resources/chat_add_default.png b/Resources/chat_add_default.png index 053723d22..c179581e3 100644 Binary files a/Resources/chat_add_default.png and b/Resources/chat_add_default.png differ diff --git a/Resources/chat_add_over.png b/Resources/chat_add_over.png index 34ffdf83f..14cbb745c 100644 Binary files a/Resources/chat_add_over.png and b/Resources/chat_add_over.png differ diff --git a/Resources/chat_back_default.png b/Resources/chat_back_default.png index 3c90a7bb6..60412bd95 100644 Binary files a/Resources/chat_back_default.png and b/Resources/chat_back_default.png differ diff --git a/Resources/chat_back_over.png b/Resources/chat_back_over.png index ce56ede38..bbc3f4ee3 100644 Binary files a/Resources/chat_back_over.png and b/Resources/chat_back_over.png differ diff --git a/Resources/chat_edit_default.png b/Resources/chat_edit_default.png index 428ce5df8..10833f922 100644 Binary files a/Resources/chat_edit_default.png and b/Resources/chat_edit_default.png differ diff --git a/Resources/chat_edit_over.png b/Resources/chat_edit_over.png index 62c0a4c34..6ac8c31cb 100644 Binary files a/Resources/chat_edit_over.png and b/Resources/chat_edit_over.png differ diff --git a/Resources/chat_ok_default.png b/Resources/chat_ok_default.png index 0c49ac3d5..ae1980c38 100644 Binary files a/Resources/chat_ok_default.png and b/Resources/chat_ok_default.png differ diff --git a/Resources/chat_ok_over.png b/Resources/chat_ok_over.png index 4fe6248f8..514c9ca01 100644 Binary files a/Resources/chat_ok_over.png and b/Resources/chat_ok_over.png differ diff --git a/Resources/contact_back_default.png b/Resources/contact_back_default.png index 3c90a7bb6..331e5b494 100644 Binary files a/Resources/contact_back_default.png and b/Resources/contact_back_default.png differ diff --git a/Resources/contact_back_over.png b/Resources/contact_back_over.png index ce56ede38..4d8d8ca64 100644 Binary files a/Resources/contact_back_over.png and b/Resources/contact_back_over.png differ diff --git a/Resources/contact_cancel_default.png b/Resources/contact_cancel_default.png index 80809dc95..d6714b155 100644 Binary files a/Resources/contact_cancel_default.png and b/Resources/contact_cancel_default.png differ diff --git a/Resources/contact_cancel_over.png b/Resources/contact_cancel_over.png index d5bd87d17..256e9b0cd 100644 Binary files a/Resources/contact_cancel_over.png and b/Resources/contact_cancel_over.png differ diff --git a/Resources/contact_edit_default.png b/Resources/contact_edit_default.png index 428ce5df8..aa3289317 100644 Binary files a/Resources/contact_edit_default.png and b/Resources/contact_edit_default.png differ diff --git a/Resources/contact_edit_over.png b/Resources/contact_edit_over.png index 62c0a4c34..8cc680e16 100644 Binary files a/Resources/contact_edit_over.png and b/Resources/contact_edit_over.png differ diff --git a/Resources/contact_ok_default.png b/Resources/contact_ok_default.png index 0c49ac3d5..121961e6a 100644 Binary files a/Resources/contact_ok_default.png and b/Resources/contact_ok_default.png differ diff --git a/Resources/contact_ok_disabled.png b/Resources/contact_ok_disabled.png index cf466e1db..fa7e9fcb8 100644 Binary files a/Resources/contact_ok_disabled.png and b/Resources/contact_ok_disabled.png differ diff --git a/Resources/contacts_add_default.png b/Resources/contacts_add_default.png index e5ccfb54f..1126d63f0 100644 Binary files a/Resources/contacts_add_default.png and b/Resources/contacts_add_default.png differ diff --git a/Resources/contacts_add_over.png b/Resources/contacts_add_over.png index a858a1406..a20ead0f5 100644 Binary files a/Resources/contacts_add_over.png and b/Resources/contacts_add_over.png differ diff --git a/Resources/history_details_add_default.png b/Resources/history_details_add_default.png index 125c8f0f1..92924be3b 100644 Binary files a/Resources/history_details_add_default.png and b/Resources/history_details_add_default.png differ diff --git a/Resources/history_details_add_over.png b/Resources/history_details_add_over.png index fdb40bbf5..9363e5ba1 100644 Binary files a/Resources/history_details_add_over.png and b/Resources/history_details_add_over.png differ diff --git a/Resources/history_details_back_default.png b/Resources/history_details_back_default.png index 3c90a7bb6..932043c49 100644 Binary files a/Resources/history_details_back_default.png and b/Resources/history_details_back_default.png differ diff --git a/Resources/history_details_back_over.png b/Resources/history_details_back_over.png index ce56ede38..6c9f1a5fa 100644 Binary files a/Resources/history_details_back_over.png and b/Resources/history_details_back_over.png differ diff --git a/Resources/history_edit_default.png b/Resources/history_edit_default.png index da43affc2..05e18afdb 100644 Binary files a/Resources/history_edit_default.png and b/Resources/history_edit_default.png differ diff --git a/Resources/history_edit_over.png b/Resources/history_edit_over.png index 032bc901d..d1c7d156b 100644 Binary files a/Resources/history_edit_over.png and b/Resources/history_edit_over.png differ diff --git a/Resources/history_ok_default.png b/Resources/history_ok_default.png index 7fb188033..6b6f4e80f 100644 Binary files a/Resources/history_ok_default.png and b/Resources/history_ok_default.png differ diff --git a/Resources/history_ok_over.png b/Resources/history_ok_over.png index 51411d7db..deebf0507 100644 Binary files a/Resources/history_ok_over.png and b/Resources/history_ok_over.png differ diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index b8316ada6..5d3d11f8a 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -33,6 +33,8 @@ 22276E8913C73DC000210156 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8813C73DC000210156 /* CoreMedia.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 223148E41178A08200637D6A /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 223148E31178A08200637D6A /* libilbc.a */; }; 223148E61178A09900637D6A /* libmsilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 223148E51178A09900637D6A /* libmsilbc.a */; }; + 2234C8CA15ED049A00E18E83 /* DialerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2234C8C715ED049A00E18E83 /* DialerViewController.xib */; }; + 2234C8CB15ED049A00E18E83 /* DialerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2234C8C715ED049A00E18E83 /* DialerViewController.xib */; }; 2237D4091084D7A9001383EE /* ring.wav in Resources */ = {isa = PBXBuildFile; fileRef = 2237D4081084D7A9001383EE /* ring.wav */; }; 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, ); }; }; @@ -114,7 +116,6 @@ 22E5B0AF133B5EA20044EA25 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5B0AD133B5EA20044EA25 /* libssl.a */; }; 22E5B0B0133B5EA20044EA25 /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E5B0AE133B5EA20044EA25 /* libcrypto.a */; }; 22F2508E107141E100AC9B3F /* DialerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22F2508C107141E100AC9B3F /* DialerViewController.m */; }; - 22F2508F107141E100AC9B3F /* DialerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22F2508D107141E100AC9B3F /* DialerViewController.xib */; }; 22F254811073D99800AC9B3F /* ringback.wav in Resources */ = {isa = PBXBuildFile; fileRef = 22F254801073D99800AC9B3F /* ringback.wav */; }; 288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; }; 340751971506459A00B89C47 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 340751961506459A00B89C47 /* CoreTelephony.framework */; }; @@ -608,7 +609,6 @@ D34BD73F15C13DF40070C209 /* UIStateBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = D35498201587716B000081D8 /* UIStateBar.xib */; }; D34BD74015C13E110070C209 /* InAppSettings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D34F6F9D1594D3FB0095705B /* InAppSettings.bundle */; }; D34BD74115C13E250070C209 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2214783B1386A2030020F8B8 /* Localizable.strings */; }; - D34BD74315C13ED70070C209 /* DialerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22F2508D107141E100AC9B3F /* DialerViewController.xib */; }; D34F6F9E1594D3FB0095705B /* InAppSettings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D34F6F9D1594D3FB0095705B /* InAppSettings.bundle */; }; D350F20E15A43BB100149E54 /* WizardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D350F20C15A43BB100149E54 /* WizardViewController.m */; }; D350F20F15A43BB100149E54 /* WizardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D350F20C15A43BB100149E54 /* WizardViewController.m */; }; @@ -1339,6 +1339,7 @@ 22276E8813C73DC000210156 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; 223148E31178A08200637D6A /* libilbc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libilbc.a; path = "liblinphone-sdk/apple-darwin/lib/libilbc.a"; sourceTree = ""; }; 223148E51178A09900637D6A /* libmsilbc.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmsilbc.a; path = "liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmsilbc.a"; sourceTree = ""; }; + 2234C8C715ED049A00E18E83 /* DialerViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DialerViewController.xib; sourceTree = ""; }; 2237D4081084D7A9001383EE /* ring.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = ring.wav; path = Resources/ring.wav; sourceTree = ""; }; 2242E312125235120061DDCE /* ring.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = ring.caf; path = Resources/ring.caf; sourceTree = ""; }; 224567C1107B968500F10948 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; @@ -1456,7 +1457,6 @@ 22E5B0AE133B5EA20044EA25 /* libcrypto.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcrypto.a; path = "liblinphone-sdk/apple-darwin/lib/libcrypto.a"; sourceTree = ""; }; 22F2508B107141E100AC9B3F /* DialerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DialerViewController.h; sourceTree = ""; }; 22F2508C107141E100AC9B3F /* DialerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = DialerViewController.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; - 22F2508D107141E100AC9B3F /* DialerViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DialerViewController.xib; sourceTree = ""; }; 22F254801073D99800AC9B3F /* ringback.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = ringback.wav; path = Resources/ringback.wav; sourceTree = ""; }; 288765FC0DF74451002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; @@ -2145,6 +2145,7 @@ 080E96DDFE201D6D7F000001 /* Classes */ = { isa = PBXGroup; children = ( + 2234C8C715ED049A00E18E83 /* DialerViewController.xib */, 340751E4150E4D0200B89C47 /* CallDelegate.h */, 2211DBBB14769C8200DEE054 /* CallDelegate.m */, D32B6E2715A5BC430033019F /* ChatRoomTableViewController.h */, @@ -2178,7 +2179,6 @@ D35497FD15875372000081D8 /* ContactsViewController.xib */, 22F2508B107141E100AC9B3F /* DialerViewController.h */, 22F2508C107141E100AC9B3F /* DialerViewController.m */, - 22F2508D107141E100AC9B3F /* DialerViewController.xib */, D3A74F6015C6B03B001500B9 /* DialerViewController~ipad.xib */, 2218A92212FBE1340088A667 /* FirstLoginViewController.h */, 2218A92312FBE1340088A667 /* FirstLoginViewController.m */, @@ -3285,6 +3285,7 @@ French, German, en, + fr, ); mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; projectDirPath = ""; @@ -3329,7 +3330,6 @@ buildActionMask = 2147483647; files = ( 2274550810700509006EC466 /* linphonerc-factory in Resources */, - 22F2508F107141E100AC9B3F /* DialerViewController.xib in Resources */, 22F254811073D99800AC9B3F /* ringback.wav in Resources */, 2237D4091084D7A9001383EE /* ring.wav in Resources */, 22E0A823111C44E100B04932 /* ConsoleViewController.xib in Resources */, @@ -3764,6 +3764,7 @@ D3804E6215D92A57008072A5 /* msg.wav in Resources */, D321FF9615E628BB0098B5F4 /* linphonrc in Resources */, D321FF9915E628CB0098B5F4 /* linphonerc~ipad in Resources */, + 2234C8CA15ED049A00E18E83 /* DialerViewController.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4064,7 +4065,6 @@ D34BD72215C13DB70070C209 /* video_on_over_landscape.png in Resources */, D34BD74015C13E110070C209 /* InAppSettings.bundle in Resources */, D34BD74115C13E250070C209 /* Localizable.strings in Resources */, - D34BD74315C13ED70070C209 /* DialerViewController.xib in Resources */, D3A74E5A15C68162001500B9 /* toolsbar_background.png in Resources */, D3A74E5D15C6922A001500B9 /* UIMainBar~ipad.xib in Resources */, D3A74EB315C69392001500B9 /* add_call_default~ipad.png in Resources */, @@ -4207,6 +4207,7 @@ D3804E6315D92A57008072A5 /* msg.wav in Resources */, D321FF9715E628BB0098B5F4 /* linphonrc in Resources */, D321FF9A15E628CB0098B5F4 /* linphonerc~ipad in Resources */, + 2234C8CB15ED049A00E18E83 /* DialerViewController.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/submodules/liblinphone.xcodeproj/project.pbxproj b/submodules/liblinphone.xcodeproj/project.pbxproj index 60ac546ec..ecdbd5f6a 100644 --- a/submodules/liblinphone.xcodeproj/project.pbxproj +++ b/submodules/liblinphone.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 2203127213A247B50049A2ED /* iosdisplay.h in Headers */ = {isa = PBXBuildFile; fileRef = 2203127013A247B40049A2ED /* iosdisplay.h */; }; 220ED19A13A8F87700AC21E0 /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED19713A8F87700AC21E0 /* libspeexdsp.a */; }; 220ED19B13A8F87700AC21E0 /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED19813A8F87700AC21E0 /* libspeex.a */; }; 220ED19C13A8F87700AC21E0 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220ED19913A8F87700AC21E0 /* libortp.a */; }; @@ -190,7 +189,6 @@ 225D64741521BFA6008B2E81 /* toast.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5411F84E2D00373793 /* toast.h */; }; 225D64751521BFA6008B2E81 /* unproto.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5511F84E2D00373793 /* unproto.h */; }; 225D64761521BFA6008B2E81 /* linphonecore_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 229B9D5813043EAB00EFCD1C /* linphonecore_utils.h */; }; - 225D64771521BFA6008B2E81 /* iosdisplay.h in Headers */ = {isa = PBXBuildFile; fileRef = 2203127013A247B40049A2ED /* iosdisplay.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 */; }; @@ -339,7 +337,6 @@ 225D65411521C009008B2E81 /* toast.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5411F84E2D00373793 /* toast.h */; }; 225D65421521C009008B2E81 /* unproto.h in Headers */ = {isa = PBXBuildFile; fileRef = 22A10B5511F84E2D00373793 /* unproto.h */; }; 225D65431521C009008B2E81 /* linphonecore_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 229B9D5813043EAB00EFCD1C /* linphonecore_utils.h */; }; - 225D65441521C009008B2E81 /* iosdisplay.h in Headers */ = {isa = PBXBuildFile; fileRef = 2203127013A247B40049A2ED /* iosdisplay.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 */; }; @@ -445,7 +442,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 2203127013A247B40049A2ED /* iosdisplay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iosdisplay.h; sourceTree = ""; }; 2203127113A247B40049A2ED /* iosdisplay.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = iosdisplay.m; sourceTree = ""; }; 2203127413A249F70049A2ED /* filter-template.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "filter-template.c"; sourceTree = ""; }; 220ED19713A8F87700AC21E0 /* libspeexdsp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libspeexdsp.a; path = "../liblinphone-sdk/apple-darwin/lib/libspeexdsp.a"; sourceTree = ""; }; @@ -1002,7 +998,6 @@ 222CA62311F6CF7600621220 /* ulaw.c */, 222CA62411F6CF7600621220 /* vfw-missing.h */, 222CA62911F6CF7600621220 /* void.c */, - 2203127013A247B40049A2ED /* iosdisplay.h */, 2203127113A247B40049A2ED /* iosdisplay.m */, 2203127413A249F70049A2ED /* filter-template.c */, 221F58E313AF44B300D603C9 /* scaler.h */, @@ -1284,7 +1279,6 @@ 225D64741521BFA6008B2E81 /* toast.h in Headers */, 225D64751521BFA6008B2E81 /* unproto.h in Headers */, 225D64761521BFA6008B2E81 /* linphonecore_utils.h in Headers */, - 225D64771521BFA6008B2E81 /* iosdisplay.h in Headers */, 225D64781521BFA6008B2E81 /* nowebcam.h in Headers */, 225D64791521BFA6008B2E81 /* swscale.h in Headers */, 225D647A1521BFA6008B2E81 /* alldescs.h in Headers */, @@ -1371,7 +1365,6 @@ 225D65411521C009008B2E81 /* toast.h in Headers */, 225D65421521C009008B2E81 /* unproto.h in Headers */, 225D65431521C009008B2E81 /* linphonecore_utils.h in Headers */, - 225D65441521C009008B2E81 /* iosdisplay.h in Headers */, 225D65451521C009008B2E81 /* nowebcam.h in Headers */, 225D65461521C009008B2E81 /* swscale.h in Headers */, 225D65471521C009008B2E81 /* alldescs.h in Headers */, @@ -1458,7 +1451,6 @@ 22A10B5A11F84E2D00373793 /* toast.h in Headers */, 22A10B5B11F84E2D00373793 /* unproto.h in Headers */, 229B9D5913043EAB00EFCD1C /* linphonecore_utils.h in Headers */, - 2203127213A247B50049A2ED /* iosdisplay.h in Headers */, 220ED1AC13A9062600AC21E0 /* nowebcam.h in Headers */, 2258C44113A9377B0087A596 /* swscale.h in Headers */, 221F58A413AB708C00D603C9 /* alldescs.h in Headers */, @@ -2189,6 +2181,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = liblinphone_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = ( + IPV6_PKTINFO, "_BYTE_ORDER=_LITTLE_ENDIAN", ORTP_INET6, ENABLE_TRACE, @@ -2248,6 +2241,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = liblinphone_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = ( + IPV6_PKTINFO, "_BYTE_ORDER=_LITTLE_ENDIAN", ORTP_INET6, ENABLE_TRACE, @@ -2307,6 +2301,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = liblinphone_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = ( + IPV6_PKTINFO, "_BYTE_ORDER=_LITTLE_ENDIAN", ORTP_INET6, ENABLE_TRACE,