Fixed issue in generic login + fixed crash when deleting an account

This commit is contained in:
Sylvain Berfini 2019-05-20 16:43:35 +02:00
parent 77539422a1
commit fdc3e164e4
2 changed files with 1 additions and 10 deletions

View file

@ -27,19 +27,14 @@ import android.widget.EditText;
import android.widget.RadioGroup; import android.widget.RadioGroup;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import org.linphone.LinphoneManager;
import org.linphone.R; import org.linphone.R;
import org.linphone.core.AccountCreator;
import org.linphone.core.TransportType; import org.linphone.core.TransportType;
import org.linphone.settings.LinphonePreferences;
public class GenericConnectionAssistantActivity extends AssistantActivity implements TextWatcher { public class GenericConnectionAssistantActivity extends AssistantActivity implements TextWatcher {
private TextView mLogin; private TextView mLogin;
private EditText mUsername, mPassword, mDomain, mDisplayName; private EditText mUsername, mPassword, mDomain, mDisplayName;
private RadioGroup mTransport; private RadioGroup mTransport;
private AccountCreator mAccountCreator;
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@ -68,10 +63,6 @@ public class GenericConnectionAssistantActivity extends AssistantActivity implem
mDomain = findViewById(R.id.assistant_domain); mDomain = findViewById(R.id.assistant_domain);
mDomain.addTextChangedListener(this); mDomain.addTextChangedListener(this);
mTransport = findViewById(R.id.assistant_transports); mTransport = findViewById(R.id.assistant_transports);
mAccountCreator =
LinphoneManager.getCore()
.createAccountCreator(LinphonePreferences.instance().getXmlrpcUrl());
} }
private void configureAccount() { private void configureAccount() {

View file

@ -537,10 +537,10 @@ public class AccountSettingsFragment extends SettingsFragment {
core.removeAuthInfo(mAuthInfo); core.removeAuthInfo(mAuthInfo);
} }
} }
((SettingsActivity) getActivity()).popBackStack();
((SettingsActivity) getActivity()) ((SettingsActivity) getActivity())
.getSideMenuFragment() .getSideMenuFragment()
.displayAccountsInSideMenu(); .displayAccountsInSideMenu();
((SettingsActivity) getActivity()).popBackStack();
} }
}); });