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

removed unnecessary call to stopSelf() after logging out

Browse source
This commit is contained in:
Daniel Gultsch 2016-04-14 21:45:36 +02:00
parent 72aa10b536
commit eb63cdb9ad
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -509,7 +509,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
} }
return START_STICKY; return START_STICKY;
case Intent.ACTION_SHUTDOWN: case Intent.ACTION_SHUTDOWN:
logoutAndSave(); logoutAndSave(true);
return START_NOT_STICKY; return START_NOT_STICKY;
case ACTION_CLEAR_NOTIFICATION: case ACTION_CLEAR_NOTIFICATION:
mNotificationService.clear(); mNotificationService.clear();
@ -787,12 +787,16 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
public void onTaskRemoved(final Intent rootIntent) { public void onTaskRemoved(final Intent rootIntent) {
super.onTaskRemoved(rootIntent); super.onTaskRemoved(rootIntent);
if (!getPreferences().getBoolean("keep_foreground_service", false)) { if (!getPreferences().getBoolean("keep_foreground_service", false)) {
this.logoutAndSave(); this.logoutAndSave(false);
} }
} }
private void logoutAndSave() { private void logoutAndSave(boolean stop) {
int activeAccounts = 0;
for (final Account account : accounts) { for (final Account account : accounts) {
if (account.getStatus() != Account.State.DISABLED) {
activeAccounts++;
}
databaseBackend.writeRoster(account.getRoster()); databaseBackend.writeRoster(account.getRoster());
if (account.getXmppConnection() != null) { if (account.getXmppConnection() != null) {
new Thread(new Runnable() { new Thread(new Runnable() {
@ -803,8 +807,10 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
}).start(); }).start();
} }
} }
Log.d(Config.LOGTAG, "good bye"); if (stop || activeAccounts == 0) {
stopSelf(); Log.d(Config.LOGTAG, "good bye");
stopSelf();
}
} }
private void cancelWakeUpCall(int requestCode) { private void cancelWakeUpCall(int requestCode) {