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

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

@ -754,10 +754,8 @@ 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()
.equals(getString(R.string.default_domain))) {
lpc.edit(); lpc.edit();
Log.i( Log.i(
"[Manager] Setting conference factory on proxy config " "[Manager] Setting conference factory on proxy config "
@ -777,6 +775,7 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
} }
} }
} }
}
if (mServiceContext.getResources().getBoolean(R.bool.enable_push_id)) { if (mServiceContext.getResources().getBoolean(R.bool.enable_push_id)) {
initPushNotificationsService(); initPushNotificationsService();