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

Fixed proxy config lime server set on upgrade wrong condition

Browse source
This commit is contained in:
Sylvain Berfini 2019-04-04 09:52:46 +02:00
parent 4b975a89d4
commit b2e904a6f9
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
app/src/main/java/org/linphone/LinphoneManager.java
View file

@ -754,26 +754,25 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
// Migrate existing linphone accounts to have conference factory uri and LIME X3Dh url set // Migrate existing linphone accounts to have conference factory uri and LIME X3Dh url set
String uri = getString(R.string.default_conference_factory_uri); String uri = getString(R.string.default_conference_factory_uri);
for (ProxyConfig lpc : mCore.getProxyConfigList()) { for (ProxyConfig lpc : mCore.getProxyConfigList()) {
if (lpc.getConferenceFactoryUri() == null if (lpc.getIdentityAddress().getDomain().equals(getString(R.string.default_domain))) {
&& lpc.getIdentityAddress() if (lpc.getConferenceFactoryUri() == null) {
.getDomain() lpc.edit();
.equals(getString(R.string.default_domain))) { Log.i(
lpc.edit(); "[Manager] Setting conference factory on proxy config "
Log.i( + lpc.getIdentityAddress().asString()
"[Manager] Setting conference factory on proxy config " + " to default value: "
+ lpc.getIdentityAddress().asString() + uri);
+ " to default value: " lpc.setConferenceFactoryUri(uri);
+ uri); lpc.done();
lpc.setConferenceFactoryUri(uri); }
lpc.done();
}
if (mCore.limeX3DhAvailable()) { if (mCore.limeX3DhAvailable()) {
String url = mCore.getLimeX3DhServerUrl(); String url = mCore.getLimeX3DhServerUrl();
if (url == null || url.length() == 0) { if (url == null || url.length() == 0) {
url = getString(R.string.default_lime_x3dh_server_url); url = getString(R.string.default_lime_x3dh_server_url);
Log.i("[Manager] Setting LIME X3Dh server url to default value: " + url); Log.i("[Manager] Setting LIME X3Dh server url to default value: " + url);
mCore.setLimeX3DhServerUrl(url); mCore.setLimeX3DhServerUrl(url);
}
} }
} }
} }