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

Fixing problem of listener

Browse source
This commit is contained in:
Erwan Croze 2018-01-11 15:24:37 +01:00
parent 8655318ae8
commit 3e6c76e27b
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/android/org/linphone/assistant/AssistantActivity.java
View file

@ -99,7 +99,7 @@ private static AssistantActivity instance;
private boolean remoteProvisioningInProgress; private boolean remoteProvisioningInProgress;
private boolean echoCancellerAlreadyDone; private boolean echoCancellerAlreadyDone;
private static final int PERMISSIONS_REQUEST_RECORD_AUDIO = 201; private static final int PERMISSIONS_REQUEST_RECORD_AUDIO = 201;
private AccountCreator accountCreator; private AccountCreator mAccountCreator;
private CountryListAdapter countryListAdapter; private CountryListAdapter countryListAdapter;
public DialPlan country; public DialPlan country;
@ -140,8 +140,8 @@ private static AssistantActivity instance;
status.enableSideMenu(false); status.enableSideMenu(false);
if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null) { if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null) {
accountCreator = LinphoneManager.getLc().createAccountCreator(LinphonePreferences.instance().getXmlrpcUrl()); mAccountCreator = LinphoneManager.getLc().createAccountCreator(LinphonePreferences.instance().getXmlrpcUrl());
accountCreator.setListener(this); mAccountCreator.setListener(this);
} }
countryListAdapter = new CountryListAdapter(getApplicationContext()); countryListAdapter = new CountryListAdapter(getApplicationContext());
@ -229,9 +229,7 @@ private static AssistantActivity instance;
} }
private AccountCreator loadAccountCreator(ProxyConfig cfg) { private AccountCreator loadAccountCreator(ProxyConfig cfg) {
AccountCreator accountCreator = LinphoneManager.getLc().createAccountCreator(LinphonePreferences.instance().getXmlrpcUrl());
ProxyConfig cfgTab[] = LinphoneManager.getLc().getProxyConfigList(); ProxyConfig cfgTab[] = LinphoneManager.getLc().getProxyConfigList();
accountCreator.setListener(this);
int n = -1; int n = -1;
for (int i = 0 ; i < cfgTab.length ; i++) { for (int i = 0 ; i < cfgTab.length ; i++) {
if (cfgTab[i].equals(cfg)) { if (cfgTab[i].equals(cfg)) {
@ -240,10 +238,10 @@ private static AssistantActivity instance;
} }
} }
if (n >= 0) { if (n >= 0) {
accountCreator.setDomain(mPrefs.getAccountDomain(n)); mAccountCreator.setDomain(mPrefs.getAccountDomain(n));
accountCreator.setUsername(mPrefs.getAccountUsername(n)); mAccountCreator.setUsername(mPrefs.getAccountUsername(n));
} }
return accountCreator; return mAccountCreator;
} }
private void initUI() { private void initUI() {
@ -713,7 +711,7 @@ private static AssistantActivity instance;
isLink = true; isLink = true;
displayCreateAccount(); displayCreateAccount();
} }
if (mAccountCreator != null) mAccountCreator.setListener(null);
} }
@Override @Override