diff --git a/Classes/Base.lproj/CallView~ipad.xib b/Classes/Base.lproj/CallView~ipad.xib
index 2c9c8035b..b710a3502 100644
--- a/Classes/Base.lproj/CallView~ipad.xib
+++ b/Classes/Base.lproj/CallView~ipad.xib
@@ -512,6 +512,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -595,68 +657,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -833,7 +833,7 @@
-
+
diff --git a/Classes/CallIncomingView.m b/Classes/CallIncomingView.m
index 379a50531..b73f4ff28 100644
--- a/Classes/CallIncomingView.m
+++ b/Classes/CallIncomingView.m
@@ -82,7 +82,6 @@ static UICompositeViewDescription *compositeDescription = nil;
- (void)callUpdate:(LinphoneCall *)acall state:(LinphoneCallState)astate {
if (_call == acall && (astate == LinphoneCallEnd || astate == LinphoneCallError)) {
[_delegate incomingCallAborted:_call];
- [self dismiss];
} else if ([LinphoneManager.instance lpConfigBoolForKey:@"auto_answer"]) {
LinphoneCallState state = linphone_call_get_state(_call);
if (state == LinphoneCallIncomingReceived) {
@@ -94,12 +93,6 @@ static UICompositeViewDescription *compositeDescription = nil;
#pragma mark -
-- (void)dismiss {
- if ([[PhoneMainView.instance currentView] equal:CallIncomingView.compositeViewDescription]) {
- [PhoneMainView.instance popCurrentView];
- }
-}
-
- (void)update {
const LinphoneAddress *addr = linphone_call_get_remote_address(_call);
[ContactDisplay setDisplayNameLabel:_nameLabel forAddress:addr];
@@ -123,17 +116,14 @@ static UICompositeViewDescription *compositeDescription = nil;
#pragma mark - Action Functions
- (IBAction)onAcceptClick:(id)event {
- [self dismiss];
[_delegate incomingCallAccepted:_call evenWithVideo:YES];
}
- (IBAction)onDeclineClick:(id)event {
- [self dismiss];
[_delegate incomingCallDeclined:_call];
}
- (IBAction)onAcceptAudioOnlyClick:(id)sender {
- [self dismiss];
[_delegate incomingCallAccepted:_call evenWithVideo:NO];
}
diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m
index d7bcf4dfb..32b7b3c30 100644
--- a/Classes/PhoneMainView.m
+++ b/Classes/PhoneMainView.m
@@ -303,12 +303,6 @@ static RootViewManager *rootViewManagerInstance = nil;
LinphoneCallState state = [[notif.userInfo objectForKey:@"state"] intValue];
NSString *message = [notif.userInfo objectForKey:@"message"];
- // Don't handle call state during incoming call view
- if ([[self currentView] equal:CallIncomingView.compositeViewDescription] && state != LinphoneCallError &&
- state != LinphoneCallEnd) {
- return;
- }
-
switch (state) {
case LinphoneCallIncomingReceived:
case LinphoneCallIncomingEarlyMedia: {
diff --git a/submodules/linphone b/submodules/linphone
index ba58c9f03..d3fb4b404 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit ba58c9f03851e8381d781a38d93911d025bf9271
+Subproject commit d3fb4b4046faae660378af9370db0c6f64b3cfce