diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m
index d3e9be48d..7b7fbdbdb 100644
--- a/Classes/AssistantView.m
+++ b/Classes/AssistantView.m
@@ -92,6 +92,10 @@ static UICompositeViewDescription *compositeDescription = nil;
selector:@selector(configuringUpdate:)
name:kLinphoneConfiguringStateUpdate
object:nil];
+ // we will set the new default proxy config in the assistant
+ previous_default_config = linphone_core_get_default_proxy_config([LinphoneManager getLc]);
+ linphone_core_set_default_proxy_config([LinphoneManager getLc], NULL);
+
new_config = NULL;
[self resetTextFields];
[self changeView:_welcomeView back:FALSE animation:FALSE];
@@ -147,9 +151,6 @@ static UICompositeViewDescription *compositeDescription = nil;
[[LinphoneManager instance] lpConfigSetInt:1 forKey:@"transient_provisioning" forSection:@"misc"];
[self resetLiblinphone];
- // we will set the new default proxy config in the assistant
- previous_default_config = linphone_core_get_default_proxy_config([LinphoneManager getLc]);
- linphone_core_set_default_proxy_config([LinphoneManager getLc], NULL);
}
- (void)reset {
@@ -354,12 +355,21 @@ static UICompositeViewDescription *compositeDescription = nil;
}
- (void)resetTextFields {
- [AssistantView cleanTextField:_welcomeView];
- [AssistantView cleanTextField:_createAccountView];
- [AssistantView cleanTextField:_linphoneLoginView];
- [AssistantView cleanTextField:_loginView];
- [AssistantView cleanTextField:_createAccountActivationView];
- [AssistantView cleanTextField:_remoteProvisioningLoginView];
+ for (UIView *view in @[
+ _welcomeView,
+ _createAccountView,
+ _linphoneLoginView,
+ _loginView,
+ _createAccountActivationView,
+ _remoteProvisioningLoginView
+ ]) {
+ [AssistantView cleanTextField:view];
+#if DEBUG
+ UIAssistantTextField *atf =
+ (UIAssistantTextField *)[self findView:ViewElement_Domain inView:view ofType:UIAssistantTextField.class];
+ atf.text = @"test.linphone.org";
+#endif
+ }
}
- (void)displayUsernameAsPhoneOrUsername {
diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index 6dae6fd20..938df5ad6 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -1440,7 +1440,6 @@ static BOOL libStarted = FALSE;
}
linphone_core_set_log_collection_path([[LinphoneManager cacheDirectory] UTF8String]);
[self setLogsEnabled:[self lpConfigBoolForKey:@"debugenable_preference"]];
- LOGI(@"Create linphonecore");
connectivity = none;
ms_init(); // Need to initialize mediastreamer2 before loading the plugins
@@ -1463,6 +1462,7 @@ static BOOL libStarted = FALSE;
theLinphoneCore =
linphone_core_new_with_config(&linphonec_vtable, configDb, (__bridge void *)(self) /* user_data */);
+ LOGI(@"Create linphonecore %p", theLinphoneCore);
/* set the CA file no matter what, since the remote provisioning could be hitting an HTTPS server */
const char *lRootCa = [[LinphoneManager bundleFile:@"rootca.pem"] UTF8String];
@@ -1509,8 +1509,8 @@ static BOOL libStarted = FALSE;
}
[_fileTransferDelegates removeAllObjects];
- LOGI(@"Destroy linphonecore");
linphone_core_destroy(theLinphoneCore);
+ LOGI(@"Destroy linphonecore %p", theLinphoneCore);
theLinphoneCore = nil;
ms_exit(); // Uninitialize mediastreamer2
diff --git a/Resources/assistant_external_sip.rc b/Resources/assistant_external_sip.rc
index 172f59f0d..42a6d969a 100644
--- a/Resources/assistant_external_sip.rc
+++ b/Resources/assistant_external_sip.rc
@@ -2,40 +2,16 @@
+ 0
+ 0
+ 3600
+
-
- 3600
1
- 0
- 0
-
-
- 0
- 1
- stun.linphone.org
- 1
- 1
-
-
-
-
-
-
-
-
\ No newline at end of file
+
diff --git a/Resources/assistant_linphone_create.rc b/Resources/assistant_linphone_create.rc
index 0e1eb50b6..39eb569a1 100644
--- a/Resources/assistant_linphone_create.rc
+++ b/Resources/assistant_linphone_create.rc
@@ -2,44 +2,20 @@
- sip:?@sip.linphone.org
- 1314000
- 1
- 0
- 0
1
+ 0
+ 0
sip:voip-metrics@sip.linphone.org;transport=tls
1
180
+ 1314000
+ sip:?@sip.linphone.org
+ 1
- ^[a-z0-9_.\-]*$
sip.linphone.org
+ ^[a-z0-9_.\-]*$
https://www.linphone.org/assistant.php
- https://www.linphone.org:444/lft.php
-
-
-
- 1
- 1
- stun.linphone.org
- 1
- 1
-
-
-
- ice
- stun.linphone.org
-
-
-
-
-
- https://www.linphone.org:444/lft.php
diff --git a/Resources/assistant_linphone_existing.rc b/Resources/assistant_linphone_existing.rc
index 5f9ffbc90..39eb569a1 100644
--- a/Resources/assistant_linphone_existing.rc
+++ b/Resources/assistant_linphone_existing.rc
@@ -2,45 +2,20 @@
- sip:?@sip.linphone.org
- 1314000
- 1
- 0
- 0
1
+ 0
+ 0
sip:voip-metrics@sip.linphone.org;transport=tls
1
180
- sip.linphone.org
+ 1314000
+ sip:?@sip.linphone.org
+ 1
- ^[a-z0-9_.\-]*$
sip.linphone.org
+ ^[a-z0-9_.\-]*$
https://www.linphone.org/assistant.php
- https://www.linphone.org:444/lft.php
-
-
-
- 1
- 1
- stun.linphone.org
- 1
- 1
-
-
-
- ice
- stun.linphone.org
-
-
-
-
-
- https://www.linphone.org:444/lft.php
diff --git a/Resources/assistant_remote.rc b/Resources/assistant_remote.rc
index fb58c848c..07ef93c7a 100644
--- a/Resources/assistant_remote.rc
+++ b/Resources/assistant_remote.rc
@@ -2,26 +2,15 @@
+ 0
+ 0
+ 3600
+
-
- 3600
1
- 0
- 0
-
-
-
-
\ No newline at end of file
+
diff --git a/Resources/linphonerc b/Resources/linphonerc
index 9e74eb89d..2e92dc016 100644
--- a/Resources/linphonerc
+++ b/Resources/linphonerc
@@ -40,9 +40,10 @@ automatically_initiate=0
automatically_accept=0
[net]
-firewall_policy=0
download_bw=380
upload_bw=380
+firewall_policy=ice
+stun_server=stun.linphone.org
[sound]
playback_dev_id=AU: Audio Unit Receiver
@@ -58,9 +59,15 @@ backgroundmode_preference=1
autoanswer_notif_preference=1
voiceproc_preference=1
enable_log_collect=0
+file_transfer_migration_done=1
+pushnotification_preference=1
+ice_preference=1
+stun_preference=stun.linphone.org
+random_port_preference=1
[default_values]
reg_expires=1314000
[misc]
max_calls=3
+file_transfer_server_url=https://www.linphone.org:444/lft.php
diff --git a/Resources/linphonerc~ipad b/Resources/linphonerc~ipad
index 57f6c16a2..f3f5ad09d 100644
--- a/Resources/linphonerc~ipad
+++ b/Resources/linphonerc~ipad
@@ -40,9 +40,10 @@ automatically_initiate=0
automatically_accept=0
[net]
-firewall_policy=0
download_bw=512
upload_bw=512
+firewall_policy=ice
+stun_server=stun.linphone.org
[sound]
playback_dev_id=AU: Audio Unit Receiver
@@ -58,10 +59,15 @@ backgroundmode_preference=1
autoanswer_notif_preference=1
voiceproc_preference=1
enable_log_collect=0
+file_transfer_migration_done=1
+pushnotification_preference=1
+ice_preference=1
+stun_preference=stun.linphone.org
+random_port_preference=1
[default_values]
reg_expires=1314000
-
[misc]
max_calls=3
+file_transfer_server_url=https://www.linphone.org:444/lft.php