narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

invoke statusChanged callback after syncronization

Browse source
This commit is contained in:
Daniel Gultsch 2017-05-19 15:28:25 +02:00
parent 5a5eb5bdd3
commit 51d1223198
1 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View file

@ -218,26 +218,30 @@ public class XmppConnection implements Runnable {
mXmppConnectionService = service; mXmppConnectionService = service;
} }
protected synchronized void changeStatus(final Account.State nextStatus) { protected void changeStatus(final Account.State nextStatus) {
if (Thread.currentThread().isInterrupted()) { synchronized (this) {
Log.d(Config.LOGTAG,account.getJid().toBareJid()+": not changing status to "+nextStatus+" because thread was interrupted"); if (Thread.currentThread().isInterrupted()) {
return; Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": not changing status to " + nextStatus + " because thread was interrupted");
}
if (account.getStatus() != nextStatus) {
if ((nextStatus == Account.State.OFFLINE)
&& (account.getStatus() != Account.State.CONNECTING)
&& (account.getStatus() != Account.State.ONLINE)
&& (account.getStatus() != Account.State.DISABLED)) {
return; return;
}
if (nextStatus == Account.State.ONLINE) {
this.attempt = 0;
} }
account.setStatus(nextStatus); if (account.getStatus() != nextStatus) {
if (statusListener != null) { if ((nextStatus == Account.State.OFFLINE)
statusListener.onStatusChanged(account); && (account.getStatus() != Account.State.CONNECTING)
&& (account.getStatus() != Account.State.ONLINE)
&& (account.getStatus() != Account.State.DISABLED)) {
return;
}
if (nextStatus == Account.State.ONLINE) {
this.attempt = 0;
}
account.setStatus(nextStatus);
} else {
return;
} }
} }
if (statusListener != null) {
statusListener.onStatusChanged(account);
}
} }
public void prepareNewConnection() { public void prepareNewConnection() {