Merge pull request #186 from owncloud/fixed_contradicted_messages_in_login_view

[pub/Android/ownCloud.git] / src / com / owncloud / android / location / LocationServiceLauncherReciever.java

diff --git a/src/com/owncloud/android/location/LocationServiceLauncherReciever.java b/src/com/owncloud/android/location/LocationServiceLauncherReciever.java
index 19efd7e..a974c56 100644 (file)
--- a/src/com/owncloud/android/location/LocationServiceLauncherReciever.java
+++ b/src/com/owncloud/android/location/LocationServiceLauncherReciever.java
@@ -1,10 +1,10 @@
 /* ownCloud Android client application
  *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,6 +17,8 @@
  */
 package com.owncloud.android.location;
 
+import com.owncloud.android.Log_OC;
+
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;
 import android.content.BroadcastReceiver;
@@ -24,7 +26,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.util.Log;
 
 public class LocationServiceLauncherReciever extends BroadcastReceiver {
 
@@ -34,7 +35,7 @@ public class LocationServiceLauncherReciever extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         Intent deviceTrackingIntent = new Intent();
         deviceTrackingIntent
-                .setAction("eu.alefzero.owncloud.location.LocationUpdateService");
+                .setAction("com.owncloud.android.location.LocationUpdateService");
         SharedPreferences preferences = PreferenceManager
                 .getDefaultSharedPreferences(context);
         boolean trackDevice = preferences.getBoolean("enable_devicetracking",
@@ -57,12 +58,12 @@ public class LocationServiceLauncherReciever extends BroadcastReceiver {
     private void startOrStopDeviceTracking(Context context, boolean trackDevice) {
         Intent deviceTrackingIntent = new Intent();
         deviceTrackingIntent
-                .setAction("eu.alefzero.owncloud.location.LocationUpdateService");
+                .setAction("com.owncloud.android.location.LocationUpdateService");
         if (!isDeviceTrackingServiceRunning(context) && trackDevice) {
-            Log.d(TAG, "Starting device tracker service");
+            Log_OC.d(TAG, "Starting device tracker service");
             context.startService(deviceTrackingIntent);
         } else if (isDeviceTrackingServiceRunning(context) && !trackDevice) {
-            Log.d(TAG, "Stopping device tracker service");
+            Log_OC.d(TAG, "Stopping device tracker service");
             context.stopService(deviceTrackingIntent);
         }
     }