forked from mirrors/linphone-iphone
fix double call acceptance, and don't resume automatically after gsm interruption
This commit is contained in:
parent
743a8786f6
commit
293c666a1d
2 changed files with 6 additions and 7 deletions
|
|
@ -38,13 +38,18 @@
|
|||
}
|
||||
|
||||
-(void) actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger)buttonIndex {
|
||||
|
||||
|
||||
if (timeout) {
|
||||
[timeout invalidate];
|
||||
timeout = nil;
|
||||
}
|
||||
if (buttonIndex != actionSheet.cancelButtonIndex) return;
|
||||
|
||||
if (eventType == CD_UNDEFINED) {
|
||||
ms_error("Incorrect usage of CallDelegate/ActionSheet: eventType must be set");
|
||||
}
|
||||
|
||||
[delegate actionSheet:actionSheet ofType:eventType clickedButtonAtIndex:buttonIndex withUserDatas:call];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -987,13 +987,7 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
|
|||
|
||||
-(void) endInterruption {
|
||||
ms_message("Sound interruption ended!");
|
||||
const MSList* c = linphone_core_get_calls(theLinphoneCore);
|
||||
|
||||
if (c) {
|
||||
ms_message("Auto resuming call");
|
||||
linphone_core_resume_call(theLinphoneCore, (LinphoneCall*) c->data);
|
||||
}
|
||||
|
||||
//let the user resume the call manually.
|
||||
}
|
||||
+(BOOL) runningOnIpad {
|
||||
#ifdef UI_USER_INTERFACE_IDIOM
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue