Commit 0b5a4676 authored by Grigory Fedorov's avatar Grigory Fedorov

Merge branch 'develop' into feature/smack

parents 10bac8fd b2621156
...@@ -298,7 +298,7 @@ public class AccountManager implements OnLoadListener, OnWipeListener { ...@@ -298,7 +298,7 @@ public class AccountManager implements OnLoadListener, OnWipeListener {
if (registerNewAccount) { if (registerNewAccount) {
// TODO: attempt to register account, if that fails return null; // TODO: attempt to register account, if that fails return null;
// accountItem.registerAccount(); accountItem.registerAccount();
// return(null); // return(null);
} }
requestToWriteAccount(accountItem); requestToWriteAccount(accountItem);
......
...@@ -601,8 +601,13 @@ public class ConnectionThread implements ...@@ -601,8 +601,13 @@ public class ConnectionThread implements
private void onAccountRegistered(final String password) { private void onAccountRegistered(final String password) {
LogManager.i(this, "Account registered"); LogManager.i(this, "Account registered");
connectionItem.onAccountRegistered(this); connectionItem.onAccountRegistered(this);
runOnConnectionThread(new Runnable() {
@Override
public void run() {
authorization(password); authorization(password);
} }
});
}
/** /**
* Login. * Login.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment