mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 02:58:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into tunnel

Browse source
This commit is contained in:
Jehan Monnier 2011-04-29 10:31:58 +02:00
commit 72e9f403f1
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Classes/LinphoneAppDelegate.m
View file

@ -121,9 +121,7 @@
[[LinphoneManager instance] setCallDelegate:myPhoneViewController];
[[LinphoneManager instance] startLibLinphone];
[ [UIDevice currentDevice] setProximityMonitoringEnabled:true];
return YES;

3
Classes/LinphoneUI/LinphoneManager.m
View file

@ -342,9 +342,6 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
linphone_core_clear_all_auth_info(theLinphoneCore);
//clear existing proxy config
linphone_core_clear_proxy_config(theLinphoneCore);
if (proxyReachability !=nil) {
SCNetworkReachabilityUnscheduleFromRunLoop(proxyReachability,CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
}
if (username && [username length] >0 && domain && [domain length]>0) {

11
Classes/PhoneViewController.m
View file

@ -182,6 +182,9 @@
[hangup setEnabled:false];
[callDuration stop];
UIDevice *device = [UIDevice currentDevice];
device.proximityMonitoringEnabled = NO;
[peerLabel setText:@""];
if ([[NSUserDefaults standardUserDefaults] boolForKey:@"firstlogindone_preference" ] == true) {
@ -192,7 +195,13 @@
}
-(void) displayIncalViewforUser:(NSString*) username withDisplayName:(NSString*) displayName {
[hangup setEnabled:true];
UIDevice *device = [UIDevice currentDevice];
device.proximityMonitoringEnabled = YES;
if (device.proximityMonitoringEnabled == YES) {
ms_message("Ok this device support proximity, and I just enabled it");
}
[hangup setEnabled:true];
if (displayName && [displayName length]>0) {
[peerLabel setText:displayName];
} else {