diff --git a/Classes/MoreViewController.m b/Classes/MoreViewController.m index 70acb4cf4..889bf161d 100644 --- a/Classes/MoreViewController.m +++ b/Classes/MoreViewController.m @@ -32,7 +32,7 @@ //Implement viewDidLoad to do additional setup after loading the view, typically from a nib. - (void)viewDidLoad { [super viewDidLoad]; - [creditText setText: [NSString stringWithFormat:creditText.text,@"3.1.2"]]; + [creditText setText: [NSString stringWithFormat:creditText.text,[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]]]; consoleViewController = [[ConsoleViewController alloc] initWithNibName:@"ConsoleViewController" bundle:[NSBundle mainBundle]]; isDebug = [[NSUserDefaults standardUserDefaults] boolForKey:@"debugenable_preference"]; diff --git a/Classes/MoreViewController.xib b/Classes/MoreViewController.xib index 37ed2da9e..e35daa65b 100644 --- a/Classes/MoreViewController.xib +++ b/Classes/MoreViewController.xib @@ -1,17 +1,21 @@ - + 784 - 9L31a - 680 - 949.54 - 353.00 + 10D578 + 762 + 1038.29 + 460.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 87 + YES - - - + + + YES @@ -19,7 +23,7 @@ YES - + YES @@ -30,9 +34,11 @@ YES IBFilesOwner + IBCocoaTouchFramework IBFirstResponder + IBCocoaTouchFramework @@ -43,16 +49,22 @@ NO YES NO + IBCocoaTouchFramework NO 1 1 0 YES - 4.400000e+01 - 1.000000e+01 - 1.000000e+01 + 44 + 10 + 10 + + 1 + + IBCocoaTouchFramework + NO @@ -72,6 +84,7 @@ NO YES NO + IBCocoaTouchFramework http://www.linphone.org 1 @@ -79,10 +92,10 @@ 1 - 1.000000e+01 + 10 - {300, 43} + {300, 44} 3 @@ -92,6 +105,7 @@ YES 4 YES + IBCocoaTouchFramework {320, 44} @@ -101,6 +115,7 @@ MSAxIDEAA NO + IBCocoaTouchFramework 1 1 @@ -123,6 +138,7 @@ NO YES NO + IBCocoaTouchFramework Console 1 @@ -130,22 +146,24 @@ 1 - 1.000000e+01 + 10 - {300, 43} + {300, 44} NO YES 4 YES + IBCocoaTouchFramework {320, 44} NO + IBCocoaTouchFramework 1 1 @@ -167,11 +185,12 @@ NO NO - 4 + 1 NO + IBCocoaTouchFramework NSImage - linphone-3-250x130.png + linphone-banner.png @@ -182,24 +201,27 @@ NO YES YES + IBCocoaTouchFramework NO NO NO NO - TGlucGhvbmUgJUAg4oCoU0lQIChyZmMzMjYxKSBjb21wYXRpYmxlICBJbnRlcm5ldCBwaG9uZSAgIA + Linphone %@ 
SIP (rfc3261) compatible Internet phone 1 2 + IBCocoaTouchFramework - {322, 229} + {322, 230} NO YES 4 YES + IBCocoaTouchFramework {322, 230} @@ -207,6 +229,7 @@ NO NO + IBCocoaTouchFramework 1 @@ -260,22 +283,20 @@ YES 0 - - YES - + -1 - - RmlsZSdzIE93bmVyA + + File's Owner -2 - + 4 @@ -284,7 +305,7 @@ YES - + 25 @@ -293,7 +314,7 @@ YES - + web @@ -308,7 +329,7 @@ YES - + console @@ -324,7 +345,7 @@ - + about @@ -346,7 +367,7 @@ YES - + YES -1.CustomClassName -2.CustomClassName @@ -379,7 +400,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin {{79, 106}, {320, 480}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{462, 709}, {322, 230}} + {{295, 709}, {322, 230}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -387,9 +408,7 @@ YES - - YES - + YES @@ -397,9 +416,7 @@ YES - - YES - + YES @@ -415,7 +432,7 @@ UITableViewController YES - + YES console credit @@ -436,10 +453,278 @@ + + YES + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSError.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFileManager.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueObserving.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyedArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSNetServices.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObject.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSPort.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSRunLoop.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSStream.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSThread.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURL.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLConnection.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSXMLParser.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIAccessibility.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UINibLoading.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIResponder.h + + + + UIImageView + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIImageView.h + + + + UILabel + UIView + + IBFrameworkSource + UIKit.framework/Headers/UILabel.h + + + + UIResponder + NSObject + + + + UIScrollView + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIScrollView.h + + + + UISearchBar + UIView + + IBFrameworkSource + UIKit.framework/Headers/UISearchBar.h + + + + UISearchDisplayController + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UISearchDisplayController.h + + + + UITableView + UIScrollView + + IBFrameworkSource + UIKit.framework/Headers/UITableView.h + + + + UITableViewCell + UIView + + IBFrameworkSource + UIKit.framework/Headers/UITableViewCell.h + + + + UITableViewController + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UITableViewController.h + + + + UITextView + UIScrollView + + IBFrameworkSource + UIKit.framework/Headers/UITextView.h + + + + UIView + + IBFrameworkSource + UIKit.framework/Headers/UITextField.h + + + + UIView + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIView.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UINavigationController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UIPopoverController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UISplitViewController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UITabBarController.h + + + + UIViewController + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIViewController.h + + + 0 + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 + + + YES ../linphone.xcodeproj 3 - 3.1 + + linphone-banner.png + {300, 100} + + 87 diff --git a/Classes/PhoneViewController.m b/Classes/PhoneViewController.m index 7a6277b77..b0b511a16 100644 --- a/Classes/PhoneViewController.m +++ b/Classes/PhoneViewController.m @@ -52,13 +52,17 @@ @synthesize back; --(void)setPhoneNumber:(NSString*)number { - [address setText:number]; +-(void) erasedisplayName { if (displayName) { [displayName release]; displayName=nil; } } + +-(void)setPhoneNumber:(NSString*)number { + [address setText:number]; + [self erasedisplayName]; +} -(void)setPhoneNumber:(NSString*)number withDisplayName:(NSString*) name { [self setPhoneNumber:number]; displayName = name; @@ -278,6 +282,8 @@ - (BOOL)textFieldShouldReturn:(UITextField *)theTextField { if (theTextField == address) { [address resignFirstResponder]; + [self erasedisplayName]; //display name only relefvant + } return YES; } diff --git a/Classes/PhoneViewController.xib b/Classes/PhoneViewController.xib index 3263e8185..442e118b2 100644 --- a/Classes/PhoneViewController.xib +++ b/Classes/PhoneViewController.xib @@ -2,7 +2,7 @@ 784 - 10D573 + 10D578 762 1038.29 460.00 @@ -12,7 +12,7 @@ YES - + YES @@ -158,7 +158,6 @@ 0 0 - 1 1 @@ -169,6 +168,10 @@ NSImage startcall-green.png + + NSImage + clavier-01-160px.png + @@ -188,7 +191,7 @@ 292 - {{213, 90}, {107, 60}} + {{213, 91}, {107, 60}} NO NO @@ -196,7 +199,6 @@ 0 0 - 1 3 @@ -204,11 +206,15 @@ MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + NSImage + clavier-01-106px.png + 292 - {{0, 150}, {107, 60}} + {{0, 151}, {107, 60}} NO NO @@ -216,7 +222,6 @@ 0 0 - 1 4 @@ -224,11 +229,12 @@ MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + 292 - {{107, 150}, {106, 60}} + {{107, 151}, {106, 60}} NO NO @@ -236,7 +242,6 @@ 0 0 - 1 5 @@ -244,11 +249,15 @@ MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + + NSImage + clavier-01-108px.png + 292 - {{213, 150}, {107, 60}} + {{213, 151}, {107, 60}} NO NO @@ -256,7 +265,6 @@ 0 0 - 1 6 @@ -264,11 +272,12 @@ MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + 292 - {{0, 210}, {107, 60}} + {{0, 211}, {107, 60}} NO NO @@ -276,7 +285,6 @@ 0 0 - 1 7 @@ -284,11 +292,12 @@ MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + 292 - {{213, 210}, {107, 60}} + {{213, 211}, {107, 60}} NO NO @@ -296,7 +305,6 @@ 0 0 - 1 9 @@ -304,11 +312,12 @@ MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + 292 - {{107, 90}, {106, 60}} + {{107, 91}, {106, 60}} NO NO @@ -316,7 +325,6 @@ 0 0 - 1 2 @@ -324,11 +332,12 @@ MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + 292 - {{0, 90}, {107, 60}} + {{0, 91}, {107, 60}} 1 @@ -340,7 +349,6 @@ 0 0 - 1 1 @@ -348,11 +356,12 @@ MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + 292 - {{0, 270}, {107, 60}} + {{0, 271}, {107, 60}} NO NO @@ -360,7 +369,6 @@ 0 0 - 1 * @@ -368,11 +376,12 @@ MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + 292 - {{107, 270}, {106, 60}} + {{107, 271}, {106, 60}} NO NO @@ -380,7 +389,6 @@ 0 0 - 1 0+ @@ -388,11 +396,12 @@ MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + 292 - {{213, 270}, {107, 60}} + {{213, 271}, {107, 60}} NO NO @@ -400,7 +409,6 @@ 0 0 - 1 # @@ -408,11 +416,12 @@ MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + 292 - {{107, 210}, {106, 60}} + {{107, 211}, {106, 60}} NO NO @@ -420,7 +429,6 @@ 0 0 - 1 8 @@ -428,6 +436,7 @@ MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA + @@ -441,7 +450,6 @@ 0 0 - 1 1 @@ -452,6 +460,7 @@ NSImage stopcall-red.png + @@ -886,7 +895,6 @@ - @@ -896,6 +904,7 @@ + @@ -1104,7 +1113,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{41, 282}, {320, 480}} + {{390, 323}, {320, 480}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -1407,6 +1416,20 @@ UIKit.framework/Headers/UINavigationController.h + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UIPopoverController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UISplitViewController.h + + UIViewController @@ -1432,7 +1455,7 @@ com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 @@ -1446,6 +1469,9 @@ YES Speaker-32-off.png + clavier-01-106px.png + clavier-01-108px.png + clavier-01-160px.png mic_active.png startcall-green.png stopcall-red.png @@ -1453,6 +1479,9 @@ YES {32, 32} + {106, 60} + {108, 60} + {160, 60} {32, 32} {60, 52} {62, 54} diff --git a/Classes/linphoneAppDelegate.m b/Classes/linphoneAppDelegate.m index 0e6d344ac..aa5c5a4d6 100644 --- a/Classes/linphoneAppDelegate.m +++ b/Classes/linphoneAppDelegate.m @@ -97,7 +97,9 @@ LinphoneCoreVTable linphonec_vtable = { - (void)applicationDidEnterBackground:(UIApplication *)application { - +#if __IPHONE_OS_VERSION_MIN_REQUIRED > 40000 + <#statements#> + if (backgroundSupported) { if ([[UIApplication sharedApplication] setKeepAliveTimeout:(NSTimeInterval)300 handler:^{ms_warning("Handler invoked");}]) { @@ -106,7 +108,8 @@ LinphoneCoreVTable linphonec_vtable = { ms_warning("keepalive handler cannot be registered"); } - } + } +#endif } @@ -122,7 +125,7 @@ LinphoneCoreVTable linphonec_vtable = { UIDevice* device = [UIDevice currentDevice]; backgroundSupported = false; if ([device respondsToSelector:@selector(isMultitaskingSupported)]) - backgroundSupported = device.multitaskingSupported; + backgroundSupported = [device isMultitaskingSupported]; myPhoneViewController = (PhoneViewController*) [myTabBarController.viewControllers objectAtIndex: DIALER_TAB_INDEX]; diff --git a/Resources/clavier-01-106px.png b/Resources/clavier-01-106px.png new file mode 100644 index 000000000..d3ca4b813 Binary files /dev/null and b/Resources/clavier-01-106px.png differ diff --git a/Resources/clavier-01-108px.png b/Resources/clavier-01-108px.png new file mode 100644 index 000000000..9c84cb3dd Binary files /dev/null and b/Resources/clavier-01-108px.png differ diff --git a/Resources/clavier-01-160px.png b/Resources/clavier-01-160px.png new file mode 100644 index 000000000..e30025f84 Binary files /dev/null and b/Resources/clavier-01-160px.png differ diff --git a/linphone-Info.plist b/linphone-Info.plist index 43aedc875..079331bcc 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -23,9 +23,9 @@ CFBundleSignature ???? CFBundleVersion - 1.0.1 + 1.0.2 CFBundleShortVersionString - 3.1.3 + 3.1.4 NSMainNibFile PhoneMainView UIRequiredDeviceCapabilities diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index aaed3e0ff..c700c126a 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -38,6 +38,10 @@ 2245671D107699F700F10948 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 2245671C107699F700F10948 /* Settings.bundle */; }; 224567C2107B968500F10948 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 224567C1107B968500F10948 /* AVFoundation.framework */; }; 225862E21140F5D700C5A737 /* linphone-3-250x130.png in Resources */ = {isa = PBXBuildFile; fileRef = 225862E11140F5D700C5A737 /* linphone-3-250x130.png */; }; + 225CB2EA11ABB51000628906 /* clavier-01-106px.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2E811ABB51000628906 /* clavier-01-106px.png */; }; + 225CB2EB11ABB51000628906 /* clavier-01-108px.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2E911ABB51000628906 /* clavier-01-108px.png */; }; + 225CB2EE11ABB65D00628906 /* clavier-01-160px.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2ED11ABB65D00628906 /* clavier-01-160px.png */; }; + 225CB2FA11ABB76400628906 /* linphone-banner.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2F911ABB76400628906 /* linphone-banner.png */; }; 2264B6D211200342002C2C53 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2264B6D111200342002C2C53 /* SystemConfiguration.framework */; }; 2273785E10A3703300526073 /* libmsiounit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2273785D10A3703300526073 /* libmsiounit.a */; }; 2274401A106F31BD006EC466 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22744019106F31BD006EC466 /* CoreAudio.framework */; }; @@ -203,6 +207,10 @@ 224567C1107B968500F10948 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; 225862E11140F5D700C5A737 /* linphone-3-250x130.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone-3-250x130.png"; path = "../liblinphone-sdk/apple-darwin/share/pixmaps/linphone/linphone-3-250x130.png"; sourceTree = SOURCE_ROOT; }; 2258633C11410BAC00C5A737 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = ""; }; + 225CB2E811ABB51000628906 /* clavier-01-106px.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "clavier-01-106px.png"; path = "Resources/clavier-01-106px.png"; sourceTree = ""; }; + 225CB2E911ABB51000628906 /* clavier-01-108px.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "clavier-01-108px.png"; path = "Resources/clavier-01-108px.png"; sourceTree = ""; }; + 225CB2ED11ABB65D00628906 /* clavier-01-160px.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "clavier-01-160px.png"; path = "Resources/clavier-01-160px.png"; sourceTree = ""; }; + 225CB2F911ABB76400628906 /* linphone-banner.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone-banner.png"; path = "../liblinphone-sdk/apple-darwin/share/pixmaps/linphone/linphone-banner.png"; sourceTree = SOURCE_ROOT; }; 2264B6D111200342002C2C53 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; 2273785D10A3703300526073 /* libmsiounit.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmsiounit.a; path = "../liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmsiounit.a"; sourceTree = SOURCE_ROOT; }; 22744019106F31BD006EC466 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; @@ -536,6 +544,10 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( + 225CB2F911ABB76400628906 /* linphone-banner.png */, + 225CB2ED11ABB65D00628906 /* clavier-01-160px.png */, + 225CB2E811ABB51000628906 /* clavier-01-106px.png */, + 225CB2E911ABB51000628906 /* clavier-01-108px.png */, 22226C1C11819B34000CA27B /* history-orange.png */, 22226C161181986A000CA27B /* contact-orange.png */, 22226C171181986A000CA27B /* dialer-orange.png */, @@ -633,6 +645,10 @@ 22226C181181986A000CA27B /* contact-orange.png in Resources */, 22226C191181986A000CA27B /* dialer-orange.png in Resources */, 22226C1D11819B34000CA27B /* history-orange.png in Resources */, + 225CB2EA11ABB51000628906 /* clavier-01-106px.png in Resources */, + 225CB2EB11ABB51000628906 /* clavier-01-108px.png in Resources */, + 225CB2EE11ABB65D00628906 /* clavier-01-160px.png in Resources */, + 225CB2FA11ABB76400628906 /* linphone-banner.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; };