diff --git a/Classes/Base.lproj/CallIncomingView.xib b/Classes/Base.lproj/CallIncomingView.xib
index 396c20878..6651bf888 100644
--- a/Classes/Base.lproj/CallIncomingView.xib
+++ b/Classes/Base.lproj/CallIncomingView.xib
@@ -34,13 +34,6 @@
-
+
-
+
diff --git a/Classes/Base.lproj/CallOutgoingView.xib b/Classes/Base.lproj/CallOutgoingView.xib
index 12030996d..6d3ac0234 100644
--- a/Classes/Base.lproj/CallOutgoingView.xib
+++ b/Classes/Base.lproj/CallOutgoingView.xib
@@ -177,13 +177,6 @@
-
+
@@ -224,13 +224,6 @@
-
+
diff --git a/Classes/Base.lproj/CallView.xib b/Classes/Base.lproj/CallView.xib
index 12237d2f5..8eda3cad7 100644
--- a/Classes/Base.lproj/CallView.xib
+++ b/Classes/Base.lproj/CallView.xib
@@ -716,8 +716,8 @@
-
-
+
+
diff --git a/Classes/Base.lproj/DialerView.xib b/Classes/Base.lproj/DialerView.xib
index 3f30ab4d2..6cceee355 100644
--- a/Classes/Base.lproj/DialerView.xib
+++ b/Classes/Base.lproj/DialerView.xib
@@ -47,7 +47,7 @@
-
+
@@ -55,7 +55,7 @@
-
+
diff --git a/Classes/Base.lproj/DialerView~ipad.xib b/Classes/Base.lproj/DialerView~ipad.xib
index af249e670..1b8acb03f 100644
--- a/Classes/Base.lproj/DialerView~ipad.xib
+++ b/Classes/Base.lproj/DialerView~ipad.xib
@@ -1,5 +1,5 @@
-
+
@@ -63,8 +63,8 @@
-
-
+
+
@@ -72,7 +72,7 @@
-
+
@@ -389,8 +389,8 @@
-
-
+
+
@@ -398,7 +398,7 @@
-
+
@@ -709,7 +709,7 @@
-
+
diff --git a/Classes/Base.lproj/SideMenuView.xib b/Classes/Base.lproj/SideMenuView.xib
index 50397d262..9e99f1e38 100644
--- a/Classes/Base.lproj/SideMenuView.xib
+++ b/Classes/Base.lproj/SideMenuView.xib
@@ -1,8 +1,8 @@
-
+
-
+
@@ -31,10 +31,9 @@
-
+
-
@@ -47,12 +46,10 @@
-
-
@@ -85,7 +79,6 @@
-
@@ -93,7 +86,6 @@
-
@@ -101,7 +93,6 @@
-
diff --git a/Classes/Base.lproj/SideMenuView~ipad.xib b/Classes/Base.lproj/SideMenuView~ipad.xib
index 175226f7a..22527a3ab 100644
--- a/Classes/Base.lproj/SideMenuView~ipad.xib
+++ b/Classes/Base.lproj/SideMenuView~ipad.xib
@@ -1,8 +1,8 @@
-
+
-
+
@@ -34,7 +34,6 @@
-
@@ -47,12 +46,10 @@
-
-
@@ -85,7 +79,6 @@
-
@@ -93,7 +86,6 @@
-
@@ -101,7 +93,6 @@
-
diff --git a/Classes/CallOutgoingView.m b/Classes/CallOutgoingView.m
index eba576e8b..43ee7fb7e 100644
--- a/Classes/CallOutgoingView.m
+++ b/Classes/CallOutgoingView.m
@@ -123,11 +123,7 @@ static UICompositeViewDescription *compositeDescription = nil;
_routesEarpieceButton.selected = !_routesBluetoothButton.selected && !_routesSpeakerButton.selected;
if (hidden != _routesView.hidden) {
- // if (animated) {
- // [self hideAnimation:hidden forView:_routesView completion:nil];
- // } else {
[_routesView setHidden:hidden];
- // }
}
}
diff --git a/Classes/DialerView.m b/Classes/DialerView.m
index fd87eca38..0de66f30d 100644
--- a/Classes/DialerView.m
+++ b/Classes/DialerView.m
@@ -140,6 +140,8 @@ static UICompositeViewDescription *compositeDescription = nil;
[backgroundView setHidden:TRUE];
[videoCameraSwitch setHidden:TRUE];
}
+ } else {
+ linphone_core_enable_video_preview(lc, FALSE);
}
[addressField setText:@""];
}
@@ -359,6 +361,12 @@ static UICompositeViewDescription *compositeDescription = nil;
if (textField == addressField) {
[addressField resignFirstResponder];
}
+ if (textField.text.length > 0) {
+ LinphoneAddress *addr = linphone_core_interpret_url(LC, textField.text.UTF8String);
+ [LinphoneManager.instance call:addr transfer:FALSE];
+ if (addr)
+ linphone_address_destroy(addr);
+ }
return YES;
}
diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m
index c453ccc24..e2a511700 100644
--- a/Classes/LinphoneCoreSettingsStore.m
+++ b/Classes/LinphoneCoreSettingsStore.m
@@ -265,7 +265,7 @@
[self setBool:(pol->automatically_accept) forKey:@"accept_video_preference"];
[self setBool:linphone_core_self_view_enabled(lc) forKey:@"self_video_preference"];
BOOL previewEnabled = [lm lpConfigBoolForKey:@"preview_preference" withDefault:YES];
- [self setBool:previewEnabled forKey:@"preview_preference"];
+ [self setBool:IPAD && previewEnabled forKey:@"preview_preference"];
const char *preset = linphone_core_get_video_preset(lc);
[self setCString:preset ? preset : "default" forKey:@"video_preset_preference"];
@@ -655,7 +655,7 @@
policy.automatically_accept = [self boolForKey:@"accept_video_preference"];
linphone_core_set_video_policy(lc, &policy);
linphone_core_enable_self_view(lc, [self boolForKey:@"self_video_preference"]);
- BOOL preview_preference = [self boolForKey:@"preview_preference"];
+ BOOL preview_preference = IPAD && [self boolForKey:@"preview_preference"];
[lm lpConfigSetInt:preview_preference forKey:@"preview_preference"];
NSString *videoPreset = [self stringForKey:@"video_preset_preference"];
diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index b33b56c56..6c8053f2d 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -440,7 +440,6 @@ exit_dbmigration:
return;
if ([self lpConfigIntForKey:migration_flag withDefault:0]) {
- LOGI(@"UserPrefs migration already performed, skip");
return;
}
@@ -1720,10 +1719,10 @@ static int comp_call_state_paused(const LinphoneCall *call, const void *param) {
linphone_core_start_dtmf_stream(theLinphoneCore);
/*start the video preview in case we are in the main view*/
- // if (linphone_core_video_display_enabled(theLinphoneCore) && [self lpConfigBoolForKey:@"preview_preference"]) {
+ if (linphone_core_video_display_enabled(theLinphoneCore) && [self lpConfigBoolForKey:@"preview_preference"]) {
linphone_core_enable_video_preview(theLinphoneCore, TRUE);
- // }
- /*check last keepalive handler date*/
+ }
+ /*check last keepalive handler date*/
if (mLastKeepAliveDate != Nil) {
NSDate *current = [NSDate date];
if ([current timeIntervalSinceDate:mLastKeepAliveDate] > 700) {
diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m
index d17bccbda..167d428de 100644
--- a/Classes/PhoneMainView.m
+++ b/Classes/PhoneMainView.m
@@ -322,11 +322,6 @@ static RootViewManager *rootViewManagerInstance = nil;
case LinphoneCallPausedByRemote:
case LinphoneCallConnected:
case LinphoneCallStreamsRunning: {
- if ((currentView == CallView.compositeViewDescription) ||
- (currentView == CallIncomingView.compositeViewDescription) ||
- (currentView == CallOutgoingView.compositeViewDescription)) {
- [self popCurrentView];
- }
[self changeCurrentView:CallView.compositeViewDescription];
break;
}
@@ -585,12 +580,10 @@ static RootViewManager *rootViewManagerInstance = nil;
- (UIViewController *)popToView:(UICompositeViewDescription *)view {
NSMutableArray *viewStack = [RootViewManager instance].viewDescriptionStack;
- while ([viewStack count] > 1 && ![[viewStack lastObject] equal:view]) {
+ while (viewStack.count > 0 && ![[viewStack lastObject] equal:view]) {
[viewStack removeLastObject];
}
- return [self _changeCurrentView:[viewStack lastObject]
- transition:[PhoneMainView getBackwardTransition]
- animated:ANIMATED];
+ return [self _changeCurrentView:view transition:[PhoneMainView getBackwardTransition] animated:ANIMATED];
}
- (UICompositeViewDescription *)firstView {