Always keep the service activated no matter if we are actually connected to a wifi network or not, however we will only scan if you are connected to a wifi network. We had issues with the changes made 2 commits ago.