moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-11 19:55:03 -05:00
Code Issues Releases Wiki Activity

fixed regression that led to the wakelock not being released again

Browse Source
This commit is contained in:
iNPUTmice 2014-05-31 11:54:32 +02:00
parent 655565eccc
commit 57ded7ee58
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/eu/siacs/conversations/services/XmppConnectionService.java
View File

@ -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();