Merge branch 'develop' into review_build_process

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

diff --git a/src/com/owncloud/android/location/LocationUpdateService.java b/src/com/owncloud/android/location/LocationUpdateService.java
index 6e3dfb8..7fe2ee9 100644 (file)
--- a/src/com/owncloud/android/location/LocationUpdateService.java
+++ b/src/com/owncloud/android/location/LocationUpdateService.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
@@ -27,9 +27,9 @@ import android.location.LocationManager;
 import android.location.LocationProvider;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.util.Log;
 import android.widget.Toast;
 
+import com.owncloud.android.Log_OC;
 import com.owncloud.android.R;
 
 public class LocationUpdateService extends IntentService implements
@@ -57,9 +57,10 @@ public class LocationUpdateService extends IntentService implements
 
         // Notify user if there is no way to track the device
         if (mLocationProvider == null) {
+            String message = String.format(getString(R.string.location_no_provider), getString(R.string.app_name));
             Toast.makeText(this,
-                    R.string.location_no_provider,
-                    Toast.LENGTH_LONG);
+                    message,
+                    Toast.LENGTH_LONG).show();
             stopSelf();
             return;
         }
@@ -74,7 +75,7 @@ public class LocationUpdateService extends IntentService implements
 
         // If we do shall track the device -> Stop
         if (!trackDevice) {
-            Log.d(TAG, "Devicetracking is disabled");
+            Log_OC.d(TAG, "Devicetracking is disabled");
             stopSelf();
             return;
         }
@@ -85,7 +86,7 @@ public class LocationUpdateService extends IntentService implements
 
     @Override
     public void onLocationChanged(Location location) {
-        Log.d(TAG, "Location changed: " + location);
+        Log_OC.d(TAG, "Location changed: " + location);
 
     }