diff --git a/Classes/LinphoneUI/LinphoneManager.m b/Classes/LinphoneUI/LinphoneManager.m index d97d85b4b..3f328638a 100644 --- a/Classes/LinphoneUI/LinphoneManager.m +++ b/Classes/LinphoneUI/LinphoneManager.m @@ -449,6 +449,7 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach linphone_proxy_config_set_identity(proxyCfg,identity); linphone_proxy_config_set_server_addr(proxyCfg,proxy); linphone_proxy_config_enable_register(proxyCfg,true); + linphone_proxy_config_expires(proxyCfg, 600); if (isOutboundProxy) linphone_proxy_config_set_route(proxyCfg,proxy); @@ -660,19 +661,23 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach ,self); [[NSUserDefaults standardUserDefaults] synchronize];//sync before loading config - [ self doLinphoneConfiguration:nil]; + proxyReachability=SCNetworkReachabilityCreateWithName(nil, "linphone.org"); proxyReachabilityContext.info=self; + //initial state is network off should be done as soon as possible + SCNetworkReachabilityFlags flags; + SCNetworkReachabilityGetFlags(proxyReachability, &flags); + networkReachabilityCallBack(proxyReachability,flags,self); + SCNetworkReachabilitySetCallback(proxyReachability, (SCNetworkReachabilityCallBack)networkReachabilityCallBack,&proxyReachabilityContext); SCNetworkReachabilityScheduleWithRunLoop(proxyReachability, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode); - + + [self doLinphoneConfiguration:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(doLinphoneConfiguration:) name:NSUserDefaultsDidChangeNotification object:nil]; - //initial state is network off should be done as soon as possible - linphone_core_set_network_reachable(theLinphoneCore,false); // start scheduler mIterateTimer = [NSTimer scheduledTimerWithTimeInterval:0.1 target:self @@ -691,6 +696,11 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach otherButtonTitles:nil ,nil]; [error show]; } + if ([[UIDevice currentDevice] respondsToSelector:@selector(isMultitaskingSupported)] + && [UIApplication sharedApplication].applicationState == UIApplicationStateBackground) { + //go directly to bg mode + [self enterBackgroundMode]; + } } diff --git a/linphone-Info.plist b/linphone-Info.plist index a5e170a9f..44b4788bb 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -19,11 +19,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.4.3 + 3.4.4 CFBundleSignature ???? CFBundleVersion - 1.0.5 + 1.0.6 NSMainNibFile PhoneMainView UIApplicationExitsOnSuspend