Merge pull request #118 from owncloud/loggingtool

[pub/Android/ownCloud.git] / src / com / owncloud / android / files / services / FileObserverService.java

diff --git a/src/com/owncloud/android/files/services/FileObserverService.java b/src/com/owncloud/android/files/services/FileObserverService.java
index d4bf24d..635571f 100644 (file)
--- a/src/com/owncloud/android/files/services/FileObserverService.java
+++ b/src/com/owncloud/android/files/services/FileObserverService.java
@@ -23,6 +23,7 @@ import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
 import java.util.HashMap;
 import java.util.Map;
 

+import com.owncloud.android.Log_OC;

 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;


@@ -83,7 +84,7 @@ public class FileObserverService extends Service {
         super.onDestroy();
         unregisterReceiver(mDownloadReceiver);
         mObserversMap = null;   // TODO study carefully the life cycle of Services to grant the best possible observance
         super.onDestroy();
         unregisterReceiver(mDownloadReceiver);
         mObserversMap = null;   // TODO study carefully the life cycle of Services to grant the best possible observance

-        Log.d(TAG, "Bye, bye");
+        Log_OC.d(TAG, "Bye, bye");

     }
     
     
     }
     
     


@@ -102,7 +103,7 @@ public class FileObserverService extends Service {
         }
             
         if (!intent.hasExtra(KEY_FILE_CMD)) {
         }
             
         if (!intent.hasExtra(KEY_FILE_CMD)) {

-            Log.e(TAG, "No KEY_FILE_CMD argument given");
+            Log_OC.e(TAG, "No KEY_FILE_CMD argument given");

             return Service.START_STICKY;
         }
 
             return Service.START_STICKY;
         }
 


@@ -119,7 +120,7 @@ public class FileObserverService extends Service {
                                     (Account)intent.getParcelableExtra(KEY_CMD_ARG_ACCOUNT));
                 break;
             default:
                                     (Account)intent.getParcelableExtra(KEY_CMD_ARG_ACCOUNT));
                 break;
             default:

-                Log.wtf(TAG, "Incorrect key given");
+                Log_OC.wtf(TAG, "Incorrect key given");

         }
 
         return Service.START_STICKY;
         }
 
         return Service.START_STICKY;


@@ -166,7 +167,7 @@ public class FileObserverService extends Service {
             mObserversMap.put(path, observer);
             if (new File(path).exists()) {
                 observer.startWatching();
             mObserversMap.put(path, observer);
             if (new File(path).exists()) {
                 observer.startWatching();

-                Log.d(TAG, "Started watching file " + path);
+                Log_OC.d(TAG, "Started watching file " + path);

             }
             
         } while (c.moveToNext());
             }
             
         } while (c.moveToNext());


@@ -189,7 +190,7 @@ public class FileObserverService extends Service {
      */
     private void addObservedFile(OCFile file, Account account) {
         if (file == null) {
      */
     private void addObservedFile(OCFile file, Account account) {
         if (file == null) {

-            Log.e(TAG, "Trying to add a NULL file to observer");
+            Log_OC.e(TAG, "Trying to add a NULL file to observer");

             return;
         }
         String localPath = file.getStoragePath();
             return;
         }
         String localPath = file.getStoragePath();


@@ -204,11 +205,11 @@ public class FileObserverService extends Service {
                                                     getApplicationContext(), 
                                                     OwnCloudFileObserver.CHANGES_ONLY);
             mObserversMap.put(localPath, observer);
                                                     getApplicationContext(), 
                                                     OwnCloudFileObserver.CHANGES_ONLY);
             mObserversMap.put(localPath, observer);

-            Log.d(TAG, "Observer added for path " + localPath);
+            Log_OC.d(TAG, "Observer added for path " + localPath);

         
             if (file.isDown()) {
                 observer.startWatching();
         
             if (file.isDown()) {
                 observer.startWatching();

-                Log.d(TAG, "Started watching " + localPath);
+                Log_OC.d(TAG, "Started watching " + localPath);

             }   // else - the observance can't be started on a file not already down; mDownloadReceiver will get noticed when the download of the file finishes
         }
         
             }   // else - the observance can't be started on a file not already down; mDownloadReceiver will get noticed when the download of the file finishes
         }
         


@@ -229,7 +230,7 @@ public class FileObserverService extends Service {
      */
     private void removeObservedFile(OCFile file, Account account) {
         if (file == null) {
      */
     private void removeObservedFile(OCFile file, Account account) {
         if (file == null) {

-            Log.e(TAG, "Trying to remove a NULL file");
+            Log_OC.e(TAG, "Trying to remove a NULL file");

             return;
         }
         String localPath = file.getStoragePath();
             return;
         }
         String localPath = file.getStoragePath();


@@ -241,7 +242,7 @@ public class FileObserverService extends Service {
         if (observer != null) {
             observer.stopWatching();
             mObserversMap.remove(observer);
         if (observer != null) {
             observer.stopWatching();
             mObserversMap.remove(observer);

-            Log.d(TAG, "Stopped watching " + localPath);
+            Log_OC.d(TAG, "Stopped watching " + localPath);

         }
         
     }
         }
         
     }


@@ -263,11 +264,11 @@ public class FileObserverService extends Service {
                 if (intent.getAction().equals(FileDownloader.DOWNLOAD_FINISH_MESSAGE) &&
                         new File(downloadPath).exists()) {  // the download could be successful, or not; in both cases, the file could be down, due to a former download or upload   
                     observer.startWatching();
                 if (intent.getAction().equals(FileDownloader.DOWNLOAD_FINISH_MESSAGE) &&
                         new File(downloadPath).exists()) {  // the download could be successful, or not; in both cases, the file could be down, due to a former download or upload   
                     observer.startWatching();

-                    Log.d(TAG, "Watching again " + downloadPath);
+                    Log_OC.d(TAG, "Watching again " + downloadPath);

                 
                 } else if (intent.getAction().equals(FileDownloader.DOWNLOAD_ADDED_MESSAGE)) {
                     observer.stopWatching();
                 
                 } else if (intent.getAction().equals(FileDownloader.DOWNLOAD_ADDED_MESSAGE)) {
                     observer.stopWatching();

-                    Log.d(TAG, "Disabling observance of " + downloadPath);
+                    Log_OC.d(TAG, "Disabling observance of " + downloadPath);

                 } 
             }
         }
                 } 
             }
         }