Small improvements to the refresh of the files list and memory handling while synchro...

[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 9350d82..0bd2ec2 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
@@ -19,6 +19,12 @@
 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.util.ArrayList;\r
+import java.util.Iterator;\r
+import java.util.LinkedList;\r
+import java.util.List;\r
+import java.util.Queue;\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


@@ -33,6 +39,7 @@ import android.content.Intent;
 import android.content.SyncResult;\r
 import android.os.Bundle;\r
 import android.util.Log;\r
 import android.content.SyncResult;\r
 import android.os.Bundle;\r
 import android.util.Log;\r

+import android.webkit.MimeTypeMap;\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,6 +52,10 @@ import eu.alefzero.webdav.WebdavEntry;
  */\r
 public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {\r
 \r
  */\r
 public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {\r
 \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
     public FileSyncAdapter(Context context, boolean autoInitialize) {\r
         super(context, autoInitialize);\r
     }\r


@@ -58,24 +69,21 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
         this.setContentProvider(provider);\r
         this.setStorageManager(new FileDataStorageManager(account,\r
                 getContentProvider()));\r
         this.setContentProvider(provider);\r
         this.setStorageManager(new FileDataStorageManager(account,\r
                 getContentProvider()));\r

+        \r
+        Log.d(TAG, "syncing owncloud account " + account.name);\r

 \r
 \r

-        Log.d("ASD", "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
+        sendStickyBroadcast(true, -1);  // message to signal the start to the UI\r

 \r
         PropFindMethod query;\r
         try {\r
 \r
         PropFindMethod query;\r
         try {\r

-            Log.e("ASD", getUri().toString());\r
+            mCurrentSyncTime = System.currentTimeMillis();\r

             query = new PropFindMethod(getUri().toString() + "/");\r
             getClient().executeMethod(query);\r
             MultiStatus resp = null;\r
             resp = query.getResponseBodyAsMultiStatus();\r
 \r
             if (resp.getResponses().length > 0) {\r
             query = new PropFindMethod(getUri().toString() + "/");\r
             getClient().executeMethod(query);\r
             MultiStatus resp = null;\r
             resp = query.getResponseBodyAsMultiStatus();\r
 \r
             if (resp.getResponses().length > 0) {\r

-                WebdavEntry we = new WebdavEntry(resp.getResponses()[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
                 OCFile file = fillOCFile(we);\r
                 file.setParentId(0);\r
                 getStorageManager().saveFile(file);\r


@@ -93,8 +101,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
             syncResult.stats.numIoExceptions++;\r
             e.printStackTrace();\r
         }\r
             syncResult.stats.numIoExceptions++;\r
             e.printStackTrace();\r
         }\r

-        i.putExtra(FileSyncService.IN_PROGRESS, false);\r
-        getContext().sendStickyBroadcast(i);\r
+        sendStickyBroadcast(false, -1);        \r

     }\r
 \r
     private void fetchData(String uri, SyncResult syncResult, long parentId) {\r
     }\r
 \r
     private void fetchData(String uri, SyncResult syncResult, long parentId) {\r


@@ -103,17 +110,40 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
             getClient().executeMethod(query);\r
             MultiStatus resp = null;\r
             resp = query.getResponseBodyAsMultiStatus();\r
             getClient().executeMethod(query);\r
             MultiStatus resp = null;\r
             resp = query.getResponseBodyAsMultiStatus();\r

+            Queue<String> paths = new LinkedList<String>();\r
+            Queue<Long> fileIds = new LinkedList<Long>(); \r

             for (int i = 1; i < resp.getResponses().length; ++i) {\r
             for (int i = 1; i < resp.getResponses().length; ++i) {\r

-                WebdavEntry we = new WebdavEntry(resp.getResponses()[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
                 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,\r
-                            file.getFileId());\r
+                if (we.contentType().equals("DIR")) {\r
+                    // for recursive fetch later\r
+                    paths.add(we.path());\r
+                    fileIds.add(file.getFileId());\r
+                }\r
+            }\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
+            \r
+            // synched folder -> notice to IU\r
+            sendStickyBroadcast(true, parentId);\r
+\r
+            // recursive fetch\r
+            while(!paths.isEmpty()) {\r
+                fetchData(getUri().toString() + paths.remove(), syncResult, fileIds.remove());\r

             }\r
             }\r

+            paths = null;\r
+            fileIds = null;\r
+\r
+\r

         } catch (OperationCanceledException e) {\r
             e.printStackTrace();\r
         } catch (AuthenticatorException e) {\r
         } catch (OperationCanceledException e) {\r
             e.printStackTrace();\r
         } catch (AuthenticatorException e) {\r


@@ -134,7 +164,19 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
         file.setFileLength(we.contentLength());\r
         file.setMimetype(we.contentType());\r
         file.setModificationTimestamp(we.modifiedTimesamp());\r
         file.setFileLength(we.contentLength());\r
         file.setMimetype(we.contentType());\r
         file.setModificationTimestamp(we.modifiedTimesamp());\r

+        file.setLastSyncDate(mCurrentSyncTime);\r

         return file;\r
     }\r
         return file;\r
     }\r

+    \r
+    \r
+    private void sendStickyBroadcast(boolean inProgress, long OCDirId) {\r
+        Intent i = new Intent(FileSyncService.SYNC_MESSAGE);\r
+        i.putExtra(FileSyncService.IN_PROGRESS, inProgress);\r
+        i.putExtra(FileSyncService.ACCOUNT_NAME, getAccount().name);\r
+        if (OCDirId > 0) {\r
+            i.putExtra(FileSyncService.SYNC_FOLDER, OCDirId);\r
+        }\r
+        getContext().sendStickyBroadcast(i);\r
+    }\r

 \r
 }\r
 \r
 }\r