From 57ded7ee588111a4cbe2a4481b56610aa913507a Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Sat, 31 May 2014 11:54:32 +0200 Subject: [PATCH] fixed regression that led to the wakelock not being released again --- src/eu/siacs/conversations/services/XmppConnectionService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java index d1692a440..5acde6d46 100644 --- a/src/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/eu/siacs/conversations/services/XmppConnectionService.java @@ -523,7 +523,6 @@ public class XmppConnectionService extends Service { @Override public int onStartCommand(Intent intent, int flags, int startId) { - this.wakeLock.acquire(); if ((intent != null) && (ACTION_MERGE_PHONE_CONTACTS.equals(intent.getAction()))) { mergePhoneContactsWithRoster(); @@ -533,6 +532,7 @@ public class XmppConnectionService extends Service { logoutAndSave(); return START_NOT_STICKY; } + this.wakeLock.acquire(); ConnectivityManager cm = (ConnectivityManager) getApplicationContext() .getSystemService(Context.CONNECTIVITY_SERVICE); NetworkInfo activeNetwork = cm.getActiveNetworkInfo();