Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xabber-android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
xabber-android
Commits
0b5a4676
Commit
0b5a4676
authored
Jul 09, 2015
by
Grigory Fedorov
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into feature/smack
parents
10bac8fd
b2621156
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
AccountManager.java
.../java/com/xabber/android/data/account/AccountManager.java
+1
-1
ConnectionThread.java
.../com/xabber/android/data/connection/ConnectionThread.java
+6
-1
No files found.
app/src/main/java/com/xabber/android/data/account/AccountManager.java
View file @
0b5a4676
...
...
@@ -298,7 +298,7 @@ public class AccountManager implements OnLoadListener, OnWipeListener {
if
(
registerNewAccount
)
{
// TODO: attempt to register account, if that fails return null;
//
accountItem.registerAccount();
accountItem
.
registerAccount
();
// return(null);
}
requestToWriteAccount
(
accountItem
);
...
...
app/src/main/java/com/xabber/android/data/connection/ConnectionThread.java
View file @
0b5a4676
...
...
@@ -601,8 +601,13 @@ public class ConnectionThread implements
private
void
onAccountRegistered
(
final
String
password
)
{
LogManager
.
i
(
this
,
"Account registered"
);
connectionItem
.
onAccountRegistered
(
this
);
runOnConnectionThread
(
new
Runnable
()
{
@Override
public
void
run
()
{
authorization
(
password
);
}
});
}
/**
* Login.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment