Merge branch 'master' of ssh://git@gitorious.org/owncloud/android-devel.git

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / syncadapter / FileSyncAdapter.java

diff --git a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
index 816e79e..85f9cbb 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
@@ -19,6 +19,8 @@
 package eu.alefzero.owncloud.syncadapter;\r
 \r
 import java.io.IOException;\r
 package eu.alefzero.owncloud.syncadapter;\r
 \r
 import java.io.IOException;\r

+import java.net.URLDecoder;\r
+import java.util.Vector;\r

 \r
 import org.apache.jackrabbit.webdav.DavException;\r
 import org.apache.jackrabbit.webdav.MultiStatus;\r
 \r
 import org.apache.jackrabbit.webdav.DavException;\r
 import org.apache.jackrabbit.webdav.MultiStatus;\r


@@ -31,8 +33,8 @@ import android.content.ContentProviderClient;
 import android.content.Context;\r
 import android.content.Intent;\r
 import android.content.SyncResult;\r
 import android.content.Context;\r
 import android.content.Intent;\r
 import android.content.SyncResult;\r

-import android.content.IntentSender.SendIntentException;\r

 import android.os.Bundle;\r
 import android.os.Bundle;\r

+import android.util.Log;\r

 import eu.alefzero.owncloud.datamodel.FileDataStorageManager;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r
 import eu.alefzero.webdav.WebdavEntry;\r
 import eu.alefzero.owncloud.datamodel.FileDataStorageManager;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r
 import eu.alefzero.webdav.WebdavEntry;\r


@@ -45,96 +47,106 @@ import eu.alefzero.webdav.WebdavEntry;
  */\r
 public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {\r
 \r
  */\r
 public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {\r
 \r

-  public static final String SYNC_MESSAGE = "eu.alefzero.owncloud.files.ACCOUNT_SYNC";\r
-  public static final String IN_PROGRESS = "sync_in_progress";\r
-  public static final String ACCOUNT_NAME = "account_name";\r
-  \r
-       public FileSyncAdapter(Context context, boolean autoInitialize) {\r
-               super(context, autoInitialize);\r
-       }\r
-       \r
-       @Override\r
-       public synchronized void onPerformSync(\r
-                       Account account, \r
-                       Bundle extras, \r
-                       String authority, \r
-                       ContentProviderClient provider, \r
-                       SyncResult syncResult) {\r
+    private final static String TAG = "FileSyncAdapter"; \r
+    \r
+    private long mCurrentSyncTime;\r
+    \r
+    public FileSyncAdapter(Context context, boolean autoInitialize) {\r
+        super(context, autoInitialize);\r
+    }\r
+\r
+    @Override\r
+    public synchronized void onPerformSync(Account account, Bundle extras,\r
+            String authority, ContentProviderClient provider,\r
+            SyncResult syncResult) {\r
+\r
+        this.setAccount(account);\r
+        this.setContentProvider(provider);\r
+        this.setStorageManager(new FileDataStorageManager(account,\r
+                getContentProvider()));\r
+\r
+        Log.d(TAG, "syncing owncloud account " + account.name);\r
+\r
+        Intent i = new Intent(FileSyncService.SYNC_MESSAGE);\r
+        i.putExtra(FileSyncService.IN_PROGRESS, true);\r
+        i.putExtra(FileSyncService.ACCOUNT_NAME, account.name);\r
+        getContext().sendStickyBroadcast(i);\r

 \r
 \r

-                       this.setAccount(account);\r
-                       this.setContentProvider(provider);\r
-                       this.setStorageManager(new FileDataStorageManager(account, getContentProvider()));\r
+        PropFindMethod query;\r
+        try {\r
+            mCurrentSyncTime = System.currentTimeMillis();\r
+            query = new PropFindMethod(getUri().toString() + "/");\r
+            getClient().executeMethod(query);\r
+            MultiStatus resp = null;\r
+            resp = query.getResponseBodyAsMultiStatus();\r

 \r
 \r

-                       Intent i = new Intent(SYNC_MESSAGE);\r
-                       i.putExtra(IN_PROGRESS, true);\r
-                       i.putExtra("ACCOUNT_NAME", account.name);\r
-                       getContext().sendStickyBroadcast(i);\r
-                       \r
-                       PropFindMethod query;\r
-      try {\r
-        query = new PropFindMethod(getUri().toString());\r
-        getClient().executeMethod(query);\r
-        MultiStatus resp = null;\r
-        resp = query.getResponseBodyAsMultiStatus();\r
-        if (resp.getResponses().length > 0) {\r
-          WebdavEntry we = new WebdavEntry(resp.getResponses()[0]);\r
-          OCFile file = fillOCFile(we);\r
-          file.setParentId(0);\r
-          getStorageManager().saveFile(file);\r
-          fetchData(getUri().toString(), syncResult, file.getFileId());\r
+            if (resp.getResponses().length > 0) {\r
+                WebdavEntry we = new WebdavEntry(resp.getResponses()[0], getUri().getPath());\r
+                OCFile file = fillOCFile(we);\r
+                file.setParentId(0);\r
+                getStorageManager().saveFile(file);\r
+                fetchData(getUri().toString(), syncResult, file.getFileId());\r
+            }\r
+        } catch (OperationCanceledException e) {\r
+            e.printStackTrace();\r
+        } catch (AuthenticatorException e) {\r
+            syncResult.stats.numAuthExceptions++;\r
+            e.printStackTrace();\r
+        } catch (IOException e) {\r
+            syncResult.stats.numIoExceptions++;\r
+            e.printStackTrace();\r
+        } catch (DavException e) {\r
+            syncResult.stats.numIoExceptions++;\r
+            e.printStackTrace();\r

         }\r
         }\r

-      } catch (OperationCanceledException e) {\r
-        e.printStackTrace();\r
-      } catch (AuthenticatorException e) {\r
-        syncResult.stats.numAuthExceptions++;\r
-        e.printStackTrace();\r
-      } catch (IOException e) {\r
-        syncResult.stats.numIoExceptions++;\r
-        e.printStackTrace();\r
-      } catch (DavException e) {\r
-        syncResult.stats.numIoExceptions++;\r
-        e.printStackTrace();\r
-      }\r
-      i.putExtra(IN_PROGRESS, false);\r
-      getContext().sendStickyBroadcast(i);\r
-       }\r
+        i.putExtra(FileSyncService.IN_PROGRESS, false);\r
+        getContext().sendStickyBroadcast(i);\r
+    }\r

 \r
 \r

-  private void fetchData(String uri, SyncResult syncResult, long parentId) {\r
-    try {\r
-      PropFindMethod query = new PropFindMethod(uri);\r
-      getClient().executeMethod(query);\r
-      MultiStatus resp = null;\r
-      resp = query.getResponseBodyAsMultiStatus();\r
-      for (int i = 1; i < resp.getResponses().length; ++i) {\r
-        WebdavEntry we = new WebdavEntry(resp.getResponses()[i]);\r
-        OCFile file = fillOCFile(we);\r
-        file.setParentId(parentId);\r
-        getStorageManager().saveFile(file);\r
-        if (parentId == 0) parentId = file.getFileId();\r
-        if (we.contentType().equals("DIR"))\r
-          fetchData(getUri().toString() + we.path(), syncResult, file.getFileId());\r
-      }\r
-    } catch (OperationCanceledException e) {\r
-      e.printStackTrace();\r
-    } catch (AuthenticatorException e) {\r
-      syncResult.stats.numAuthExceptions++;\r
-      e.printStackTrace();\r
-    } catch (IOException e) {\r
-      syncResult.stats.numIoExceptions++;\r
-      e.printStackTrace();\r
-    } catch (DavException e) {\r
-      syncResult.stats.numIoExceptions++;\r
-      e.printStackTrace();\r
+    private void fetchData(String uri, SyncResult syncResult, long parentId) {\r
+        try {\r
+            PropFindMethod query = new PropFindMethod(uri);\r
+            getClient().executeMethod(query);\r
+            MultiStatus resp = null;\r
+            resp = query.getResponseBodyAsMultiStatus();\r
+            for (int i = 1; i < resp.getResponses().length; ++i) {\r
+                WebdavEntry we = new WebdavEntry(resp.getResponses()[i], getUri().getPath());\r
+                OCFile file = fillOCFile(we);\r
+                file.setParentId(parentId);\r
+                getStorageManager().saveFile(file);\r
+                if (parentId == 0)\r
+                    parentId = file.getFileId();\r
+                if (we.contentType().equals("DIR"))\r
+                    fetchData(getUri().toString() + we.path(), syncResult, file.getFileId());\r
+            }\r
+            Vector<OCFile> files = getStorageManager().getDirectoryContent(\r
+                    getStorageManager().getFileById(parentId));\r
+            for (OCFile file : files) {\r
+                if (file.getLastSyncDate() != mCurrentSyncTime && file.getLastSyncDate() != 0)\r
+                    getStorageManager().removeFile(file);\r
+            }\r
+        } catch (OperationCanceledException e) {\r
+            e.printStackTrace();\r
+        } catch (AuthenticatorException e) {\r
+            syncResult.stats.numAuthExceptions++;\r
+            e.printStackTrace();\r
+        } catch (IOException e) {\r
+            syncResult.stats.numIoExceptions++;\r
+            e.printStackTrace();\r
+        } catch (DavException e) {\r
+            syncResult.stats.numIoExceptions++;\r
+            e.printStackTrace();\r
+        }\r

     }\r
     }\r

-  }\r
-  \r
-  private OCFile fillOCFile(WebdavEntry we) {\r
-    OCFile file = new OCFile(we.path());\r
-    file.setCreationTimestamp(we.createTimestamp());\r
-    file.setFileLength(we.contentLength());\r
-    file.setMimetype(we.contentType());\r
-    file.setModificationTimestamp(we.modifiedTimesamp());\r
-    return file;\r
-  }\r
-       \r
+\r
+    private OCFile fillOCFile(WebdavEntry we) {\r
+        OCFile file = new OCFile(URLDecoder.decode(we.path()));\r
+        file.setCreationTimestamp(we.createTimestamp());\r
+        file.setFileLength(we.contentLength());\r
+        file.setMimetype(we.contentType());\r
+        file.setModificationTimestamp(we.modifiedTimesamp());\r
+        file.setLastSyncDate(mCurrentSyncTime);\r
+        return file;\r
+    }\r
+\r

 }\r
 }\r