mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-19 12:08:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'new_ui' into apple_store

Browse source
This commit is contained in:
Jehan Monnier 2012-10-19 14:10:37 +02:00
commit 7d025fa2a5
3 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Classes/LinphoneManager.m
View file

@ -385,10 +385,24 @@ static void linphone_iphone_display_status(struct _LinphoneCore * lc, const char
} else {
data = (LinphoneCallAppData*) linphone_call_get_user_pointer(call);
}
if (state == LinphoneCallIncomingReceived
&&[[UIDevice currentDevice] respondsToSelector:@selector(isMultitaskingSupported)]
&& [UIApplication sharedApplication].applicationState != UIApplicationStateActive) {
LinphoneCallLog* callLog=linphone_call_get_call_log(call);
/*first step is to re-enable ctcall center*/
[self setupGSMInteraction];
/*should we reject this call ?*/
if ([callCenter currentCalls]!=nil) {
[LinphoneLogger logc:LinphoneLoggerLog format:"Mobile call ongoing... rejecting call from [%s]",linphone_address_get_username(linphone_call_get_call_log(call)->from)];
linphone_core_decline_call([LinphoneManager getLc], call,LinphoneReasonBusy);
return;
}
LinphoneCallLog* callLog=linphone_call_get_call_log(call);
NSString* callId=[NSString stringWithUTF8String:callLog->call_id];
const LinphoneAddress *addr = linphone_call_get_remote_address(call);
NSString* address = nil;
@ -1327,9 +1341,10 @@ static void audioRouteChangeListenerCallback (
- (void)setupGSMInteraction {
if (callCenter != nil)
if (callCenter != nil) {
callCenter.callEventHandler=NULL;
[callCenter release];
}
callCenter = [[CTCallCenter alloc] init];
callCenter.callEventHandler = ^(CTCall* call) {
// post on main thread

4
Classes/fr.lproj/ChatRoomViewController.xib
View file

@ -260,7 +260,7 @@
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
<string key="IBUIAccessibilityLabel">Envoyez</string>
<string key="IBUIAccessibilityLabel">Envoyer</string>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIEnabled">NO</bool>
@ -272,7 +272,7 @@
<double key="IBUITitleEdgeInsets.bottom">0.0</double>
<double key="IBUITitleEdgeInsets.left">0.0</double>
<double key="IBUITitleEdgeInsets.right">0.0</double>
<string key="IBUINormalTitle">Envoyez</string>
<string key="IBUINormalTitle">Envoyer</string>
<object class="NSColor" key="IBUIHighlightedTitleColor">
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MCAwIDAAA</bytes>

2
submodules/linphone

@ -1 +1 @@
Subproject commit aa49870d7117df201ea56838f34fe651b458d0ee
Subproject commit e829fa6e222f37de9c26e4e82f0227078f4b6629