Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Only configure lime x3dh server url when creating a sip.linphone.org proxy config

Browse source
This commit is contained in:
Sylvain Berfini 2019-02-28 10:49:03 +01:00
parent f09331457b
commit 1bebdfc64a
5 changed files with 8 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/linphone/assistant/AssistantActivity.java
View file

@ -503,8 +503,7 @@ public class AssistantActivity extends Activity
public void linphoneLogIn(AccountCreator accountCreator) { public void linphoneLogIn(AccountCreator accountCreator) {
LinphoneManager.getLc() LinphoneManager.getLc()
.getConfig() .loadConfigFromXml(LinphoneManager.getInstance().getmDynamicConfigFile());
.loadFromXmlFile(LinphoneManager.getInstance().getmDynamicConfigFile());
configureProxyConfig(accountCreator); configureProxyConfig(accountCreator);
} }

7
app/src/main/java/org/linphone/assistant/CreateAccountFragment.java
View file

@ -340,8 +340,8 @@ public class CreateAccountFragment extends Fragment
if (mUseEmail.isChecked()) mAccountCreator.setPhoneNumber(null, null); if (mUseEmail.isChecked()) mAccountCreator.setPhoneNumber(null, null);
if (!getResources().getBoolean(R.bool.isTablet) || getUsername().length() > 0) { if (!getResources().getBoolean(R.bool.isTablet) || getUsername().length() > 0) {
LinphoneManager.getLc() LinphoneManager.getLc()
.getConfig() .loadConfigFromXml(
.loadFromXmlFile(LinphoneManager.getInstance().getmDynamicConfigFile()); LinphoneManager.getInstance().getmDynamicConfigFile());
mAccountCreator.isAccountExist(); mAccountCreator.isAccountExist();
} else { } else {
LinphoneUtils.displayErrorAlert( LinphoneUtils.displayErrorAlert(
@ -674,8 +674,7 @@ public class CreateAccountFragment extends Fragment
LinphoneUtils.errorForStatus(status), AssistantActivity.instance()); LinphoneUtils.errorForStatus(status), AssistantActivity.instance());
} else { } else {
LinphoneManager.getLc() LinphoneManager.getLc()
.getConfig() .loadConfigFromXml(LinphoneManager.getInstance().getmDynamicConfigFile());
.loadFromXmlFile(LinphoneManager.getInstance().getmDynamicConfigFile());
accountCreator.isAliasUsed(); accountCreator.isAliasUsed();
} }
} else { } else {

3
app/src/main/java/org/linphone/assistant/LinphoneLoginFragment.java
View file

@ -277,8 +277,7 @@ public class LinphoneLoginFragment extends Fragment
boolean isOk = status == AccountCreator.PhoneNumberStatus.Ok.toInt(); boolean isOk = status == AccountCreator.PhoneNumberStatus.Ok.toInt();
if (isOk) { if (isOk) {
LinphoneManager.getLc() LinphoneManager.getLc()
.getConfig() .loadConfigFromXml(LinphoneManager.getInstance().getmDynamicConfigFile());
.loadFromXmlFile(LinphoneManager.getInstance().getmDynamicConfigFile());
mAccountCreator.isAliasUsed(); mAccountCreator.isAliasUsed();
} else { } else {
mApply.setEnabled(true); mApply.setEnabled(true);

3
app/src/main/res/raw/assistant_create.rc
View file

@ -32,4 +32,7 @@
<entry name="username_min_length" overwrite="true">1</entry> <entry name="username_min_length" overwrite="true">1</entry>
<entry name="username_regex" overwrite="true">^[a-z0-9+_.\-]*$</entry> <entry name="username_regex" overwrite="true">^[a-z0-9+_.\-]*$</entry>
</section> </section>
<section name="lime">
<entry name="x3dh_server_url" overwrite="true">http://sip-staging.linphone.org:8083/flexisip-account-manager/x3dh-25519.php</entry>
</section>
</config> </config>

29
app/src/main/res/raw/linphonerc_factory
View file

@ -15,23 +15,9 @@ register_only_when_network_is_up=1
auto_net_state_mon=1 auto_net_state_mon=1
auto_answer_replacing_calls=1 auto_answer_replacing_calls=1
ping_with_options=0 ping_with_options=0
rls_uri=
use_cpim=1 use_cpim=1
linphone_specs=groupchat,lime
[rtp]
audio_rtp_port=7076
video_rtp_port=9078
audio_jitt_comp=60
video_jitt_comp=60
nortp_timeout=30
disable_upnp=1
[sound] [sound]
playback_dev_id=
ringer_dev_id=
capture_dev_id=
dtmf_player_amp=0.1
#remove this property for any application that is not Linphone public version itself #remove this property for any application that is not Linphone public version itself
ec_calibrator_cool_tones=1 ec_calibrator_cool_tones=1
@ -56,19 +42,4 @@ server_url=https://subscribe.linphone.org:444/inapp.php
purchasable_items_ids=test_account_subscription purchasable_items_ids=test_account_subscription
[assistant] [assistant]
domain=sip.linphone.org
password_max_length=-1
password_min_length=1
username_length=-1
username_max_length=64
username_min_length=1
username_regex=^[a-z0-9_.\-]*$
xmlrpc_url=https://subscribe.linphone.org:444/wizard.php xmlrpc_url=https://subscribe.linphone.org:444/wizard.php
[lime]
lime_v2=1
x3dh_server_url=http://sip-staging.linphone.org:8083/flexisip-account-manager/x3dh-25519.php
lime_update_threshold=86400
max_nb_device_per_participant=255
allow_message_in_unsafe_chatroom=1
unsafe_if_sas_refused=1