diff --git a/Classes/Base.lproj/AboutView.xib b/Classes/Base.lproj/AboutView.xib index a7ff8a208..fb55c389c 100644 --- a/Classes/Base.lproj/AboutView.xib +++ b/Classes/Base.lproj/AboutView.xib @@ -109,9 +109,37 @@ - + + @@ -119,7 +147,7 @@ - + @@ -168,15 +196,8 @@ - - + - + @@ -263,6 +284,6 @@ - + diff --git a/Classes/Base.lproj/ChatConversationCreateView.xib b/Classes/Base.lproj/ChatConversationCreateView.xib index 2c5d7dbc7..2b6129977 100644 --- a/Classes/Base.lproj/ChatConversationCreateView.xib +++ b/Classes/Base.lproj/ChatConversationCreateView.xib @@ -1,17 +1,18 @@ - + - + + @@ -183,9 +184,9 @@ - + - + diff --git a/Classes/ChatConversationCreateView.h b/Classes/ChatConversationCreateView.h index 0a3c8662a..1557650e2 100644 --- a/Classes/ChatConversationCreateView.h +++ b/Classes/ChatConversationCreateView.h @@ -19,6 +19,7 @@ @property(strong, nonatomic) IBOutlet ChatConversationCreateTableView *tableController; @property(strong, nonatomic) IBOutlet ChatConversationCreateCollectionViewController *collectionController; @property (weak, nonatomic) IBOutlet UICollectionView *collectionView; +@property (weak, nonatomic) IBOutlet UIIconButton *backButton; @property (weak, nonatomic) IBOutlet UIIconButton *nextButton; @property (weak, nonatomic) IBOutlet UIIconButton *allButton; @property (weak, nonatomic) IBOutlet UIIconButton *linphoneButton; diff --git a/Classes/ChatConversationCreateView.m b/Classes/ChatConversationCreateView.m index 86c155eff..27f2929fa 100644 --- a/Classes/ChatConversationCreateView.m +++ b/Classes/ChatConversationCreateView.m @@ -55,6 +55,7 @@ static UICompositeViewDescription *compositeDescription = nil; - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; _waitView.hidden = YES; + _backButton.hidden = IPAD; if(_tableController.contactsGroup.count == 0) { if (!_isForEditing) _nextButton.enabled = FALSE; diff --git a/Classes/ChatConversationImdnView.m b/Classes/ChatConversationImdnView.m index ef40eaa4b..9ce5f031b 100644 --- a/Classes/ChatConversationImdnView.m +++ b/Classes/ChatConversationImdnView.m @@ -54,17 +54,9 @@ static UICompositeViewDescription *compositeDescription = nil; _msgBackgroundColorImage.image = _msgBottomBar.image = [UIImage imageNamed:(outgoing ? @"color_A.png" : @"color_D.png")]; _msgDateLabel.textColor = [UIColor colorWithPatternImage:_msgBackgroundColorImage.image]; - [_msgView setFrame:CGRectMake(_msgView.frame.origin.x, - _msgView.frame.origin.y, - _msgView.frame.size.width, - [UIChatBubbleTextCell ViewHeightForMessage:_msg withWidth:self.view.frame.size.width].height)]; _tableView.delegate = self; _tableView.dataSource = self; - [_tableView setFrame:CGRectMake(_tableView.frame.origin.x, - _msgView.frame.origin.y + _msgView.frame.size.height + 10, - _tableView.frame.size.width, - self.view.frame.size.height - (_msgView.frame.origin.y + _msgView.frame.size.height))]; _displayedList = linphone_chat_message_get_participants_by_imdn_state(_msg, LinphoneChatMessageStateDisplayed); _receivedList = linphone_chat_message_get_participants_by_imdn_state(_msg, LinphoneChatMessageStateDeliveredToUser); @@ -74,6 +66,25 @@ static UICompositeViewDescription *compositeDescription = nil; [_tableView reloadData]; } +- (void)fitContent { + BOOL outgoing = linphone_chat_message_is_outgoing(_msg); + _msgBackgroundColorImage.image = _msgBottomBar.image = [UIImage imageNamed:(outgoing ? @"color_A.png" : @"color_D.png")]; + _msgDateLabel.textColor = [UIColor colorWithPatternImage:_msgBackgroundColorImage.image]; + [_msgView setFrame:CGRectMake(_msgView.frame.origin.x, + _msgView.frame.origin.y, + _msgView.frame.size.width, + [UIChatBubbleTextCell ViewHeightForMessage:_msg withWidth:self.view.frame.size.width].height)]; + + [_tableView setFrame:CGRectMake(_tableView.frame.origin.x, + _msgView.frame.origin.y + _msgView.frame.size.height + 10, + _tableView.frame.size.width, + self.view.frame.size.height - (_msgView.frame.origin.y + _msgView.frame.size.height))]; +} + +- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation { + [self fitContent]; +} + #pragma mark - TableView - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { diff --git a/Classes/ChatConversationTableView.m b/Classes/ChatConversationTableView.m index a703698f7..477546bb1 100644 --- a/Classes/ChatConversationTableView.m +++ b/Classes/ChatConversationTableView.m @@ -139,11 +139,8 @@ index = (int)count - 1; if ([UIApplication sharedApplication].applicationState == UIApplicationStateActive) { - linphone_chat_room_mark_as_read(_chatRoom); + [ChatConversationView markAsRead:_chatRoom]; } - TabBarView *tab = (TabBarView *)[PhoneMainView.instance.mainViewController - getCachedController:NSStringFromClass(TabBarView.class)]; - [tab update:YES]; // Scroll to unread if (index < 0) diff --git a/Classes/ChatConversationView.h b/Classes/ChatConversationView.h index 8889246d8..71b50bd43 100644 --- a/Classes/ChatConversationView.h +++ b/Classes/ChatConversationView.h @@ -36,7 +36,6 @@ OrderedDictionary *imageQualities; BOOL scrollOnGrowingEnabled; BOOL composingVisible; - BOOL isAppearing; } @property(nonatomic) LinphoneChatRoom *chatRoom; @@ -60,6 +59,8 @@ @property (weak, nonatomic) IBOutlet UIIconButton *infoButton; @property (weak, nonatomic) IBOutlet UILabel *particpantsLabel; ++ (void)markAsRead:(LinphoneChatRoom *)chatRoom; + - (void)configureForRoom:(BOOL)editing; - (IBAction)onBackClick:(id)event; - (IBAction)onEditClick:(id)event; @@ -70,7 +71,6 @@ - (IBAction)onCallClick:(id)sender; - (IBAction)onDeleteClick:(id)sender; - (IBAction)onEditionChangeClick:(id)sender; -- (void)markAsRead; - (void)update; @end diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m index 6cac282fa..a0b2f463b 100644 --- a/Classes/ChatConversationView.m +++ b/Classes/ChatConversationView.m @@ -38,7 +38,6 @@ [NSNumber numberWithFloat:0.5], NSLocalizedString(@"Average", nil), [NSNumber numberWithFloat:0.0], NSLocalizedString(@"Minimum", nil), nil]; composingVisible = false; - isAppearing = false; } return self; } @@ -68,6 +67,19 @@ static UICompositeViewDescription *compositeDescription = nil; return self.class.compositeViewDescription; } + ++ (void)markAsRead:(LinphoneChatRoom *)chatRoom { + if (!chatRoom) + return; + + linphone_chat_room_mark_as_read(chatRoom); + if (IPAD) { + ChatsListView *listView = VIEW(ChatsListView); + [listView.tableController markCellAsRead:chatRoom]; + } + [PhoneMainView.instance updateApplicationBadgeNumber]; +} + #pragma mark - ViewController Functions - (void)viewDidLoad { @@ -110,8 +122,6 @@ static UICompositeViewDescription *compositeDescription = nil; selector:@selector(callUpdateEvent:) name:kLinphoneCallUpdate object:nil]; - [self configureForRoom:false]; - isAppearing = true; } - (void)viewWillDisappear:(BOOL)animated { @@ -128,15 +138,12 @@ static UICompositeViewDescription *compositeDescription = nil; [NSNotificationCenter.defaultCenter removeObserver:self]; PhoneMainView.instance.currentRoom = NULL; - isAppearing = FALSE; } - (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation { [super didRotateFromInterfaceOrientation:fromInterfaceOrientation]; composingVisible = !composingVisible; [self setComposingVisible:!composingVisible withDelay:0]; - if (!isAppearing) - return; //no need to do all that stuff if the view isn't yet appeared. // force offset recomputing [_messageField refreshHeight]; @@ -163,7 +170,8 @@ static UICompositeViewDescription *compositeDescription = nil; linphone_chat_room_cbs_set_chat_message_received(_chatRoomCbs, on_chat_room_chat_message_received); linphone_chat_room_cbs_set_chat_message_sent(_chatRoomCbs, on_chat_room_chat_message_sent); linphone_chat_room_cbs_set_is_composing_received(_chatRoomCbs, on_chat_room_is_composing_received); - linphone_chat_room_cbs_set_all_information_received(_chatRoomCbs, on_chat_room_all_information_received); + linphone_chat_room_cbs_set_conference_joined(_chatRoomCbs, on_chat_room_conference_joined); + linphone_chat_room_cbs_set_conference_left(_chatRoomCbs, on_chat_room_conference_left); linphone_chat_room_cbs_set_user_data(_chatRoomCbs, (__bridge void*)self); linphone_chat_room_add_callbacks(_chatRoom, _chatRoomCbs); } @@ -197,17 +205,11 @@ static UICompositeViewDescription *compositeDescription = nil; _chatView.hidden = NO; [self update]; - linphone_chat_room_mark_as_read(_chatRoom); - [PhoneMainView.instance updateApplicationBadgeNumber]; } - (void)applicationWillEnterForeground:(NSNotification *)notif { if (_chatRoom != nil) { - linphone_chat_room_mark_as_read(_chatRoom); - TabBarView *tab = (TabBarView *)[PhoneMainView.instance.mainViewController - getCachedController:NSStringFromClass(TabBarView.class)]; - [tab update:YES]; - [PhoneMainView.instance updateApplicationBadgeNumber]; + [ChatConversationView markAsRead:_chatRoom]; } } @@ -215,14 +217,6 @@ static UICompositeViewDescription *compositeDescription = nil; [_backToCallButton update]; } -- (void)markAsRead { - linphone_chat_room_mark_as_read(_chatRoom); - if (IPAD) { - ChatsListView *listView = VIEW(ChatsListView); - [listView.tableController markCellAsRead:_chatRoom]; - } -} - - (void)update { if (_chatRoom == NULL) { LOGW(@"Cannot update chat room header: null contact"); @@ -759,9 +753,6 @@ void on_chat_room_chat_message_received(LinphoneChatRoom *cr, const LinphoneEven return; [view.tableController addEventEntry:(LinphoneEventLog *)event_log]; - if ([UIApplication sharedApplication].applicationState == UIApplicationStateActive) - linphone_chat_room_mark_as_read(view.chatRoom); - [NSNotificationCenter.defaultCenter postNotificationName:kLinphoneMessageReceived object:view]; [view.tableController scrollToLastUnread:TRUE]; } @@ -770,6 +761,9 @@ void on_chat_room_chat_message_sent(LinphoneChatRoom *cr, const LinphoneEventLog ChatConversationView *view = (__bridge ChatConversationView *)linphone_chat_room_cbs_get_user_data(linphone_chat_room_get_current_callbacks(cr)); [view.tableController addEventEntry:(LinphoneEventLog *)event_log]; [view.tableController scrollToBottom:true]; + + if (IPAD) + [NSNotificationCenter.defaultCenter postNotificationName:kLinphoneMessageReceived object:view]; } void on_chat_room_is_composing_received(LinphoneChatRoom *cr, const LinphoneAddress *remoteAddr, bool_t isComposing) { @@ -778,9 +772,16 @@ void on_chat_room_is_composing_received(LinphoneChatRoom *cr, const LinphoneAddr [view setComposingVisible:composing withDelay:0.3]; } -void on_chat_room_all_information_received(LinphoneChatRoom *cr) { +void on_chat_room_conference_joined(LinphoneChatRoom *cr, const LinphoneEventLog *event_log) { ChatConversationView *view = (__bridge ChatConversationView *)linphone_chat_room_cbs_get_user_data(linphone_chat_room_get_current_callbacks(cr)); [view configureForRoom:false]; + [view.tableController scrollToBottom:true]; +} + +void on_chat_room_conference_left(LinphoneChatRoom *cr, const LinphoneEventLog *event_log) { + ChatConversationView *view = (__bridge ChatConversationView *)linphone_chat_room_cbs_get_user_data(linphone_chat_room_get_current_callbacks(cr)); + [view.tableController addEventEntry:(LinphoneEventLog *)event_log]; + [view.tableController scrollToBottom:true]; } @end diff --git a/Classes/LaunchScreen.xib b/Classes/LaunchScreen.xib index 9cbe0e096..5f5e78517 100644 --- a/Classes/LaunchScreen.xib +++ b/Classes/LaunchScreen.xib @@ -25,9 +25,37 @@ - + + @@ -44,6 +72,6 @@ - + diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index c2f2db77e..c7a50ee38 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -623,10 +623,7 @@ didInvalidatePushTokenForType:(NSString *)type { LinphoneAddress *local = linphone_address_new(local_address.UTF8String); LinphoneChatRoom *room = linphone_core_find_chat_room(LC, peer, local); if (room) { - linphone_chat_room_mark_as_read(room); - TabBarView *tab = (TabBarView *)[PhoneMainView.instance.mainViewController getCachedController:NSStringFromClass(TabBarView.class)]; - [tab update:YES]; - [PhoneMainView.instance updateApplicationBadgeNumber]; + [ChatConversationView markAsRead:room]; } linphone_address_unref(peer); linphone_address_unref(local); @@ -783,14 +780,9 @@ didInvalidatePushTokenForType:(NSString *)type { LinphoneAddress *peer = linphone_address_new(peer_address.UTF8String); LinphoneAddress *local = linphone_address_new(local_address.UTF8String); LinphoneChatRoom *room = linphone_core_find_chat_room(LC, peer, local); - if (room) { - if ([UIApplication sharedApplication].applicationState == UIApplicationStateActive) - linphone_chat_room_mark_as_read(room); - TabBarView *tab = (TabBarView *)[PhoneMainView.instance.mainViewController - getCachedController:NSStringFromClass(TabBarView.class)]; - [tab update:YES]; - [PhoneMainView.instance updateApplicationBadgeNumber]; - } + if (room && [UIApplication sharedApplication].applicationState == UIApplicationStateActive) + [ChatConversationView markAsRead:room]; + linphone_address_unref(peer); linphone_address_unref(local); } diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 9b654a9b8..417eb8fc7 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -2257,8 +2257,7 @@ static int comp_call_state_paused(const LinphoneCall *call, const void *param) { if ([self lpConfigBoolForKey:@"publish_presence"]) { // set present to "tv", because "available" does not work yet if (enabled) { - linphone_core_set_presence_model( - LC, linphone_core_create_presence_model_with_activity(LC, LinphonePresenceActivityTV, NULL)); + linphone_core_set_presence_model(LC, linphone_core_create_presence_model_with_activity(LC, LinphonePresenceActivityTV, NULL)); } const MSList *proxies = linphone_core_get_proxy_config_list(LC); @@ -2275,13 +2274,14 @@ static int comp_call_state_paused(const LinphoneCall *call, const void *param) { const MSList *lists = linphone_core_get_friends_lists(LC); while (lists) { - linphone_friend_list_enable_subscriptions( - lists->data, enabled && [LinphoneManager.instance lpConfigBoolForKey:@"use_rls_presence"]); + linphone_friend_list_enable_subscriptions(lists->data, enabled && [LinphoneManager.instance lpConfigBoolForKey:@"use_rls_presence"]); lists = lists->next; } } - (BOOL)enterBackgroundMode { + linphone_core_enter_background(LC); + LinphoneProxyConfig *proxyCfg = linphone_core_get_default_proxy_config(theLinphoneCore); BOOL shouldEnterBgMode = FALSE; @@ -2311,11 +2311,10 @@ static int comp_call_state_paused(const LinphoneCall *call, const void *param) { && bctbx_list_find_custom(callList, (bctbx_compare_func)comp_call_state_paused, NULL)) { [self startCallPausedLongRunningTask]; } - if (callList) { - /*if at least one call exist, enter normal bg mode */ + if (callList) // If at least one call exist, enter normal bg mode shouldEnterBgMode = TRUE; - } - /*stop the video preview*/ + + // Stop the video preview if (theLinphoneCore) { linphone_core_enable_video_preview(theLinphoneCore, FALSE); [self iterate]; @@ -2323,24 +2322,24 @@ static int comp_call_state_paused(const LinphoneCall *call, const void *param) { linphone_core_stop_dtmf_stream(theLinphoneCore); LOGI(@"Entering [%s] bg mode", shouldEnterBgMode ? "normal" : "lite"); - if (!shouldEnterBgMode && floor(NSFoundationVersionNumber) <= NSFoundationVersionNumber_iOS_9_x_Max) { const char *refkey = proxyCfg ? linphone_proxy_config_get_ref_key(proxyCfg) : NULL; BOOL pushNotifEnabled = (refkey && strcmp(refkey, "push_notification") == 0); if (pushNotifEnabled) { LOGI(@"Keeping lc core to handle push"); - /*destroy voip socket if any and reset connectivity mode*/ + // Destroy voip socket if any and reset connectivity mode connectivity = none; linphone_core_set_network_reachable(theLinphoneCore, FALSE); return YES; } return NO; - - } else - return YES; + } + return YES; } - (void)becomeActive { + linphone_core_enter_foreground(LC); + // enable presence if (floor(NSFoundationVersionNumber) <= NSFoundationVersionNumber_iOS_9_x_Max || self.connectivity == none) { [self refreshRegisters]; @@ -2561,10 +2560,7 @@ static int comp_call_state_paused(const LinphoneCall *call, const void *param) { if (linphone_core_lime_enabled(LC) == LinphoneLimeMandatory && !linphone_chat_room_lime_available(room)) [LinphoneManager.instance alertLIME:room]; - linphone_chat_room_mark_as_read(room); - TabBarView *tab = (TabBarView *)[PhoneMainView.instance.mainViewController getCachedController:NSStringFromClass(TabBarView.class)]; - [tab update:YES]; - [PhoneMainView.instance updateApplicationBadgeNumber]; + [ChatConversationView markAsRead:room]; } - (void)call:(const LinphoneAddress *)iaddr { diff --git a/Classes/LinphoneUI/UIChatBubbleTextCell.m b/Classes/LinphoneUI/UIChatBubbleTextCell.m index 213abcaad..5e7279984 100644 --- a/Classes/LinphoneUI/UIChatBubbleTextCell.m +++ b/Classes/LinphoneUI/UIChatBubbleTextCell.m @@ -166,15 +166,7 @@ [_statusInProgressSpinner stopAnimating]; } - if (outgoing) { - [_messageText setAccessibilityLabel:@"Outgoing message"]; - } else { - [_messageText setAccessibilityLabel:@"Incoming message"]; - if ([UIApplication sharedApplication].applicationState == UIApplicationStateActive) { - VIEW(ChatConversationView).markAsRead; - } - } - + [_messageText setAccessibilityLabel:outgoing ? @"Outgoing message" : @"Incoming message"]; if (outgoing && (state == LinphoneChatMessageStateDeliveredToUser || state == LinphoneChatMessageStateDisplayed || state == LinphoneChatMessageStateNotDelivered || state == LinphoneChatMessageStateFileTransferError)) { diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index 761eeab14..7dc589f07 100644 --- a/Classes/PhoneMainView.m +++ b/Classes/PhoneMainView.m @@ -551,6 +551,8 @@ static RootViewManager *rootViewManagerInstance = nil; count += [LinphoneManager unreadMessageCount]; count += linphone_core_get_calls_nb(LC); [[UIApplication sharedApplication] setApplicationIconBadgeNumber:count]; + TabBarView *view = (TabBarView *)[PhoneMainView.instance.mainViewController getCachedController:NSStringFromClass(TabBarView.class)]; + [view update:TRUE]; } + (CATransition *)getBackwardTransition { @@ -920,13 +922,13 @@ static RootViewManager *rootViewManagerInstance = nil; if (view.chatRoom && view.chatRoomCbs) linphone_chat_room_remove_callbacks(view.chatRoom, view.chatRoomCbs); - if (PhoneMainView.instance.currentView == view.compositeViewDescription) - [PhoneMainView.instance popCurrentView]; - view.chatRoomCbs = NULL; view.chatRoom = cr; self.currentRoom = view.chatRoom; - [PhoneMainView.instance changeCurrentView:view.compositeViewDescription]; + if (PhoneMainView.instance.currentView == view.compositeViewDescription) + [view configureForRoom:FALSE]; + else + [PhoneMainView.instance changeCurrentView:view.compositeViewDescription]; } void main_view_chat_room_state_changed(LinphoneChatRoom *cr, LinphoneChatRoomState newState) { diff --git a/Resources/images/splashscreen.png b/Resources/images/splashscreen.png index fccc3641d..e6f98a8d6 100644 Binary files a/Resources/images/splashscreen.png and b/Resources/images/splashscreen.png differ diff --git a/Resources/images/splashscreen@2x.png b/Resources/images/splashscreen@2x.png index f8baf6444..1319b26c9 100644 Binary files a/Resources/images/splashscreen@2x.png and b/Resources/images/splashscreen@2x.png differ diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory index d74cdcdbc..419bdfcde 100644 --- a/Resources/linphonerc-factory +++ b/Resources/linphonerc-factory @@ -44,7 +44,7 @@ tcp_tls_keepalive=30000 #by default it is set to 30 by liblinphone history_max_size=-1 enable_basic_to_client_group_chat_room_migration=0 -aggregate_imdn=0 +aggregate_imdn=1 [sound] dtmf_player_amp=0.007 diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 17cd65557..cb6a67330 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -40,6 +40,18 @@ 249660951FD6A35F001D55AA /* Photos.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 249660941FD6A359001D55AA /* Photos.framework */; }; 24A3459E1D95797700881A5C /* UIShopTableCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 24A3459D1D95797700881A5C /* UIShopTableCell.xib */; }; 24A345A61D95798A00881A5C /* UIShopTableCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 24A345A51D95798A00881A5C /* UIShopTableCell.m */; }; + 24BFAA9E209B0630004F47A7 /* dialer_background.png in Resources */ = {isa = PBXBuildFile; fileRef = 24BFAA8C209B062B004F47A7 /* dialer_background.png */; }; + 24BFAA9F209B0630004F47A7 /* linphone_user.png in Resources */ = {isa = PBXBuildFile; fileRef = 24BFAA93209B062C004F47A7 /* linphone_user.png */; }; + 24BFAAA0209B0630004F47A7 /* contacts_sip_default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 24BFAA94209B062C004F47A7 /* contacts_sip_default@2x.png */; }; + 24BFAAA1209B0630004F47A7 /* linphone_user@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 24BFAA95209B062D004F47A7 /* linphone_user@2x.png */; }; + 24BFAAA2209B0630004F47A7 /* linphone_user~ipad@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 24BFAA96209B062D004F47A7 /* linphone_user~ipad@2x.png */; }; + 24BFAAA3209B0630004F47A7 /* contacts_sip_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = 24BFAA97209B062E004F47A7 /* contacts_sip_selected.png */; }; + 24BFAAA4209B0630004F47A7 /* linphone_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 24BFAA98209B062E004F47A7 /* linphone_logo.png */; }; + 24BFAAA5209B0630004F47A7 /* contacts_sip_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 24BFAA99209B062E004F47A7 /* contacts_sip_default.png */; }; + 24BFAAA6209B0630004F47A7 /* linphone_user~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 24BFAA9A209B062F004F47A7 /* linphone_user~ipad.png */; }; + 24BFAAA7209B0630004F47A7 /* callkit_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 24BFAA9B209B062F004F47A7 /* callkit_logo.png */; }; + 24BFAAA8209B0630004F47A7 /* contacts_sip_selected@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 24BFAA9C209B062F004F47A7 /* contacts_sip_selected@2x.png */; }; + 24BFAAA9209B0630004F47A7 /* linphone_logo@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 24BFAA9D209B0630004F47A7 /* linphone_logo@2x.png */; }; 24E1C7C01F9A235600D3F981 /* Contacts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 24E1C7B91F9A235500D3F981 /* Contacts.framework */; }; 288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; }; 340751971506459A00B89C47 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 340751961506459A00B89C47 /* CoreTelephony.framework */; }; @@ -679,19 +691,7 @@ 8CB2B8F91F86229E0015CEE2 /* chat_secure.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CB2B8F61F86229B0015CEE2 /* chat_secure.png */; }; 8CB2B8FA1F86229E0015CEE2 /* next_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CB2B8F71F86229C0015CEE2 /* next_disabled.png */; }; 8CB2B8FB1F86229E0015CEE2 /* next_disabled@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CB2B8F81F86229D0015CEE2 /* next_disabled@2x.png */; }; - 8CD99A1A20908C14008A7CDA /* callkit_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CD99A1120908C14008A7CDA /* callkit_logo.png */; }; 8CD99A1C20908C27008A7CDA /* callkit_logo@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CD99A1B20908C27008A7CDA /* callkit_logo@2x.png */; }; - 8CD99A2020908CF3008A7CDA /* contacts_sip_default.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CD99A1F20908CF3008A7CDA /* contacts_sip_default.png */; }; - 8CD99A2220908D2D008A7CDA /* contacts_sip_default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CD99A2120908D2C008A7CDA /* contacts_sip_default@2x.png */; }; - 8CD99A2520908D6C008A7CDA /* contacts_sip_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CD99A2320908D6B008A7CDA /* contacts_sip_selected.png */; }; - 8CD99A2620908D6C008A7CDA /* contacts_sip_selected@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CD99A2420908D6B008A7CDA /* contacts_sip_selected@2x.png */; }; - 8CD99A2820908DDA008A7CDA /* dialer_background.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CD99A2720908DDA008A7CDA /* dialer_background.png */; }; - 8CD99A2F2090A456008A7CDA /* linphone_user@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CD99A292090A454008A7CDA /* linphone_user@2x.png */; }; - 8CD99A302090A456008A7CDA /* linphone_user~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CD99A2A2090A455008A7CDA /* linphone_user~ipad.png */; }; - 8CD99A312090A456008A7CDA /* linphone_user~ipad@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CD99A2B2090A455008A7CDA /* linphone_user~ipad@2x.png */; }; - 8CD99A322090A456008A7CDA /* linphone_logo@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CD99A2C2090A455008A7CDA /* linphone_logo@2x.png */; }; - 8CD99A332090A456008A7CDA /* linphone_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CD99A2D2090A456008A7CDA /* linphone_logo.png */; }; - 8CD99A342090A457008A7CDA /* linphone_user.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CD99A2E2090A456008A7CDA /* linphone_user.png */; }; 8CD99A372090A824008A7CDA /* splashscreen@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CD99A352090A823008A7CDA /* splashscreen@2x.png */; }; 8CD99A382090A824008A7CDA /* splashscreen.png in Resources */ = {isa = PBXBuildFile; fileRef = 8CD99A362090A824008A7CDA /* splashscreen.png */; }; 8CD99A3A2090B9CB008A7CDA /* ChatConversationImdnView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8CD99A392090B9CB008A7CDA /* ChatConversationImdnView.xib */; }; @@ -854,20 +854,6 @@ remoteGlobalIDString = FAB8A0141CAC546A00C6DFC1; remoteInfo = KIFFrameworkConsumerTests; }; - 8C56289A20236AA7007A8ECC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 630589F21B4E816900EFAE36 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8CD87D4C1EF5105800ACA260; - remoteInfo = LinphoneManager; - }; - 8C56289C20236AA7007A8ECC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 630589F21B4E816900EFAE36 /* KIF.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 8CD87D541EF5105900ACA260; - remoteInfo = LinphoneManagerTests; - }; F08F119119C09C6B007D70C2 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; @@ -990,6 +976,18 @@ 24A3459D1D95797700881A5C /* UIShopTableCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UIShopTableCell.xib; sourceTree = ""; }; 24A345A51D95798A00881A5C /* UIShopTableCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIShopTableCell.m; sourceTree = ""; }; 24A345A71D95799900881A5C /* UIShopTableCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIShopTableCell.h; sourceTree = ""; }; + 24BFAA8C209B062B004F47A7 /* dialer_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dialer_background.png; sourceTree = ""; }; + 24BFAA93209B062C004F47A7 /* linphone_user.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = linphone_user.png; sourceTree = ""; }; + 24BFAA94209B062C004F47A7 /* contacts_sip_default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "contacts_sip_default@2x.png"; sourceTree = ""; }; + 24BFAA95209B062D004F47A7 /* linphone_user@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "linphone_user@2x.png"; sourceTree = ""; }; + 24BFAA96209B062D004F47A7 /* linphone_user~ipad@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "linphone_user~ipad@2x.png"; sourceTree = ""; }; + 24BFAA97209B062E004F47A7 /* contacts_sip_selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = contacts_sip_selected.png; sourceTree = ""; }; + 24BFAA98209B062E004F47A7 /* linphone_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = linphone_logo.png; sourceTree = ""; }; + 24BFAA99209B062E004F47A7 /* contacts_sip_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = contacts_sip_default.png; sourceTree = ""; }; + 24BFAA9A209B062F004F47A7 /* linphone_user~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "linphone_user~ipad.png"; sourceTree = ""; }; + 24BFAA9B209B062F004F47A7 /* callkit_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = callkit_logo.png; sourceTree = ""; }; + 24BFAA9C209B062F004F47A7 /* contacts_sip_selected@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "contacts_sip_selected@2x.png"; sourceTree = ""; }; + 24BFAA9D209B0630004F47A7 /* linphone_logo@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "linphone_logo@2x.png"; sourceTree = ""; }; 24E1C7B91F9A235500D3F981 /* Contacts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Contacts.framework; path = System/Library/Frameworks/Contacts.framework; sourceTree = SDKROOT; }; 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 = ""; }; @@ -1709,19 +1707,7 @@ 8CB2B8F81F86229D0015CEE2 /* next_disabled@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "next_disabled@2x.png"; sourceTree = ""; }; 8CD0B3BE1FA22CBA008FEB16 /* libsoci_core.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsoci_core.a; path = "liblinphone-sdk/apple-darwin/lib/libsoci_core.a"; sourceTree = ""; }; 8CD0B3C81FA2357B008FEB16 /* libsqlite3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsqlite3.a; path = "liblinphone-sdk/apple-darwin/lib/libsqlite3.a"; sourceTree = ""; }; - 8CD99A1120908C14008A7CDA /* callkit_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = callkit_logo.png; path = "../../../nouveau logo/Icons/callkit/callkit_logo.png"; sourceTree = ""; }; 8CD99A1B20908C27008A7CDA /* callkit_logo@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "callkit_logo@2x.png"; sourceTree = ""; }; - 8CD99A1F20908CF3008A7CDA /* contacts_sip_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contacts_sip_default.png; path = "../../../nouveau logo/contact_sip/contacts_sip_default.png"; sourceTree = ""; }; - 8CD99A2120908D2C008A7CDA /* contacts_sip_default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "contacts_sip_default@2x.png"; path = "../../../nouveau logo/contact_sip/contacts_sip_default@2x.png"; sourceTree = ""; }; - 8CD99A2320908D6B008A7CDA /* contacts_sip_selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = contacts_sip_selected.png; path = "../../../nouveau logo/contact_sip/contacts_sip_selected.png"; sourceTree = ""; }; - 8CD99A2420908D6B008A7CDA /* contacts_sip_selected@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "contacts_sip_selected@2x.png"; path = "../../../nouveau logo/contact_sip/contacts_sip_selected@2x.png"; sourceTree = ""; }; - 8CD99A2720908DDA008A7CDA /* dialer_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = dialer_background.png; path = "../../../nouveau logo/Icons/background_tab/dialer_background.png"; sourceTree = ""; }; - 8CD99A292090A454008A7CDA /* linphone_user@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone_user@2x.png"; path = "../../../nouveau logo/Icons/linphone_user/linphone_user@2x.png"; sourceTree = ""; }; - 8CD99A2A2090A455008A7CDA /* linphone_user~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone_user~ipad.png"; path = "../../../nouveau logo/Icons/linphone_user/linphone_user~ipad.png"; sourceTree = ""; }; - 8CD99A2B2090A455008A7CDA /* linphone_user~ipad@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone_user~ipad@2x.png"; path = "../../../nouveau logo/Icons/linphone_user/linphone_user~ipad@2x.png"; sourceTree = ""; }; - 8CD99A2C2090A455008A7CDA /* linphone_logo@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone_logo@2x.png"; path = "../../../nouveau logo/Icons/linphone_user/linphone_logo@2x.png"; sourceTree = ""; }; - 8CD99A2D2090A456008A7CDA /* linphone_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = linphone_logo.png; path = "../../../nouveau logo/Icons/linphone_user/linphone_logo.png"; sourceTree = ""; }; - 8CD99A2E2090A456008A7CDA /* linphone_user.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = linphone_user.png; path = "../../../nouveau logo/Icons/linphone_user/linphone_user.png"; sourceTree = ""; }; 8CD99A352090A823008A7CDA /* splashscreen@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "splashscreen@2x.png"; sourceTree = ""; }; 8CD99A362090A824008A7CDA /* splashscreen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = splashscreen.png; sourceTree = ""; }; 8CD99A392090B9CB008A7CDA /* ChatConversationImdnView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ChatConversationImdnView.xib; sourceTree = ""; }; @@ -2405,8 +2391,6 @@ 63058A071B4E816A00EFAE36 /* KIF.framework */, 633FC7C81CD7466400774B8B /* KIFFrameworkConsumer.app */, 633FC7CA1CD7466400774B8B /* KIFFrameworkConsumerTests.xctest */, - 8C56289B20236AA7007A8ECC /* LinphoneManager.framework */, - 8C56289D20236AA7007A8ECC /* LinphoneManagerTests.xctest */, ); name = Products; sourceTree = ""; @@ -2476,6 +2460,18 @@ 633FEBE11D3CD5570014B822 /* images */ = { isa = PBXGroup; children = ( + 24BFAA9B209B062F004F47A7 /* callkit_logo.png */, + 24BFAA99209B062E004F47A7 /* contacts_sip_default.png */, + 24BFAA94209B062C004F47A7 /* contacts_sip_default@2x.png */, + 24BFAA97209B062E004F47A7 /* contacts_sip_selected.png */, + 24BFAA9C209B062F004F47A7 /* contacts_sip_selected@2x.png */, + 24BFAA8C209B062B004F47A7 /* dialer_background.png */, + 24BFAA98209B062E004F47A7 /* linphone_logo.png */, + 24BFAA9D209B0630004F47A7 /* linphone_logo@2x.png */, + 24BFAA93209B062C004F47A7 /* linphone_user.png */, + 24BFAA95209B062D004F47A7 /* linphone_user@2x.png */, + 24BFAA9A209B062F004F47A7 /* linphone_user~ipad.png */, + 24BFAA96209B062D004F47A7 /* linphone_user~ipad@2x.png */, 8CF25D9B1F9F76BC00BEA0C1 /* chat_group_informations.png */, 8CF25D9C1F9F76BD00BEA0C1 /* chat_group_informations@2x.png */, 8CF25D941F9F336100BEA0C1 /* check_unselected.png */, @@ -2495,7 +2491,6 @@ 8CE24F4A1F8234A30077AC0A /* next_default@2x.png */, 8C300D981E40E0CC00728EF3 /* lime_ko.png */, 8C300D991E40E0CC00728EF3 /* lime_ko@2x.png */, - 8CD99A1120908C14008A7CDA /* callkit_logo.png */, 8CD99A1B20908C27008A7CDA /* callkit_logo@2x.png */, 633FEBE21D3CD5570014B822 /* add_field_default.png */, 244523BC1E8D3A6C0037A187 /* chat_unsecure.png */, @@ -2667,10 +2662,6 @@ 633FEC851D3CD5570014B822 /* contacts_all_disabled@2x.png */, 633FEC861D3CD5570014B822 /* contacts_all_selected.png */, 633FEC871D3CD5570014B822 /* contacts_all_selected@2x.png */, - 8CD99A1F20908CF3008A7CDA /* contacts_sip_default.png */, - 8CD99A2120908D2C008A7CDA /* contacts_sip_default@2x.png */, - 8CD99A2320908D6B008A7CDA /* contacts_sip_selected.png */, - 8CD99A2420908D6B008A7CDA /* contacts_sip_selected@2x.png */, 633FEC8E1D3CD5570014B822 /* delete_default.png */, 633FEC8F1D3CD5570014B822 /* delete_default@2x.png */, 633FEC901D3CD5570014B822 /* delete_disabled.png */, @@ -2687,7 +2678,6 @@ 633FEC9B1D3CD5570014B822 /* dialer_back_default@2x.png */, 633FEC9C1D3CD5570014B822 /* dialer_back_disabled.png */, 633FEC9D1D3CD5570014B822 /* dialer_back_disabled@2x.png */, - 8CD99A2720908DDA008A7CDA /* dialer_background.png */, 633FECA01D3CD5570014B822 /* edit_default.png */, 633FECA11D3CD5570014B822 /* edit_default@2x.png */, 633FECA21D3CD5570014B822 /* edit_disabled.png */, @@ -2734,12 +2724,6 @@ 633FECCB1D3CD5570014B822 /* led_error@2x.png */, 633FECCC1D3CD5570014B822 /* led_inprogress.png */, 633FECCD1D3CD5570014B822 /* led_inprogress@2x.png */, - 8CD99A2D2090A456008A7CDA /* linphone_logo.png */, - 8CD99A2C2090A455008A7CDA /* linphone_logo@2x.png */, - 8CD99A2E2090A456008A7CDA /* linphone_user.png */, - 8CD99A292090A454008A7CDA /* linphone_user@2x.png */, - 8CD99A2A2090A455008A7CDA /* linphone_user~ipad.png */, - 8CD99A2B2090A455008A7CDA /* linphone_user~ipad@2x.png */, 633FECD41D3CD5580014B822 /* list_details_default.png */, 633FECD51D3CD5580014B822 /* list_details_default@2x.png */, 633FECD61D3CD5580014B822 /* list_details_over.png */, @@ -3344,20 +3328,6 @@ remoteRef = 633FC7C91CD7466400774B8B /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 8C56289B20236AA7007A8ECC /* LinphoneManager.framework */ = { - isa = PBXReferenceProxy; - fileType = wrapper.framework; - path = LinphoneManager.framework; - remoteRef = 8C56289A20236AA7007A8ECC /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 8C56289D20236AA7007A8ECC /* LinphoneManagerTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = LinphoneManagerTests.xctest; - remoteRef = 8C56289C20236AA7007A8ECC /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -3366,6 +3336,7 @@ buildActionMask = 2147483647; files = ( 633FEF3F1D3CD55A0014B822 /* security_pending@2x.png in Resources */, + 24BFAAA4209B0630004F47A7 /* linphone_logo.png in Resources */, 633FEDC41D3CD5590014B822 /* call_hangup_disabled.png in Resources */, 633FEDA81D3CD5590014B822 /* backspace_default.png in Resources */, 636316D11A1DEBCB0009B839 /* AboutView.xib in Resources */, @@ -3409,7 +3380,7 @@ 633FEDC51D3CD5590014B822 /* call_hangup_disabled@2x.png in Resources */, 633FEEDF1D3CD55A0014B822 /* numpad_8_over~ipad.png in Resources */, 8CD99A372090A824008A7CDA /* splashscreen@2x.png in Resources */, - 8CD99A2F2090A456008A7CDA /* linphone_user@2x.png in Resources */, + 24BFAAA9209B0630004F47A7 /* linphone_logo@2x.png in Resources */, 633FEE071D3CD5590014B822 /* chat_add_default@2x.png in Resources */, 633FEF551D3CD55A0014B822 /* waiting_time@2x.png in Resources */, 633FEEAC1D3CD55A0014B822 /* numpad_2_default@2x.png in Resources */, @@ -3475,7 +3446,6 @@ 633FEF291D3CD55A0014B822 /* route_earpiece_default@2x.png in Resources */, 633FEE271D3CD5590014B822 /* checkbox_checked@2x.png in Resources */, 633FEDCC1D3CD5590014B822 /* call_quality_indicator_0.png in Resources */, - 8CD99A1A20908C14008A7CDA /* callkit_logo.png in Resources */, 633FEDEB1D3CD5590014B822 /* call_status_outgoing@2x.png in Resources */, 633FEDEE1D3CD5590014B822 /* call_transfer_default.png in Resources */, 63DFE04B1C40161700DA5E87 /* notes_of_the_optimistic.caf in Resources */, @@ -3516,6 +3486,7 @@ 633FEF541D3CD55A0014B822 /* waiting_time.png in Resources */, 633FEE861D3CD5590014B822 /* led_inprogress.png in Resources */, 633FEDFC1D3CD5590014B822 /* camera_switch_default.png in Resources */, + 24BFAA9F209B0630004F47A7 /* linphone_user.png in Resources */, 633FEE4B1D3CD5590014B822 /* delete_disabled@2x.png in Resources */, 633FEE181D3CD5590014B822 /* chat_send_over.png in Resources */, 633FEDED1D3CD5590014B822 /* call_status_outgoing~ipad@2x.png in Resources */, @@ -3589,6 +3560,7 @@ 8CD99A3A2090B9CB008A7CDA /* ChatConversationImdnView.xib in Resources */, 633FEDD11D3CD5590014B822 /* call_quality_indicator_2@2x.png in Resources */, 633FEDBC1D3CD5590014B822 /* call_audio_start_disabled.png in Resources */, + 24BFAA9E209B0630004F47A7 /* dialer_background.png in Resources */, 633FEE481D3CD5590014B822 /* delete_default.png in Resources */, 633FEEB01D3CD55A0014B822 /* numpad_2_over~ipad@2x.png in Resources */, 633FEE2A1D3CD5590014B822 /* color_A.png in Resources */, @@ -3598,11 +3570,13 @@ 633FEED21D3CD55A0014B822 /* numpad_6~ipad@2x.png in Resources */, 633FEDCD1D3CD5590014B822 /* call_quality_indicator_0@2x.png in Resources */, 636316D41A1DEC650009B839 /* SettingsView.xib in Resources */, + 24BFAAA6209B0630004F47A7 /* linphone_user~ipad.png in Resources */, 633FEEBF1D3CD55A0014B822 /* numpad_4_over~ipad.png in Resources */, 633FEEAD1D3CD55A0014B822 /* numpad_2_over.png in Resources */, 633FEE801D3CD5590014B822 /* led_connected.png in Resources */, 633FEEF41D3CD55A0014B822 /* numpad_star_default.png in Resources */, 633FEDDE1D3CD5590014B822 /* call_start_body_over.png in Resources */, + 24BFAAA0209B0630004F47A7 /* contacts_sip_default@2x.png in Resources */, 8CF25D9D1F9F76BD00BEA0C1 /* chat_group_informations.png in Resources */, 633FEDFB1D3CD5590014B822 /* camera_selected@2x.png in Resources */, 633FEF051D3CD55A0014B822 /* options_selected@2x.png in Resources */, @@ -3613,11 +3587,11 @@ 633FEE031D3CD5590014B822 /* cancel_edit_default@2x.png in Resources */, 633FEDE01D3CD5590014B822 /* call_start_body_over~ipad.png in Resources */, 8CD99A3F2090CD37008A7CDA /* UIChatConversationImdnTableViewCell.xib in Resources */, + 24BFAAA7209B0630004F47A7 /* callkit_logo.png in Resources */, D34F6F9E1594D3FB0095705B /* InAppSettings.bundle in Resources */, 633FEE4D1D3CD5590014B822 /* delete_field_default@2x.png in Resources */, 639CEB091A1DF4FA004DE38F /* UIChatCell.xib in Resources */, 633FEE961D3CD55A0014B822 /* micro_disabled.png in Resources */, - 8CD99A302090A456008A7CDA /* linphone_user~ipad.png in Resources */, 63AADBF61B6A0FF200AA16FD /* linphonerc-factory in Resources */, 633FEE671D3CD5590014B822 /* footer_contacts_default@2x.png in Resources */, 63B8D68C1BCBE65600C12B09 /* ChatConversationCreateView.xib in Resources */, @@ -3644,6 +3618,7 @@ 633FEF271D3CD55A0014B822 /* route_bluetooth_selected@2x.png in Resources */, 633FEE111D3CD5590014B822 /* chat_list_indicator~ipad@2x.png in Resources */, 633FEEFC1D3CD55A0014B822 /* options_add_call_default.png in Resources */, + 24BFAAA5209B0630004F47A7 /* contacts_sip_default.png in Resources */, 633FEF441D3CD55A0014B822 /* speaker_default.png in Resources */, 639CEB031A1DF4EB004DE38F /* UICompositeView.xib in Resources */, 633FEF3A1D3CD55A0014B822 /* security_ko.png in Resources */, @@ -3678,21 +3653,18 @@ 633FED9E1D3CD5590014B822 /* add_field_over.png in Resources */, 633FEE0A1D3CD5590014B822 /* chat_attachment_default.png in Resources */, 633FEE201D3CD5590014B822 /* chat_start_body_disabled~ipad.png in Resources */, - 8CD99A332090A456008A7CDA /* linphone_logo.png in Resources */, 633FEE5B1D3CD5590014B822 /* edit_default@2x.png in Resources */, 633FEDE11D3CD5590014B822 /* call_start_body_over~ipad@2x.png in Resources */, 633FEF4F1D3CD55A0014B822 /* valid_default@2x.png in Resources */, 8CD99A382090A824008A7CDA /* splashscreen.png in Resources */, 633FEE241D3CD5590014B822 /* chat_start_body_over~ipad.png in Resources */, 8C2A81951F87B8000012A66B /* chat_group_avatar@2x.png in Resources */, - 8CD99A2620908D6C008A7CDA /* contacts_sip_selected@2x.png in Resources */, 633FEE091D3CD5590014B822 /* chat_add_disabled@2x.png in Resources */, 633FEE191D3CD5590014B822 /* chat_send_over@2x.png in Resources */, 633FEF181D3CD55A0014B822 /* pause_small_over_selected.png in Resources */, 633FEE001D3CD5590014B822 /* camera_switch_over.png in Resources */, 633FEF401D3CD55A0014B822 /* select_all_default.png in Resources */, 633FEDF01D3CD5590014B822 /* call_transfer_disabled.png in Resources */, - 8CD99A2220908D2D008A7CDA /* contacts_sip_default@2x.png in Resources */, 633FEE351D3CD5590014B822 /* conference_exit_default@2x.png in Resources */, 633FEECF1D3CD55A0014B822 /* numpad_6_over~ipad.png in Resources */, 633FEE9A1D3CD55A0014B822 /* nowebcamCIF.jpg in Resources */, @@ -3725,11 +3697,9 @@ 633FEE741D3CD5590014B822 /* history_all_disabled.png in Resources */, 633FEE081D3CD5590014B822 /* chat_add_disabled.png in Resources */, 633FEF1D1D3CD55A0014B822 /* presence_offline@2x.png in Resources */, - 8CD99A322090A456008A7CDA /* linphone_logo@2x.png in Resources */, 24A3459E1D95797700881A5C /* UIShopTableCell.xib in Resources */, 633FEE231D3CD5590014B822 /* chat_start_body_over@2x.png in Resources */, 633FEEBE1D3CD55A0014B822 /* numpad_4_over@2x.png in Resources */, - 8CD99A312090A456008A7CDA /* linphone_user~ipad@2x.png in Resources */, 633FEF471D3CD55A0014B822 /* speaker_disabled@2x.png in Resources */, 633FEEFE1D3CD55A0014B822 /* options_add_call_disabled.png in Resources */, 633FEE291D3CD5590014B822 /* checkbox_unchecked@2x.png in Resources */, @@ -3745,6 +3715,7 @@ 633FEEA21D3CD55A0014B822 /* numpad_0~ipad@2x.png in Resources */, 633FEE991D3CD55A0014B822 /* micro_selected@2x.png in Resources */, 633FEE621D3CD5590014B822 /* footer_chat_default.png in Resources */, + 24BFAAA3209B0630004F47A7 /* contacts_sip_selected.png in Resources */, 633FEE0D1D3CD5590014B822 /* chat_attachment_disabled@2x.png in Resources */, 639E9CA61C0DB7F200019A75 /* UIChatCreateCell.xib in Resources */, 8C9C5E121F83BD97006987FA /* UIChatCreateCollectionViewCell.xib in Resources */, @@ -3765,7 +3736,6 @@ 633FEF071D3CD55A0014B822 /* options_start_conference_default@2x.png in Resources */, 633FEE151D3CD5590014B822 /* chat_send_default@2x.png in Resources */, 633FEDC31D3CD5590014B822 /* call_hangup_default@2x.png in Resources */, - 8CD99A2520908D6C008A7CDA /* contacts_sip_selected.png in Resources */, 633FEF061D3CD55A0014B822 /* options_start_conference_default.png in Resources */, 63AADC021B6A0FF200AA16FD /* assistant_remote.rc in Resources */, 633FEF1E1D3CD55A0014B822 /* presence_online.png in Resources */, @@ -3812,9 +3782,9 @@ 633FEED51D3CD55A0014B822 /* numpad_7_over.png in Resources */, 633FEE561D3CD5590014B822 /* dialer_back_disabled.png in Resources */, 633FEDBF1D3CD5590014B822 /* call_back_default@2x.png in Resources */, + 24BFAAA8209B0630004F47A7 /* contacts_sip_selected@2x.png in Resources */, 633FEE141D3CD5590014B822 /* chat_send_default.png in Resources */, 633FEF421D3CD55A0014B822 /* select_all_disabled.png in Resources */, - 8CD99A2020908CF3008A7CDA /* contacts_sip_default.png in Resources */, 63AADBE81B6A0FF200AA16FD /* Localizable.strings in Resources */, 633FEEF21D3CD55A0014B822 /* numpad_hash~ipad@2x.png in Resources */, 633FEE3F1D3CD5590014B822 /* contacts_all_disabled@2x.png in Resources */, @@ -3834,7 +3804,6 @@ 633FEE7E1D3CD5590014B822 /* history_missed_selected.png in Resources */, 633FEE261D3CD5590014B822 /* checkbox_checked.png in Resources */, 633FEF531D3CD55A0014B822 /* voicemail@2x.png in Resources */, - 8CD99A342090A457008A7CDA /* linphone_user.png in Resources */, 633FEF2C1D3CD55A0014B822 /* route_earpiece_selected.png in Resources */, 633FEE681D3CD5590014B822 /* footer_contacts_disabled.png in Resources */, 633FEDB71D3CD5590014B822 /* call_alt_start_default@2x.png in Resources */, @@ -3863,12 +3832,12 @@ 633FEF361D3CD55A0014B822 /* routes_disabled.png in Resources */, 633FEF261D3CD55A0014B822 /* route_bluetooth_selected.png in Resources */, 633FEDF31D3CD5590014B822 /* call_video_start_default@2x.png in Resources */, + 24BFAAA2209B0630004F47A7 /* linphone_user~ipad@2x.png in Resources */, 633FEDBA1D3CD5590014B822 /* call_audio_start_default.png in Resources */, 633FEE131D3CD5590014B822 /* chat_message_not_delivered@2x.png in Resources */, 63AADBF51B6A0FF200AA16FD /* linphonerc in Resources */, 633FEF0C1D3CD55A0014B822 /* options_transfer_call_disabled.png in Resources */, 633FEE911D3CD55A0014B822 /* list_details_over@2x.png in Resources */, - 8CD99A2820908DDA008A7CDA /* dialer_background.png in Resources */, 633FEE121D3CD5590014B822 /* chat_message_not_delivered.png in Resources */, 633FEDCE1D3CD5590014B822 /* call_quality_indicator_1.png in Resources */, 8CB2B8F91F86229E0015CEE2 /* chat_secure.png in Resources */, @@ -3894,6 +3863,7 @@ 633FEE771D3CD5590014B822 /* history_all_selected@2x.png in Resources */, 633FEF031D3CD55A0014B822 /* options_disabled@2x.png in Resources */, 633FEDA21D3CD5590014B822 /* avatar~ipad.png in Resources */, + 24BFAAA1209B0630004F47A7 /* linphone_user@2x.png in Resources */, 633FEF211D3CD55A0014B822 /* presence_unregistered@2x.png in Resources */, 633FEEA71D3CD55A0014B822 /* numpad_1_over~ipad.png in Resources */, ); diff --git a/submodules/externals/libxsd b/submodules/externals/libxsd index 97dfa5b7a..34af5de2e 160000 --- a/submodules/externals/libxsd +++ b/submodules/externals/libxsd @@ -1 +1 @@ -Subproject commit 97dfa5b7af486a2730aa66ef4b2b04259c9ab21b +Subproject commit 34af5de2ee71dde72a010fde336d2efa9c386abd diff --git a/submodules/linphone b/submodules/linphone index 51d5589ed..00d695d77 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 51d5589edf03ae07ca45f734c7a329cc1355c1ad +Subproject commit 00d695d77f6e0e8e528ca1b7385fafa14d306c1d