Merge branch 'develop' into refresh_folder_contents_when_browsed_into

[pub/Android/ownCloud.git] / src / com / owncloud / android / syncadapter / FileSyncService.java

diff --git a/src/com/owncloud/android/syncadapter/FileSyncService.java b/src/com/owncloud/android/syncadapter/FileSyncService.java
index d347265..06c8e85 100644 (file)
--- a/src/com/owncloud/android/syncadapter/FileSyncService.java
+++ b/src/com/owncloud/android/syncadapter/FileSyncService.java
@@ -22,12 +22,15 @@ import android.content.Intent;
 import android.os.IBinder;\r
 \r
 /**\r
 import android.os.IBinder;\r
 \r
 /**\r

- * Background service for syncing files to our local Database\r
+ * Background service for synchronizing remote files with their local state.\r

  * \r
  * \r

- * @author Bartek Przybylski\r
+ * Serves as a connector to an instance of {@link FileSyncAdapter}, as required by standard Android APIs. \r

  * \r
  * \r

+ * @author Bartek Przybylski\r
+ * @author David A. Velasco\r

  */\r
 public class FileSyncService extends Service {\r
  */\r
 public class FileSyncService extends Service {\r

+    \r

     public static final String SYNC_MESSAGE = "ACCOUNT_SYNC";\r
     public static final String SYNC_FOLDER_REMOTE_PATH = "SYNC_FOLDER_REMOTE_PATH";\r
     public static final String IN_PROGRESS = "SYNC_IN_PROGRESS";\r
     public static final String SYNC_MESSAGE = "ACCOUNT_SYNC";\r
     public static final String SYNC_FOLDER_REMOTE_PATH = "SYNC_FOLDER_REMOTE_PATH";\r
     public static final String IN_PROGRESS = "SYNC_IN_PROGRESS";\r


@@ -51,4 +54,5 @@ public class FileSyncService extends Service {
     public IBinder onBind(Intent intent) {\r
        return new FileSyncAdapter(getApplicationContext(), true).getSyncAdapterBinder();\r
     }\r
     public IBinder onBind(Intent intent) {\r
        return new FileSyncAdapter(getApplicationContext(), true).getSyncAdapterBinder();\r
     }\r

+    \r

 }\r
 }\r