diff --git a/Classes/AboutViewController.h b/Classes/AboutViewController.h index a486efbd1..041031e06 100644 --- a/Classes/AboutViewController.h +++ b/Classes/AboutViewController.h @@ -24,10 +24,13 @@ @interface AboutViewController : UIViewController { } +@property (nonatomic, retain) IBOutlet UILabel *linphoneLabel; @property (nonatomic, retain) IBOutlet UILabel *linphoneIphoneVersionLabel; @property (nonatomic, retain) IBOutlet UILabel *linphoneCoreVersionLabel; @property (nonatomic, retain) IBOutlet UIView *contentView; @property (nonatomic, retain) IBOutlet UILabel *linkLabel; +@property (nonatomic, retain) IBOutlet UILabel *copyrightLabel; +@property (nonatomic, retain) IBOutlet UILabel *licenseLabel; @property (nonatomic, retain) IBOutlet UIWebView *licensesView; @property (nonatomic, retain) IBOutlet UITapGestureRecognizer *linkTapGestureRecognizer; diff --git a/Classes/AboutViewController.m b/Classes/AboutViewController.m index 1e2b5dddc..d85a80874 100644 --- a/Classes/AboutViewController.m +++ b/Classes/AboutViewController.m @@ -25,11 +25,14 @@ @implementation AboutViewController @synthesize linphoneCoreVersionLabel; +@synthesize linphoneLabel; @synthesize linphoneIphoneVersionLabel; @synthesize contentView; @synthesize linkTapGestureRecognizer; @synthesize linkLabel; @synthesize licensesView; +@synthesize licenseLabel; +@synthesize copyrightLabel; #pragma mark - Lifecycle Functions @@ -59,15 +62,22 @@ - (void)viewDidLoad { [super viewDidLoad]; + [linkLabel setText:NSLocalizedString(@"http://www.linphone.org", nil)]; + [licenseLabel setText:NSLocalizedString(@"GNU General Public License V2 ", nil)]; + [copyrightLabel setText:NSLocalizedString(@"© 2010-2012 Belledonne Communications ", nil)]; + [linkLabel addGestureRecognizer:linkTapGestureRecognizer]; UIScrollView *scrollView = (UIScrollView *)self.view; [scrollView addSubview:contentView]; [scrollView setContentSize:[contentView bounds].size]; - [linphoneIphoneVersionLabel setText:[NSString stringWithFormat:@"Linphone iPhone %@", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]]]; + [linphoneLabel setText:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"]]; + + [linphoneIphoneVersionLabel setText:[NSString stringWithFormat:@"%@ iPhone %@", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"] + ,[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]]]; - [linphoneCoreVersionLabel setText:[NSString stringWithFormat:@"Linphone Core %s", linphone_core_get_version()]]; + [linphoneCoreVersionLabel setText:[NSString stringWithFormat:@"%@ Core %s", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"], linphone_core_get_version()]]; if([LinphoneManager runningOnIpad]) { [LinphoneUtils adjustFontSize:self.view mult:2.22f]; diff --git a/Classes/AboutViewController.xib b/Classes/AboutViewController.xib index 7c0a4570c..6f995fd83 100644 --- a/Classes/AboutViewController.xib +++ b/Classes/AboutViewController.xib @@ -3,12 +3,12 @@ 784 11E53 - 2840 + 2844 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 1930 YES @@ -43,7 +43,6 @@ {320, 460} - _NS:9 YES YES @@ -246,7 +245,6 @@ {{10, 380}, {300, 210}} - _NS:9 IBCocoaTouchFramework 2 @@ -315,6 +313,22 @@ 70 + + + linphoneLabel + + + + 71 + + + + copyrightLabel + + + + 72 + @@ -461,7 +475,7 @@ - 70 + 72 @@ -485,20 +499,26 @@ YES contentView + copyrightLabel + licenseLabel licensesView linkLabel linkTapGestureRecognizer linphoneCoreVersionLabel linphoneIphoneVersionLabel + linphoneLabel YES UIView + UILabel + UILabel UIWebView UILabel UITapGestureRecognizer UILabel UILabel + UILabel @@ -506,11 +526,14 @@ YES contentView + copyrightLabel + licenseLabel licensesView linkLabel linkTapGestureRecognizer linphoneCoreVersionLabel linphoneIphoneVersionLabel + linphoneLabel YES @@ -518,6 +541,14 @@ contentView UIView + + copyrightLabel + UILabel + + + licenseLabel + UILabel + licensesView UIWebView @@ -538,6 +569,10 @@ linphoneIphoneVersionLabel UILabel + + linphoneLabel + UILabel + @@ -563,6 +598,6 @@ linphone_logo.png {512, 512} - 1926 + 1930 diff --git a/Classes/ContactDetailsTableViewController.m b/Classes/ContactDetailsTableViewController.m index 74a47a6fe..1fbd28ba8 100644 --- a/Classes/ContactDetailsTableViewController.m +++ b/Classes/ContactDetailsTableViewController.m @@ -74,7 +74,7 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C - (void)initContactDetailsTableViewController { dataCache = [[NSMutableArray alloc] init]; labelArray = [[NSMutableArray alloc] initWithObjects: - @"Linphone", + [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"], [NSString stringWithString:(NSString*)kABPersonPhoneMobileLabel], [NSString stringWithString:(NSString*)kABPersonPhoneIPhoneLabel], [NSString stringWithString:(NSString*)kABPersonPhoneMainLabel], nil]; diff --git a/Classes/ContactsTableViewController.m b/Classes/ContactsTableViewController.m index 2fcd57e3f..c46f31fd4 100644 --- a/Classes/ContactsTableViewController.m +++ b/Classes/ContactsTableViewController.m @@ -102,6 +102,8 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf CFStringRef lLocalizedFirstName = (lFirstName != nil)? ABAddressBookCopyLocalizedLabel(lFirstName): nil; CFStringRef lLastName = ABRecordCopyValue((ABRecordRef)lPerson, kABPersonLastNameProperty); CFStringRef lLocalizedLastName = (lLastName != nil)? ABAddressBookCopyLocalizedLabel(lLastName): nil; + CFStringRef lOrganization = ABRecordCopyValue((ABRecordRef)lPerson, kABPersonOrganizationProperty); + CFStringRef lLocalizedlOrganization = (lOrganization != nil)? ABAddressBookCopyLocalizedLabel(lOrganization): nil; NSString *name = nil; if(lLocalizedFirstName != nil && lLocalizedLastName != nil) { name=[NSString stringWithFormat:@"%@%@", [(NSString *)lLocalizedFirstName retain], [(NSString *)lLocalizedLastName retain]]; @@ -109,8 +111,8 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf name=[NSString stringWithFormat:@"%@",[(NSString *)lLocalizedLastName retain]]; } else if(lLocalizedFirstName != nil) { name=[NSString stringWithFormat:@"%@",[(NSString *)lLocalizedFirstName retain]]; - } else { - + } else if(lLocalizedlOrganization != nil) { + name=[NSString stringWithFormat:@"%@",[(NSString *)lLocalizedlOrganization retain]]; } if(name != nil && [name length] > 0) { // Put in correct subDic @@ -125,6 +127,10 @@ static void sync_address_book (ABAddressBookRef addressBook, CFDictionaryRef inf } [subDic insertObject:lPerson forKey:name selector:@selector(caseInsensitiveCompare:)]; } + if(lLocalizedlOrganization != nil) + CFRelease(lLocalizedlOrganization); + if(lOrganization != nil) + CFRelease(lOrganization); if(lLocalizedLastName != nil) CFRelease(lLocalizedLastName); if(lLastName != nil) diff --git a/Classes/ContactsViewController.m b/Classes/ContactsViewController.m index 94d36acf0..ae80673f2 100644 --- a/Classes/ContactsViewController.m +++ b/Classes/ContactsViewController.m @@ -168,7 +168,10 @@ static UICompositeViewDescription *compositeDescription = nil; [linphoneButton setBackgroundImage:[UIImage imageNamed:@"contacts_linphone_selected.png"] forState:(UIControlStateHighlighted | UIControlStateSelected)]; - [LinphoneUtils buttonFixStates:linphoneButton]; + [linphoneButton setTitle:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleDisplayName"] + forState:UIControlStateNormal]; + + [LinphoneUtils buttonFixStates:linphoneButton]; // Set selected+over background: IB lack ! [allButton setBackgroundImage:[UIImage imageNamed:@"contacts_all_selected.png"] diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index 13f849f29..d2846823d 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -122,6 +122,11 @@ NSDictionary *appDefaults = [NSDictionary dictionaryWithObjectsAndKeys: @"YES", @"start_at_boot_preference", @"YES", @"backgroundmode_preference", +#ifdef DEBUG + @"YES",@"debugenable_preference", +#else + @"NO",@"debugenable_preference", +#endif nil]; [[NSUserDefaults standardUserDefaults] registerDefaults:appDefaults]; diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m index 36fcc1dea..65918750f 100644 --- a/Classes/LinphoneCoreSettingsStore.m +++ b/Classes/LinphoneCoreSettingsStore.m @@ -590,8 +590,12 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); BOOL debugmode = [self boolForKey:@"debugenable_preference"]; lp_config_set_int(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "debugenable_preference", debugmode); - if (debugmode) linphone_core_enable_logs_with_cb((OrtpLogFunc)linphone_iphone_log_handler); - else linphone_core_disable_logs(); + if (debugmode) { + linphone_core_enable_logs_with_cb((OrtpLogFunc)linphone_iphone_log_handler); + ortp_set_log_level_mask(ORTP_DEBUG|ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL); + } else { + linphone_core_disable_logs(); + } [[NSUserDefaults standardUserDefaults] setBool:debugmode forKey:@"debugenable_preference"]; //to be used at linphone core startup BOOL animations = [self boolForKey:@"animations_preference"]; diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index a861777a6..409fa0da3 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -82,7 +82,7 @@ extern void libmsbcg729_init(); if ((self = [super init])) { self->batteryWarningShown = FALSE; self->notification = nil; - self->videoRequested=FALSE; + self->videoRequested = FALSE; self->userInfos = [[NSMutableDictionary alloc] init]; } return self; @@ -379,14 +379,11 @@ static void linphone_iphone_display_status(struct _LinphoneCore * lc, const char - (void)onCall:(LinphoneCall*)call StateChanged:(LinphoneCallState)state withMessage:(const char *)message { // Handling wrapper - LinphoneCallAppData* data=nil; - if (!linphone_call_get_user_pointer(call)) { + LinphoneCallAppData* data=(LinphoneCallAppData*)linphone_call_get_user_pointer(call); + if (!data) { data = [[LinphoneCallAppData alloc] init]; linphone_call_set_user_pointer(call, data); - } else { - data = (LinphoneCallAppData*) linphone_call_get_user_pointer(call); - } - + } if (state == LinphoneCallIncomingReceived) { @@ -795,15 +792,17 @@ static LinphoneCoreVTable linphonec_vtable = { /*to make sure we don't loose debug trace*/ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"debugenable_preference"]) { linphone_core_enable_logs_with_cb((OrtpLogFunc)linphone_iphone_log_handler); + ortp_set_log_level_mask(ORTP_DEBUG|ORTP_MESSAGE|ORTP_WARNING|ORTP_ERROR|ORTP_FATAL); } [LinphoneLogger logc:LinphoneLoggerLog format:"Create linphonecore"]; - linphone_core_set_user_agent([@"LinphoneIPhone" UTF8String], - [[[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString*)kCFBundleVersionKey] UTF8String]); + theLinphoneCore = linphone_core_new (&linphonec_vtable , [confiFileName cStringUsingEncoding:[NSString defaultCStringEncoding]] , [factoryConfig cStringUsingEncoding:[NSString defaultCStringEncoding]] ,self); + linphone_core_set_user_agent(theLinphoneCore,"LinphoneIPhone", + [[[NSBundle mainBundle] objectForInfoDictionaryKey:(NSString*)kCFBundleVersionKey] UTF8String]); fastAddressBook = [[FastAddressBook alloc] init]; linphone_core_set_root_ca(theLinphoneCore, lRootCa); @@ -1157,7 +1156,7 @@ static void audioRouteChangeListenerCallback ( if([self lpConfigBoolForKey:@"edge_opt_preference"]) { bool low_bandwidth = self.network == network_2g; if(low_bandwidth) { - [LinphoneLogger log:LinphoneLoggerDebug format:@"Low bandwidth mode"]; + [LinphoneLogger log:LinphoneLoggerLog format:@"Low bandwidth mode"]; } linphone_call_params_enable_low_bandwidth(lcallParams, low_bandwidth); } @@ -1198,7 +1197,7 @@ static void audioRouteChangeListenerCallback ( if([self lpConfigBoolForKey:@"edge_opt_preference"]) { bool low_bandwidth = self.network == network_2g; if(low_bandwidth) { - [LinphoneLogger log:LinphoneLoggerDebug format:@"Low bandwidth mode"]; + [LinphoneLogger log:LinphoneLoggerLog format:@"Low bandwidth mode"]; } linphone_call_params_enable_low_bandwidth(lcallParams, low_bandwidth); } diff --git a/Classes/LinphoneUI/UICompositeViewController.m b/Classes/LinphoneUI/UICompositeViewController.m index 593f85a82..aa7237646 100644 --- a/Classes/LinphoneUI/UICompositeViewController.m +++ b/Classes/LinphoneUI/UICompositeViewController.m @@ -350,7 +350,7 @@ } } if(remove) { - [LinphoneLogger log:LinphoneLoggerDebug format:@"Free cached view: %@", key]; + [LinphoneLogger log:LinphoneLoggerLog format:@"Free cached view: %@", key]; UIViewController *vc = [viewControllerCache objectForKey:key]; if ([[UIDevice currentDevice].systemVersion doubleValue] >= 5.0) { [vc viewWillUnload]; diff --git a/Classes/LinphoneUI/UIContactCell.m b/Classes/LinphoneUI/UIContactCell.m index bee9f1448..59a8c7ebb 100644 --- a/Classes/LinphoneUI/UIContactCell.m +++ b/Classes/LinphoneUI/UIContactCell.m @@ -80,7 +80,9 @@ CFStringRef lLocalizedFirstName = (lFirstName != nil)?ABAddressBookCopyLocalizedLabel(lFirstName):nil; CFStringRef lLastName = ABRecordCopyValue(contact, kABPersonLastNameProperty); CFStringRef lLocalizedLastName = (lLastName != nil)?ABAddressBookCopyLocalizedLabel(lLastName):nil; - + CFStringRef lOrganization = ABRecordCopyValue(contact, kABPersonOrganizationProperty); + CFStringRef lLocalizedOrganization = (lOrganization != nil)?ABAddressBookCopyLocalizedLabel(lOrganization):nil; + if(lLocalizedFirstName != nil) [firstNameLabel setText: (NSString *)lLocalizedFirstName]; else @@ -91,6 +93,14 @@ else [lastNameLabel setText: @""]; + if(lLocalizedFirstName == nil && lLocalizedLastName == nil) { + [firstNameLabel setText: (NSString *)lLocalizedOrganization]; + } + + if(lLocalizedOrganization != nil) + CFRelease(lLocalizedOrganization); + if(lOrganization != nil) + CFRelease(lOrganization); if(lLocalizedLastName != nil) CFRelease(lLocalizedLastName); if(lLastName != nil) diff --git a/Classes/LinphoneUI/UIContactDetailsHeader.m b/Classes/LinphoneUI/UIContactDetailsHeader.m index 3359d35b3..f9db45aa5 100644 --- a/Classes/LinphoneUI/UIContactDetailsHeader.m +++ b/Classes/LinphoneUI/UIContactDetailsHeader.m @@ -42,7 +42,8 @@ - (void)initUIContactDetailsHeader { propertyList = [[NSArray alloc] initWithObjects: [NSNumber numberWithInt:kABPersonFirstNameProperty], - [NSNumber numberWithInt:kABPersonLastNameProperty], nil]; + [NSNumber numberWithInt:kABPersonLastNameProperty], + [NSNumber numberWithInt:kABPersonOrganizationProperty], nil]; editing = FALSE; } @@ -139,7 +140,7 @@ + (CGFloat)height:(BOOL)editing { if(editing) { - return 130.0f; + return 160.0f; } else { return 80.0f; } diff --git a/Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib b/Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib index 3448c3439..729262f8a 100644 --- a/Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib +++ b/Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib @@ -2,9 +2,9 @@ 1536 - 11E53 + 11G63 2840 - 1138.47 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -43,6 +43,7 @@ 292 {{-13, -5}, {131, 107}} + _NS:9 NO @@ -57,6 +58,7 @@ 292 {{20, 6}, {65, 65}} + _NS:9 NO @@ -71,6 +73,7 @@ 292 {{20, 6}, {65, 65}} + _NS:9 NO @@ -112,6 +115,7 @@ 290 {{0, 37}, {199, 43}} + _NS:9 NO @@ -143,6 +147,7 @@ {{101, 0}, {219, 80}} + _NS:9 @@ -158,8 +163,10 @@ 274 - {219, 130} + {219, 160} + + _NS:9 1 @@ -178,16 +185,18 @@ 10 - {{101, 0}, {219, 130}} + {{101, 0}, {219, 160}} + _NS:9 IBCocoaTouchFramework - {320, 130} + {320, 160} + _NS:9 @@ -370,7 +379,63 @@ 23 - + + + + UIContactDetailsHeader + UIViewController + + onAvatarClick: + id + + + onAvatarClick: + + onAvatarClick: + id + + + + UILabel + UIImageView + id + UIView + UIView + UITableView + + + + addressLabel + UILabel + + + avatarImage + UIImageView + + + contactDetailsDelegate + id + + + editView + UIView + + + normalView + UIView + + + tableView + UITableView + + + + IBProjectSource + ./Classes/UIContactDetailsHeader.h + + + + 0 IBCocoaTouchFramework YES diff --git a/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib b/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib index b1b2452be..f08ae22f4 100644 --- a/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib +++ b/Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib @@ -1,22 +1,22 @@ - 1280 - 11E53 - 1938 - 1138.47 + 1536 + 11G63 + 2840 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 933 + 1926 - IBUIButton - IBUITableView - IBUIImageView - IBUIView - IBUILabel IBProxyObject + IBUIButton + IBUIImageView + IBUILabel + IBUITableView + IBUIView com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -158,63 +158,12 @@ 274 - {219, 130} + {219, 160} _NS:9 - 10 - - 549453824 - {512, 1} - - - - - - TU0AKgAACAjFzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/wANAQAAAwAAAAECAAAAAQEAAwAAAAEAAQAAAQIAAwAAAAQAAAiqAQMAAwAA -AAEAAQAAAQYAAwAAAAEAAgAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEABAAAARYAAwAA -AAEAAQAAARcABAAAAAEAAAgAARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAQAAAiyAAAAAAAI -AAgACAAIAAEAAQABAAE - - - - - - + 1 + MCAwIDAgMAA groupTableViewBackgroundColor YES @@ -229,7 +178,7 @@ AAgACAAIAAEAAQABAAE 10 - {{101, 0}, {219, 130}} + {{101, 0}, {219, 160}} _NS:9 @@ -237,7 +186,7 @@ AAgACAAIAAEAAQABAAE IBCocoaTouchFramework - {320, 130} + {320, 160} _NS:9 @@ -420,7 +369,63 @@ AAgACAAIAAEAAQABAAE 23 - + + + + UIContactDetailsHeader + UIViewController + + onAvatarClick: + id + + + onAvatarClick: + + onAvatarClick: + id + + + + UILabel + UIImageView + id + UIView + UIView + UITableView + + + + addressLabel + UILabel + + + avatarImage + UIImageView + + + contactDetailsDelegate + id + + + editView + UIView + + + normalView + UIView + + + tableView + UITableView + + + + IBProjectSource + ./Classes/UIContactDetailsHeader.h + + + + 0 IBCocoaTouchFramework YES @@ -429,6 +434,6 @@ AAgACAAIAAEAAQABAAE {262, 214} {131, 131} - 933 + 1926 diff --git a/Classes/PhoneMainView.h b/Classes/PhoneMainView.h index bd8aaeec7..0f62eb42d 100644 --- a/Classes/PhoneMainView.h +++ b/Classes/PhoneMainView.h @@ -47,6 +47,7 @@ int loadCount; NSMutableArray *viewStack; NSMutableArray *inhibitedEvents; + NSTimer *batteryTimer; } @property (nonatomic, retain) IBOutlet UICompositeViewController *mainViewController; diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index 5aa1c3fae..8392df26b 100644 --- a/Classes/PhoneMainView.m +++ b/Classes/PhoneMainView.m @@ -116,6 +116,8 @@ static PhoneMainView* phoneMainViewInstance=nil; name:UIDeviceBatteryLevelDidChangeNotification object:nil]; [[UIDevice currentDevice] setBatteryMonitoringEnabled:YES]; + + batteryTimer = [NSTimer scheduledTimerWithTimeInterval:10.0f target:self selector:@selector(batteryLevelChanged:) userInfo:nil repeats:TRUE]; } - (void)viewWillDisappear:(BOOL)animated { @@ -139,6 +141,8 @@ static PhoneMainView* phoneMainViewInstance=nil; name:UIDeviceBatteryLevelDidChangeNotification object:nil]; [[UIDevice currentDevice] setBatteryMonitoringEnabled:NO]; + + [batteryTimer invalidate]; } - (void)viewDidAppear:(BOOL)animated { @@ -342,7 +346,7 @@ static PhoneMainView* phoneMainViewInstance=nil; } else { // Change to default view const MSList *list = linphone_core_get_proxy_config_list([LinphoneManager getLc]); - if(list != NULL) { + if(list != NULL || ([[LinphoneManager instance] lpConfigBoolForKey:@"hide_wizard_preference"] == true)) { [self changeCurrentView: [DialerViewController compositeViewDescription]]; } else { WizardViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[WizardViewController compositeViewDescription]], WizardViewController); @@ -577,30 +581,35 @@ static PhoneMainView* phoneMainViewInstance=nil; } - (void)batteryLevelChanged:(NSNotification*)notif { + float level = [UIDevice currentDevice].batteryLevel; + UIDeviceBatteryState state = [UIDevice currentDevice].batteryState; + [LinphoneLogger log:LinphoneLoggerLog format:@"Battery state:%d level:%.2f", state, level]; + if (![LinphoneManager isLcReady]) return; LinphoneCall* call = linphone_core_get_current_call([LinphoneManager getLc]); - if (!call || !linphone_call_params_video_enabled(linphone_call_get_current_params(call))) - return; - LinphoneCallAppData* appData = (LinphoneCallAppData*) linphone_call_get_user_pointer(call); - float level = [UIDevice currentDevice].batteryLevel; - if ([UIDevice currentDevice].batteryState == UIDeviceBatteryStateUnplugged) { - [LinphoneLogger logc:LinphoneLoggerLog format:"Video call is running. Battery level: %.2f", level]; - if (level < 0.1 && !appData->batteryWarningShown) { - DTActionSheet *sheet = [[[DTActionSheet alloc] initWithTitle:NSLocalizedString(@"Battery is running low. Stop video ?",nil)] autorelease]; - [sheet addCancelButtonWithTitle:NSLocalizedString(@"Continue video", nil)]; - [sheet addDestructiveButtonWithTitle:NSLocalizedString(@"Stop video", nil) block:^() { - LinphoneCallParams* paramsCopy = linphone_call_params_copy(linphone_call_get_current_params(call)); - // stop video - linphone_call_params_enable_video(paramsCopy, FALSE); - linphone_core_update_call([LinphoneManager getLc], call, paramsCopy); - }]; - [sheet showInView:self.view]; - appData->batteryWarningShown = TRUE; + if (call && linphone_call_params_video_enabled(linphone_call_get_current_params(call))) { + LinphoneCallAppData* callData = (LinphoneCallAppData*) linphone_call_get_user_pointer(call); + if(callData != nil) { + if (state == UIDeviceBatteryStateUnplugged) { + if (level <= 0.2f && !callData->batteryWarningShown) { + [LinphoneLogger log:LinphoneLoggerLog format:@"Battery warning"]; + DTActionSheet *sheet = [[[DTActionSheet alloc] initWithTitle:NSLocalizedString(@"Battery is running low. Stop video ?",nil)] autorelease]; + [sheet addCancelButtonWithTitle:NSLocalizedString(@"Continue video", nil)]; + [sheet addDestructiveButtonWithTitle:NSLocalizedString(@"Stop video", nil) block:^() { + LinphoneCallParams* paramsCopy = linphone_call_params_copy(linphone_call_get_current_params(call)); + // stop video + linphone_call_params_enable_video(paramsCopy, FALSE); + linphone_core_update_call([LinphoneManager getLc], call, paramsCopy); + }]; + [sheet showInView:self.view]; + callData->batteryWarningShown = TRUE; + } + } + if (level > 0.2f) { + callData->batteryWarningShown = FALSE; + } } } - if (level >= 0.1) { - appData->batteryWarningShown = FALSE; - } } diff --git a/Classes/PhoneMainView.xib b/Classes/PhoneMainView.xib index e81cbe2de..4a6d46b1a 100644 --- a/Classes/PhoneMainView.xib +++ b/Classes/PhoneMainView.xib @@ -2,9 +2,9 @@ 784 - 11E53 + 11G63 2840 - 1138.47 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m index c05f98832..c190d1e7d 100644 --- a/Classes/SettingsViewController.m +++ b/Classes/SettingsViewController.m @@ -638,7 +638,10 @@ static UICompositeViewDescription *compositeDescription = nil; if(![LinphoneManager runningOnIpad]) { [hiddenKeys addObject:@"preview_preference"]; } - + if([[LinphoneManager instance] lpConfigBoolForKey:@"hide_run_assistant_preference"]) { + [hiddenKeys addObject:@"wizard_button"]; + } + return hiddenKeys; } diff --git a/Classes/Utils/Utils.m b/Classes/Utils/Utils.m index 8e7b39d1d..fe19abf08 100644 --- a/Classes/Utils/Utils.m +++ b/Classes/Utils/Utils.m @@ -27,10 +27,10 @@ va_list args; va_start (args, format); NSString *str = [[NSString alloc] initWithFormat: format arguments:args]; - if(severity <= LinphoneLoggerLog) { - ms_message("%s", [str UTF8String]); - } else if(severity <= LinphoneLoggerDebug) { + if(severity <= LinphoneLoggerDebug) { ms_debug("%s", [str UTF8String]); + } else if(severity <= LinphoneLoggerLog) { + ms_message("%s", [str UTF8String]); } else if(severity <= LinphoneLoggerWarning) { ms_warning("%s", [str UTF8String]); } else if(severity <= LinphoneLoggerError) { @@ -45,13 +45,13 @@ + (void)logc:(LinphoneLoggerSeverity) severity format:(const char *)format,... { va_list args; va_start (args, format); - if(severity <= LinphoneLoggerLog) { - ortp_logv(ORTP_MESSAGE, format, args); - } else if(severity <= LinphoneLoggerDebug) { + if(severity <= LinphoneLoggerDebug) { ortp_logv(ORTP_DEBUG, format, args); + } else if(severity <= LinphoneLoggerLog) { + ortp_logv(ORTP_MESSAGE, format, args); } else if(severity <= LinphoneLoggerWarning) { ortp_logv(ORTP_WARNING, format, args); - } else if(severity <= LinphoneLoggerError) { + } else if(severity <= LinphoneLoggerError) { ortp_logv(ORTP_ERROR, format, args); } else if(severity <= LinphoneLoggerFatal) { ortp_logv(ORTP_FATAL, format, args); diff --git a/Classes/WizardViewController.m b/Classes/WizardViewController.m index 2d9b17c23..f11d51a34 100644 --- a/Classes/WizardViewController.m +++ b/Classes/WizardViewController.m @@ -374,7 +374,7 @@ static UICompositeViewDescription *compositeDescription = nil; } - (void)checkUserExist:(NSString*)username { - [LinphoneLogger log:LinphoneLoggerDebug format:@"XMLRPC check_account %@", username]; + [LinphoneLogger log:LinphoneLoggerLog format:@"XMLRPC check_account %@", username]; NSURL *URL = [NSURL URLWithString:[[LinphoneManager instance] lpConfigStringForKey:@"service_url" forSection:@"wizard"]]; XMLRPCRequest *request = [[XMLRPCRequest alloc] initWithURL: URL]; @@ -389,7 +389,7 @@ static UICompositeViewDescription *compositeDescription = nil; - (void)createAccount:(NSString*)identity password:(NSString*)password email:(NSString*)email { NSString *useragent = [LinphoneManager getUserAgent]; - [LinphoneLogger log:LinphoneLoggerDebug format:@"XMLRPC create_account_with_useragent %@ %@ %@ %@", identity, password, email, useragent]; + [LinphoneLogger log:LinphoneLoggerLog format:@"XMLRPC create_account_with_useragent %@ %@ %@ %@", identity, password, email, useragent]; NSURL *URL = [NSURL URLWithString: [[LinphoneManager instance] lpConfigStringForKey:@"service_url" forSection:@"wizard"]]; XMLRPCRequest *request = [[XMLRPCRequest alloc] initWithURL: URL]; @@ -403,7 +403,7 @@ static UICompositeViewDescription *compositeDescription = nil; } - (void)checkAccountValidation:(NSString*)identity { - [LinphoneLogger log:LinphoneLoggerDebug format:@"XMLRPC check_account_validated %@", identity]; + [LinphoneLogger log:LinphoneLoggerLog format:@"XMLRPC check_account_validated %@", identity]; NSURL *URL = [NSURL URLWithString: [[LinphoneManager instance] lpConfigStringForKey:@"service_url" forSection:@"wizard"]]; XMLRPCRequest *request = [[XMLRPCRequest alloc] initWithURL: URL]; @@ -659,7 +659,7 @@ static UICompositeViewDescription *compositeDescription = nil; #pragma mark - XMLRPCConnectionDelegate Functions - (void)request:(XMLRPCRequest *)request didReceiveResponse:(XMLRPCResponse *)response { - [LinphoneLogger log:LinphoneLoggerDebug format:@"XMLRPC %@: %@", [request method], [response body]]; + [LinphoneLogger log:LinphoneLoggerLog format:@"XMLRPC %@: %@", [request method], [response body]]; [waitView setHidden:true]; if ([response isFault]) { NSString *errorString = [NSString stringWithFormat:NSLocalizedString(@"Communication issue (%@)", nil), [response faultString]]; diff --git a/Classes/en.lproj/ContactDetailsLabelViewController.xib b/Classes/en.lproj/ContactDetailsLabelViewController.xib index 5a1cdfbe1..18e50e4a0 100644 --- a/Classes/en.lproj/ContactDetailsLabelViewController.xib +++ b/Classes/en.lproj/ContactDetailsLabelViewController.xib @@ -3,12 +3,12 @@ 1536 11E53 - 2840 + 2844 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 1930 IBProxyObject @@ -318,6 +318,6 @@ {320, 88} {5, 88} - 1926 + 1930 diff --git a/Classes/en.lproj/ContactDetailsViewController.xib b/Classes/en.lproj/ContactDetailsViewController.xib index b17eb8066..b1421d105 100644 --- a/Classes/en.lproj/ContactDetailsViewController.xib +++ b/Classes/en.lproj/ContactDetailsViewController.xib @@ -2,13 +2,13 @@ 1536 - 11G56 - 2840 - 1138.51 + 11E53 + 2844 + 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 1930 IBProxyObject @@ -48,7 +48,6 @@ 290 {320, 44} - _NS:9 NO @@ -63,7 +62,6 @@ 292 {160, 44} - _NS:9 NO @@ -110,7 +108,6 @@ -2147483356 {160, 44} - _NS:9 NO @@ -148,7 +145,6 @@ 289 {{160, 0}, {160, 44}} - _NS:9 NO @@ -191,7 +187,6 @@ {320, 44} - _NS:9 @@ -208,7 +203,6 @@ 306 {{0, 44}, {320, 416}} - _NS:9 1 @@ -238,7 +232,6 @@ {320, 460} - 3 @@ -533,182 +526,7 @@ 62 - - - - ContactDetailsTableViewController - UITableViewController - - id - UIContactDetailsFooter - UIContactDetailsHeader - - - - contactDetailsDelegate - id - - - footerController - UIContactDetailsFooter - - - headerController - UIContactDetailsHeader - - - - IBProjectSource - ./Classes/ContactDetailsTableViewController.h - - - - ContactDetailsViewController - UIViewController - - id - id - id - - - - onBackClick: - id - - - onCancelClick: - id - - - onEditClick: - id - - - - UIButton - UIButton - UIToggleButton - ContactDetailsTableViewController - - - - backButton - UIButton - - - cancelButton - UIButton - - - editButton - UIToggleButton - - - tableController - ContactDetailsTableViewController - - - - IBProjectSource - ./Classes/ContactDetailsViewController.h - - - - UIContactDetailsFooter - UIViewController - - onRemoveClick: - id - - - onRemoveClick: - - onRemoveClick: - id - - - - id - UIButton - - - - contactDetailsDelegate - id - - - removeButton - UIButton - - - - IBProjectSource - ./Classes/UIContactDetailsFooter.h - - - - UIContactDetailsHeader - UIViewController - - onAvatarClick: - id - - - onAvatarClick: - - onAvatarClick: - id - - - - UILabel - UIImageView - id - UIView - UIView - UITableView - - - - addressLabel - UILabel - - - avatarImage - UIImageView - - - contactDetailsDelegate - id - - - editView - UIView - - - normalView - UIView - - - tableView - UITableView - - - - IBProjectSource - ./Classes/UIContactDetailsHeader.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - + 0 IBCocoaTouchFramework YES @@ -723,6 +541,6 @@ {320, 88} {5, 88} - 1926 + 1930 diff --git a/Classes/en.lproj/ContactsViewController.xib b/Classes/en.lproj/ContactsViewController.xib index fef3173c9..5b7aeaebc 100644 --- a/Classes/en.lproj/ContactsViewController.xib +++ b/Classes/en.lproj/ContactsViewController.xib @@ -3,12 +3,12 @@ 1536 11E53 - 2840 + 2844 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 1930 IBProxyObject @@ -47,6 +47,7 @@ 290 {320, 44} + _NS:9 NO @@ -65,6 +66,7 @@ 292 {107, 44} + _NS:9 NO @@ -117,6 +119,7 @@ 289 {{107, 0}, {107, 44}} + _NS:9 NO @@ -151,6 +154,7 @@ {{106, 0}, {214, 44}} + _NS:9 @@ -167,6 +171,7 @@ 292 {107, 44} + _NS:9 NO @@ -214,6 +219,7 @@ -2147483356 {107, 44} + _NS:9 NO @@ -246,6 +252,7 @@ {320, 44} + _NS:9 @@ -260,6 +267,7 @@ 274 {{0, 44}, {320, 416}} + _NS:10 3 @@ -291,6 +299,7 @@ {320, 460} + _NS:9 @@ -555,7 +564,84 @@ 94 - + + + + ContactsTableViewController + UITableViewController + + IBProjectSource + ./Classes/ContactsTableViewController.h + + + + ContactsViewController + UIViewController + + id + id + id + id + + + + onAddContactClick: + id + + + onAllClick: + id + + + onBackClick: + id + + + onLinphoneClick: + id + + + + UIButton + UIButton + UIButton + UIButton + ContactsTableViewController + UITableView + + + + addButton + UIButton + + + allButton + UIButton + + + backButton + UIButton + + + linphoneButton + UIButton + + + tableController + ContactsTableViewController + + + tableView + UITableView + + + + IBProjectSource + ./Classes/ContactsViewController.h + + + + 0 IBCocoaTouchFramework YES @@ -571,6 +657,6 @@ {213, 88} {5, 88} - 1926 + 1930 diff --git a/Classes/fr.lproj/ContactDetailsLabelViewController.xib b/Classes/fr.lproj/ContactDetailsLabelViewController.xib index bd2befa68..63a6214c5 100644 --- a/Classes/fr.lproj/ContactDetailsLabelViewController.xib +++ b/Classes/fr.lproj/ContactDetailsLabelViewController.xib @@ -1,21 +1,21 @@ - 1280 + 1536 11E53 - 1938 + 2844 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 933 + 1930 - IBUITableView - IBUIButton - IBUIView - IBUIImageView IBProxyObject + IBUIButton + IBUIImageView + IBUITableView + IBUIView com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -143,62 +143,8 @@ _NS:9 - 10 - - 549453824 - {512, 1} - - - - - - TU0AKgAACAjFzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/ -y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/ -y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/ -xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/ -xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/ -xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/ -xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/ -xczS/8vS2P/L0tj/xczU/wANAQAAAwAAAAECAAAAAQEAAwAAAAEAAQAAAQIAAwAAAAQAAAiqAQMAAwAA -AAEAAQAAAQYAAwAAAAEAAgAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEABAAAARYAAwAA -AAEAAQAAARcABAAAAAEAAAgAARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAQAAAiyAAAAAAAI -AAgACAAIAAEAAQABAAE - - - - - - 3 - MCAwAA - - + 1 + MCAwIDAgMAA groupTableViewBackgroundColor YES @@ -224,7 +170,10 @@ AAgACAAIAAEAAQABAAE {320, 460} - + + 3 + MCAwAA + IBCocoaTouchFramework @@ -368,6 +317,6 @@ AAgACAAIAAEAAQABAAE {320, 88} {5, 88} - 933 + 1930 diff --git a/Classes/fr.lproj/ContactDetailsViewController.xib b/Classes/fr.lproj/ContactDetailsViewController.xib index dc9831ee7..d5b9c0d7e 100644 --- a/Classes/fr.lproj/ContactDetailsViewController.xib +++ b/Classes/fr.lproj/ContactDetailsViewController.xib @@ -2,13 +2,13 @@ 1536 - 11G56 - 2840 - 1138.51 + 11E53 + 2844 + 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 1930 IBProxyObject @@ -525,182 +525,7 @@ 62 - - - - ContactDetailsTableViewController - UITableViewController - - id - UIContactDetailsFooter - UIContactDetailsHeader - - - - contactDetailsDelegate - id - - - footerController - UIContactDetailsFooter - - - headerController - UIContactDetailsHeader - - - - IBProjectSource - ./Classes/ContactDetailsTableViewController.h - - - - ContactDetailsViewController - UIViewController - - id - id - id - - - - onBackClick: - id - - - onCancelClick: - id - - - onEditClick: - id - - - - UIButton - UIButton - UIToggleButton - ContactDetailsTableViewController - - - - backButton - UIButton - - - cancelButton - UIButton - - - editButton - UIToggleButton - - - tableController - ContactDetailsTableViewController - - - - IBProjectSource - ./Classes/ContactDetailsViewController.h - - - - UIContactDetailsFooter - UIViewController - - onRemoveClick: - id - - - onRemoveClick: - - onRemoveClick: - id - - - - id - UIButton - - - - contactDetailsDelegate - id - - - removeButton - UIButton - - - - IBProjectSource - ./Classes/UIContactDetailsFooter.h - - - - UIContactDetailsHeader - UIViewController - - onAvatarClick: - id - - - onAvatarClick: - - onAvatarClick: - id - - - - UILabel - UIImageView - id - UIView - UIView - UITableView - - - - addressLabel - UILabel - - - avatarImage - UIImageView - - - contactDetailsDelegate - id - - - editView - UIView - - - normalView - UIView - - - tableView - UITableView - - - - IBProjectSource - ./Classes/UIContactDetailsHeader.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - + 0 IBCocoaTouchFramework YES @@ -715,6 +540,6 @@ {320, 88} {5, 88} - 1926 + 1930 diff --git a/Classes/fr.lproj/ContactsViewController.xib b/Classes/fr.lproj/ContactsViewController.xib index 4629e79bd..dc083bc75 100644 --- a/Classes/fr.lproj/ContactsViewController.xib +++ b/Classes/fr.lproj/ContactsViewController.xib @@ -1,22 +1,22 @@ - 1280 + 1536 11E53 - 1938 + 2844 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 933 + 1930 - IBUIImageView - IBUIButton - IBUITableView - IBUIView - IBUITableViewController IBProxyObject + IBUIButton + IBUIImageView + IBUITableView + IBUITableViewController + IBUIView com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -554,7 +554,84 @@ 94 - + + + + ContactsTableViewController + UITableViewController + + IBProjectSource + ./Classes/ContactsTableViewController.h + + + + ContactsViewController + UIViewController + + id + id + id + id + + + + onAddContactClick: + id + + + onAllClick: + id + + + onBackClick: + id + + + onLinphoneClick: + id + + + + UIButton + UIButton + UIButton + UIButton + ContactsTableViewController + UITableView + + + + addButton + UIButton + + + allButton + UIButton + + + backButton + UIButton + + + linphoneButton + UIButton + + + tableController + ContactsTableViewController + + + tableView + UITableView + + + + IBProjectSource + ./Classes/ContactsViewController.h + + + + 0 IBCocoaTouchFramework YES @@ -570,6 +647,6 @@ {213, 88} {5, 88} - 933 + 1930 diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings index a85e45a15..784e44860 100644 Binary files a/Resources/en.lproj/Localizable.strings and b/Resources/en.lproj/Localizable.strings differ diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings index 55e7ada25..31236f4fd 100644 Binary files a/Resources/fr.lproj/Localizable.strings and b/Resources/fr.lproj/Localizable.strings differ diff --git a/Resources/iTunesArtwork b/iTunesArtwork similarity index 100% rename from Resources/iTunesArtwork rename to iTunesArtwork diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist index 2dc564216..6f5bdfb7a 100644 --- a/linphone.ldb/Contents.plist +++ b/linphone.ldb/Contents.plist @@ -24,17 +24,17 @@ backup - 5 + 6 class BLWrapperHandle name - Classes/ContactDetailsViewController/5/ContactDetailsViewController.xib + Classes/ContactDetailsViewController/6/ContactDetailsViewController.xib change date - 2012-10-12T07:54:44Z + 2012-12-06T16:14:16Z changed values class @@ -44,7 +44,7 @@ flags 0 hash - f826110f6bb9c9f39b9191f041a2e184 + 5a206fff1944a6ff2a10814f0ff35a15 name ContactDetailsViewController.xib @@ -233,9 +233,9 @@ versions en - 5 + 6 fr - 5 + 6 @@ -243,17 +243,17 @@ backup - 4 + 5 class BLWrapperHandle name - Classes/ContactDetailsLabelViewController/4/ContactDetailsLabelViewController.xib + Classes/ContactDetailsLabelViewController/5/ContactDetailsLabelViewController.xib change date - 2012-09-25T09:16:19Z + 2012-12-06T16:14:16Z changed values class @@ -263,7 +263,7 @@ flags 0 hash - 5c405771bb00fa3b9d58151b4f959205 + 1628c1686cfb982660e726c2f8118ebb name ContactDetailsLabelViewController.xib @@ -327,9 +327,9 @@ versions en - 4 + 5 fr - 4 + 5 @@ -1048,17 +1048,17 @@ backup - 13 + 14 class BLWrapperHandle name - Classes/ContactsViewController/13/ContactsViewController.xib + Classes/ContactsViewController/14/ContactsViewController.xib change date - 2012-09-25T09:16:19Z + 2012-12-06T16:04:33Z changed values class @@ -1068,7 +1068,7 @@ flags 0 hash - 8e543e6857c6d386b26dfcbb630432f3 + 55cfac63b99a2e8b631ee79f15a579c5 name ContactsViewController.xib @@ -1358,9 +1358,9 @@ versions en - 13 + 14 fr - 13 + 14 @@ -11072,17 +11072,17 @@ backup - 4 + 5 class BLWrapperHandle name - LinphoneUI/UIContactDetailsHeader/4/UIContactDetailsHeader.xib + LinphoneUI/UIContactDetailsHeader/5/UIContactDetailsHeader.xib change date - 2012-09-25T09:16:21Z + 2012-12-20T13:07:09Z changed values class @@ -11092,7 +11092,7 @@ flags 0 hash - a3054fa100ec1a034084f20d8b1369d9 + b230aead5bd66e84a58b749ed6a37680 name UIContactDetailsHeader.xib @@ -11179,9 +11179,9 @@ versions en - 4 + 5 fr - 4 + 5 @@ -12175,7 +12175,7 @@ change date - 2012-10-16T09:25:05Z + 2012-12-06T16:35:25Z changed values class @@ -12185,7 +12185,7 @@ flags 0 hash - c50a71e6174b7a7b723ffa38dd90788b + 5d8dda6d0a22dfa9f07da63202a55cbb name Localizable.strings @@ -13219,6 +13219,52 @@ La cause était: %2$@ snapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 2 + key + GNU General Public License V2 + localizations + + en + GNU General Public License V2 + + snapshots + + + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 2 + key + http://www.linphone.org + localizations + + en + http://www.linphone.org + + snapshots + + change date 2001-01-01T00:00:00Z @@ -14511,6 +14557,29 @@ Activer l'application dans Réglages > Confidentialité > Contactssnapshots + + change date + 2001-01-01T00:00:00Z + changed values + + class + BLStringKeyObject + comment + No comment provided by engineer. + errors + + flags + 2 + key + © 2010-2012 Belledonne Communications + localizations + + en + © 2010-2012 Belledonne Communications + + snapshots + + old objects diff --git a/linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/4/ContactDetailsLabelViewController.xib b/linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/5/ContactDetailsLabelViewController.xib similarity index 98% rename from linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/4/ContactDetailsLabelViewController.xib rename to linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/5/ContactDetailsLabelViewController.xib index 5a1cdfbe1..18e50e4a0 100644 --- a/linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/4/ContactDetailsLabelViewController.xib +++ b/linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/5/ContactDetailsLabelViewController.xib @@ -3,12 +3,12 @@ 1536 11E53 - 2840 + 2844 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 1930 IBProxyObject @@ -318,6 +318,6 @@ {320, 88} {5, 88} - 1926 + 1930 diff --git a/linphone.ldb/Resources/Classes/ContactDetailsViewController/5/ContactDetailsViewController.xib b/linphone.ldb/Resources/Classes/ContactDetailsViewController/6/ContactDetailsViewController.xib similarity index 74% rename from linphone.ldb/Resources/Classes/ContactDetailsViewController/5/ContactDetailsViewController.xib rename to linphone.ldb/Resources/Classes/ContactDetailsViewController/6/ContactDetailsViewController.xib index b17eb8066..b1421d105 100644 --- a/linphone.ldb/Resources/Classes/ContactDetailsViewController/5/ContactDetailsViewController.xib +++ b/linphone.ldb/Resources/Classes/ContactDetailsViewController/6/ContactDetailsViewController.xib @@ -2,13 +2,13 @@ 1536 - 11G56 - 2840 - 1138.51 + 11E53 + 2844 + 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 1930 IBProxyObject @@ -48,7 +48,6 @@ 290 {320, 44} - _NS:9 NO @@ -63,7 +62,6 @@ 292 {160, 44} - _NS:9 NO @@ -110,7 +108,6 @@ -2147483356 {160, 44} - _NS:9 NO @@ -148,7 +145,6 @@ 289 {{160, 0}, {160, 44}} - _NS:9 NO @@ -191,7 +187,6 @@ {320, 44} - _NS:9 @@ -208,7 +203,6 @@ 306 {{0, 44}, {320, 416}} - _NS:9 1 @@ -238,7 +232,6 @@ {320, 460} - 3 @@ -533,182 +526,7 @@ 62 - - - - ContactDetailsTableViewController - UITableViewController - - id - UIContactDetailsFooter - UIContactDetailsHeader - - - - contactDetailsDelegate - id - - - footerController - UIContactDetailsFooter - - - headerController - UIContactDetailsHeader - - - - IBProjectSource - ./Classes/ContactDetailsTableViewController.h - - - - ContactDetailsViewController - UIViewController - - id - id - id - - - - onBackClick: - id - - - onCancelClick: - id - - - onEditClick: - id - - - - UIButton - UIButton - UIToggleButton - ContactDetailsTableViewController - - - - backButton - UIButton - - - cancelButton - UIButton - - - editButton - UIToggleButton - - - tableController - ContactDetailsTableViewController - - - - IBProjectSource - ./Classes/ContactDetailsViewController.h - - - - UIContactDetailsFooter - UIViewController - - onRemoveClick: - id - - - onRemoveClick: - - onRemoveClick: - id - - - - id - UIButton - - - - contactDetailsDelegate - id - - - removeButton - UIButton - - - - IBProjectSource - ./Classes/UIContactDetailsFooter.h - - - - UIContactDetailsHeader - UIViewController - - onAvatarClick: - id - - - onAvatarClick: - - onAvatarClick: - id - - - - UILabel - UIImageView - id - UIView - UIView - UITableView - - - - addressLabel - UILabel - - - avatarImage - UIImageView - - - contactDetailsDelegate - id - - - editView - UIView - - - normalView - UIView - - - tableView - UITableView - - - - IBProjectSource - ./Classes/UIContactDetailsHeader.h - - - - UIToggleButton - UIButton - - IBProjectSource - ./Classes/UIToggleButton.h - - - - + 0 IBCocoaTouchFramework YES @@ -723,6 +541,6 @@ {320, 88} {5, 88} - 1926 + 1930 diff --git a/linphone.ldb/Resources/Classes/ContactsViewController/13/ContactsViewController.xib b/linphone.ldb/Resources/Classes/ContactsViewController/14/ContactsViewController.xib similarity index 87% rename from linphone.ldb/Resources/Classes/ContactsViewController/13/ContactsViewController.xib rename to linphone.ldb/Resources/Classes/ContactsViewController/14/ContactsViewController.xib index fef3173c9..5b7aeaebc 100644 --- a/linphone.ldb/Resources/Classes/ContactsViewController/13/ContactsViewController.xib +++ b/linphone.ldb/Resources/Classes/ContactsViewController/14/ContactsViewController.xib @@ -3,12 +3,12 @@ 1536 11E53 - 2840 + 2844 1138.47 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1926 + 1930 IBProxyObject @@ -47,6 +47,7 @@ 290 {320, 44} + _NS:9 NO @@ -65,6 +66,7 @@ 292 {107, 44} + _NS:9 NO @@ -117,6 +119,7 @@ 289 {{107, 0}, {107, 44}} + _NS:9 NO @@ -151,6 +154,7 @@ {{106, 0}, {214, 44}} + _NS:9 @@ -167,6 +171,7 @@ 292 {107, 44} + _NS:9 NO @@ -214,6 +219,7 @@ -2147483356 {107, 44} + _NS:9 NO @@ -246,6 +252,7 @@ {320, 44} + _NS:9 @@ -260,6 +267,7 @@ 274 {{0, 44}, {320, 416}} + _NS:10 3 @@ -291,6 +299,7 @@ {320, 460} + _NS:9 @@ -555,7 +564,84 @@ 94 - + + + + ContactsTableViewController + UITableViewController + + IBProjectSource + ./Classes/ContactsTableViewController.h + + + + ContactsViewController + UIViewController + + id + id + id + id + + + + onAddContactClick: + id + + + onAllClick: + id + + + onBackClick: + id + + + onLinphoneClick: + id + + + + UIButton + UIButton + UIButton + UIButton + ContactsTableViewController + UITableView + + + + addButton + UIButton + + + allButton + UIButton + + + backButton + UIButton + + + linphoneButton + UIButton + + + tableController + ContactsTableViewController + + + tableView + UITableView + + + + IBProjectSource + ./Classes/ContactsViewController.h + + + + 0 IBCocoaTouchFramework YES @@ -571,6 +657,6 @@ {213, 88} {5, 88} - 1926 + 1930 diff --git a/linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/4/UIContactDetailsHeader.xib b/linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/5/UIContactDetailsHeader.xib similarity index 84% rename from linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/4/UIContactDetailsHeader.xib rename to linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/5/UIContactDetailsHeader.xib index 3448c3439..729262f8a 100644 --- a/linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/4/UIContactDetailsHeader.xib +++ b/linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/5/UIContactDetailsHeader.xib @@ -2,9 +2,9 @@ 1536 - 11E53 + 11G63 2840 - 1138.47 + 1138.51 569.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -43,6 +43,7 @@ 292 {{-13, -5}, {131, 107}} + _NS:9 NO @@ -57,6 +58,7 @@ 292 {{20, 6}, {65, 65}} + _NS:9 NO @@ -71,6 +73,7 @@ 292 {{20, 6}, {65, 65}} + _NS:9 NO @@ -112,6 +115,7 @@ 290 {{0, 37}, {199, 43}} + _NS:9 NO @@ -143,6 +147,7 @@ {{101, 0}, {219, 80}} + _NS:9 @@ -158,8 +163,10 @@ 274 - {219, 130} + {219, 160} + + _NS:9 1 @@ -178,16 +185,18 @@ 10 - {{101, 0}, {219, 130}} + {{101, 0}, {219, 160}} + _NS:9 IBCocoaTouchFramework - {320, 130} + {320, 160} + _NS:9 @@ -370,7 +379,63 @@ 23 - + + + + UIContactDetailsHeader + UIViewController + + onAvatarClick: + id + + + onAvatarClick: + + onAvatarClick: + id + + + + UILabel + UIImageView + id + UIView + UIView + UITableView + + + + addressLabel + UILabel + + + avatarImage + UIImageView + + + contactDetailsDelegate + id + + + editView + UIView + + + normalView + UIView + + + tableView + UITableView + + + + IBProjectSource + ./Classes/UIContactDetailsHeader.h + + + + 0 IBCocoaTouchFramework YES diff --git a/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings b/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings index a85e45a15..784e44860 100644 Binary files a/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings and b/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings differ diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 133999f5d..e30ea39ee 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -154,6 +154,10 @@ D3012CC51610467D007CD926 /* linphone_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = D3012CC31610467D007CD926 /* linphone_logo.png */; }; D3012CC616105ECF007CD926 /* bubble.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8D91609A86700D3DA1A /* bubble.png */; }; D3012CC716105ECF007CD926 /* bubble.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F5F8D91609A86700D3DA1A /* bubble.png */; }; + D30562131671DC3E00C97967 /* libNinePatch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3B90E1915C2CB5800F64F8C /* libNinePatch.a */; }; + D30562141671DC3E00C97967 /* libXMLRPC.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3554ED115CA79AA00478841 /* libXMLRPC.a */; }; + D30562151671DC4900C97967 /* libNinePatch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3B90E1915C2CB5800F64F8C /* libNinePatch.a */; }; + D30562161671DC4900C97967 /* libXMLRPC.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3554ED115CA79AA00478841 /* libXMLRPC.a */; }; D306459E1611EC2A00BB571E /* UILoadingImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = D306459D1611EC2900BB571E /* UILoadingImageView.m */; }; D306459F1611EC2A00BB571E /* UILoadingImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = D306459D1611EC2900BB571E /* UILoadingImageView.m */; }; D30BBD1815D402A7000F93DD /* contact_ok_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D30BBD1715D402A7000F93DD /* contact_ok_disabled.png */; }; @@ -2307,6 +2311,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D30562151671DC4900C97967 /* libNinePatch.a in Frameworks */, + D30562161671DC4900C97967 /* libXMLRPC.a in Frameworks */, 22B5F03510CE6B2F00777D97 /* AddressBook.framework in Frameworks */, 22B5EFA310CE50BD00777D97 /* AddressBookUI.framework in Frameworks */, 22405EEE1600B4E400B92522 /* AssetsLibrary.framework in Frameworks */, @@ -2365,6 +2371,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D30562131671DC3E00C97967 /* libNinePatch.a in Frameworks */, + D30562141671DC3E00C97967 /* libXMLRPC.a in Frameworks */, 22D8F170147548E2008C97DB /* AVFoundation.framework in Frameworks */, 22D8F172147548E2008C97DB /* AddressBook.framework in Frameworks */, 22D8F171147548E2008C97DB /* AddressBookUI.framework in Frameworks */, @@ -5242,8 +5250,8 @@ submodules/externals/osip/include, submodules/externals/exosip/include, submodules/externals/speex/include, - classes/Utils/NinePatch/, - classes/Utils/XMLRPC/, + Classes/Utils/NinePatch/, + Classes/Utils/XMLRPC/, ); INFOPLIST_FILE = "linphone-Info.plist"; LIBRARY_SEARCH_PATHS = ( @@ -5253,13 +5261,7 @@ ); LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; - OTHER_LDFLAGS = ( - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", - "-Objc", - ); + OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = linphone; SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = "1,2"; @@ -5314,8 +5316,8 @@ submodules/externals/osip/include, submodules/externals/exosip/include, submodules/externals/speex/include, - classes/Utils/NinePatch/, - classes/Utils/XMLRPC/, + Classes/Utils/NinePatch/, + Classes/Utils/XMLRPC/, ); INFOPLIST_FILE = "linphone-Info.plist"; LIBRARY_SEARCH_PATHS = ( @@ -5325,13 +5327,7 @@ ); LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; - OTHER_LDFLAGS = ( - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", - "-Objc", - ); + OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = linphone; SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = "1,2"; @@ -5364,8 +5360,8 @@ submodules/externals/osip/include, submodules/externals/exosip/include, submodules/externals/speex/include, - classes/Utils/NinePatch/, - classes/Utils/XMLRPC/, + Classes/Utils/NinePatch/, + Classes/Utils/XMLRPC/, ); INFOPLIST_FILE = "linphone-Info.plist"; LIBRARY_SEARCH_PATHS = ( @@ -5375,13 +5371,7 @@ ); LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; - OTHER_LDFLAGS = ( - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", - "-Objc", - ); + OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "linphone-no-gpl-thirdparties"; SKIP_INSTALL = NO; }; @@ -5412,8 +5402,8 @@ submodules/externals/osip/include, submodules/externals/exosip/include, submodules/externals/speex/include, - classes/Utils/NinePatch/, - classes/Utils/XMLRPC/, + Classes/Utils/NinePatch/, + Classes/Utils/XMLRPC/, ); INFOPLIST_FILE = "linphone-Info.plist"; LIBRARY_SEARCH_PATHS = ( @@ -5423,13 +5413,7 @@ ); LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; - OTHER_LDFLAGS = ( - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", - "-Objc", - ); + OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "linphone-no-gpl-thirdparties"; SKIP_INSTALL = NO; }; @@ -5461,8 +5445,8 @@ submodules/externals/osip/include, submodules/externals/exosip/include, submodules/externals/speex/include, - classes/Utils/NinePatch/, - classes/Utils/XMLRPC/, + Classes/Utils/NinePatch/, + Classes/Utils/XMLRPC/, ); INFOPLIST_FILE = "linphone-Info.plist"; LIBRARY_SEARCH_PATHS = ( @@ -5472,13 +5456,7 @@ ); LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; - OTHER_LDFLAGS = ( - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", - "-Objc", - ); + OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "linphone-no-gpl-thirdparties"; SKIP_INSTALL = NO; }; @@ -5510,8 +5488,8 @@ submodules/externals/osip/include, submodules/externals/exosip/include, submodules/externals/speex/include, - classes/Utils/NinePatch/, - classes/Utils/XMLRPC/, + Classes/Utils/NinePatch/, + Classes/Utils/XMLRPC/, ); INFOPLIST_FILE = "linphone-Info.plist"; LIBRARY_SEARCH_PATHS = ( @@ -5521,13 +5499,7 @@ ); LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; - OTHER_LDFLAGS = ( - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", - "-Objc", - ); + OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "linphone-no-gpl-thirdparties"; SKIP_INSTALL = NO; }; @@ -5580,8 +5552,8 @@ submodules/externals/osip/include, submodules/externals/exosip/include, submodules/externals/speex/include, - classes/Utils/NinePatch/, - classes/Utils/XMLRPC/, + Classes/Utils/NinePatch/, + Classes/Utils/XMLRPC/, ); INFOPLIST_FILE = "linphone-Info.plist"; LIBRARY_SEARCH_PATHS = ( @@ -5591,13 +5563,7 @@ ); LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; - OTHER_LDFLAGS = ( - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", - "-Objc", - ); + OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = linphone; SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = "1,2"; @@ -5652,8 +5618,8 @@ submodules/externals/osip/include, submodules/externals/exosip/include, submodules/externals/speex/include, - classes/Utils/NinePatch/, - classes/Utils/XMLRPC/, + Classes/Utils/NinePatch/, + Classes/Utils/XMLRPC/, ); INFOPLIST_FILE = "linphone-Info.plist"; LIBRARY_SEARCH_PATHS = ( @@ -5663,13 +5629,7 @@ ); LINK_WITH_STANDARD_LIBRARIES = YES; ORDER_FILE = ""; - OTHER_LDFLAGS = ( - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libNinePatch.a", - "-force_load", - "$(BUILT_PRODUCTS_DIR)/libXMLRPC.a", - "-Objc", - ); + OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = linphone; SKIP_INSTALL = NO; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/submodules/externals/exosip b/submodules/externals/exosip index cbb76acfe..cb5a82765 160000 --- a/submodules/externals/exosip +++ b/submodules/externals/exosip @@ -1 +1 @@ -Subproject commit cbb76acfe36aaa0e79911569e218d77c622fa9d4 +Subproject commit cb5a8276531d2436f35bdddaca99665b88ee6e95 diff --git a/submodules/linphone b/submodules/linphone index 243016a97..643ea9925 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 243016a976f22ba31059aced9b5c748edb133e55 +Subproject commit 643ea99258887997010d0d05df4e21da00b700a8 diff --git a/submodules/msx264 b/submodules/msx264 index 6ba1b8699..f1fd3d6be 160000 --- a/submodules/msx264 +++ b/submodules/msx264 @@ -1 +1 @@ -Subproject commit 6ba1b86990d60f1a29d11a4e0cdd71d7b6b1b5bf +Subproject commit f1fd3d6be817dd5c1b8a46f68de04421f75cf056