Merge pull request #955 from owncloud/thumbnailOOM

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

diff --git a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
index 8902454..43ddae3 100644 (file)
--- a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
@@ -228,7 +228,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
      * locally saved. 
      * 
      * See {@link #onPerformSync(Account, Bundle, String, ContentProviderClient, SyncResult)}
      * locally saved. 
      * 
      * See {@link #onPerformSync(Account, Bundle, String, ContentProviderClient, SyncResult)}

-     * and {@link #synchronizeFolder(String, long)}.
+     * and {@link #synchronizeFolder(OCFile)}.

      */
     @Override
     public void onSyncCanceled() {
      */
     @Override
     public void onSyncCanceled() {


@@ -243,7 +243,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
      */
     private void updateOCVersion() {
         UpdateOCVersionOperation update = new UpdateOCVersionOperation(getAccount(), getContext());
      */
     private void updateOCVersion() {
         UpdateOCVersionOperation update = new UpdateOCVersionOperation(getAccount(), getContext());

-        RemoteOperationResult result = update.execute(getClient(), MainApp.getUserAgent());
+        RemoteOperationResult result = update.execute(getClient());

         if (!result.isSuccess()) {
             mLastFailedResult = result; 
         } else {
         if (!result.isSuccess()) {
             mLastFailedResult = result; 
         } else {


@@ -288,7 +288,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                                                                                    getAccount(),
                                                                                    getContext()
                                                                                   );
                                                                                    getAccount(),
                                                                                    getContext()
                                                                                   );

-        RemoteOperationResult result = synchFolderOp.execute(getClient(), MainApp.getUserAgent());
+        RemoteOperationResult result = synchFolderOp.execute(getClient());

         
         
         // synchronized folder -> notice to UI - ALWAYS, although !result.isSuccess
         
         
         // synchronized folder -> notice to UI - ALWAYS, although !result.isSuccess