Avoid use of queues to delay recursion

[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 39a8831..14237e4 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
@@ -21,7 +21,9 @@ package eu.alefzero.owncloud.syncadapter;
 import java.io.IOException;\r
 import java.util.ArrayList;\r
 import java.util.Iterator;\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.List;\r

+import java.util.Queue;\r

 import java.util.Vector;\r
 \r
 import org.apache.jackrabbit.webdav.DavException;\r
 import java.util.Vector;\r
 \r
 import org.apache.jackrabbit.webdav.DavException;\r


@@ -70,7 +72,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
         \r
         Log.d(TAG, "syncing owncloud account " + account.name);\r
 \r
         \r
         Log.d(TAG, "syncing owncloud account " + account.name);\r
 \r

-        sendStickyBroadcast(true, -1);  // starting message to the main IU\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


@@ -98,32 +100,46 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
         } catch (DavException e) {\r
             syncResult.stats.numIoExceptions++;\r
             e.printStackTrace();\r
         } catch (DavException e) {\r
             syncResult.stats.numIoExceptions++;\r
             e.printStackTrace();\r

+        } catch (RuntimeException r) {\r
+            //TODO count ; any type of exception should be treated, and the progress indicator finished;\r
+            //             reporting the user about bad synchronizations should be discussed\r
+            r.printStackTrace();\r
+            throw r;\r

         }\r
         sendStickyBroadcast(false, -1);        \r
     }\r
 \r
     private void fetchData(String uri, SyncResult syncResult, long parentId) {\r
         try {\r
         }\r
         sendStickyBroadcast(false, -1);        \r
     }\r
 \r
     private void fetchData(String uri, SyncResult syncResult, long parentId) {\r
         try {\r

+            Log.v(TAG, "syncing: fetching " + uri);\r
+            \r
+            boolean logmore = (uri.contains("many-files"));\r
+\r
+            // remote request \r
+            if (logmore) Log.v(TAG, "syncing: fetching many-files, TO REQUEST");\r

             PropFindMethod query = new PropFindMethod(uri);\r
             getClient().executeMethod(query);\r
             MultiStatus resp = null;\r
             PropFindMethod query = new PropFindMethod(uri);\r
             getClient().executeMethod(query);\r
             MultiStatus resp = null;\r

+            \r
+            if (logmore) Log.v(TAG, "syncing: fetching many-files, TO PREPARE THE RESPONSE");\r

             resp = query.getResponseBodyAsMultiStatus();\r
             resp = query.getResponseBodyAsMultiStatus();\r

-            List<String> paths = new ArrayList<String>();\r
-            List<Long> fileIds = new ArrayList<Long>(); \r
+            \r
+            // insertion of updated files\r
+            if (logmore) Log.v(TAG, "syncing: fetching many-files, TO PARSE REPONSES");\r

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

+                if (logmore) Log.v(TAG, "syncing: fetching many-files, PARSING REPONSE " + i + "-esima");\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
                 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
-                    // for recursive fetch later\r
-                    paths.add(we.path());\r
-                    fileIds.add(file.getFileId());\r
-                }\r

             }\r
             \r
             }\r
             \r

+            // removal of old files\r
+            // TODO - getDirectoryContent is crashing the app by lack of memory when a lot of files are in the same directory!!!!\r
+            //        tested with the path /\r
+            if (logmore) Log.v(TAG, "syncing: fetching many-files, RETRIEVING VECTOR OF FILES");\r

             Vector<OCFile> files = getStorageManager().getDirectoryContent(\r
                     getStorageManager().getFileById(parentId));\r
             for (OCFile file : files) {\r
             Vector<OCFile> files = getStorageManager().getDirectoryContent(\r
                     getStorageManager().getFileById(parentId));\r
             for (OCFile file : files) {\r


@@ -131,14 +147,17 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                     getStorageManager().removeFile(file);\r
             }\r
             \r
                     getStorageManager().removeFile(file);\r
             }\r
             \r

-            // synched folder -> notice to main thread\r
+            // synched folder -> notice to IU\r
+            if (logmore) Log.v(TAG, "syncing: fetching many-files, NOTIFYING THE UI");\r

             sendStickyBroadcast(true, parentId);\r
 \r
             // recursive fetch\r
             sendStickyBroadcast(true, parentId);\r
 \r
             // recursive fetch\r

-            Iterator<String> pathsIt = paths.iterator();\r
-            Iterator<Long> fileIdsIt = fileIds.iterator();\r
-            while (pathsIt.hasNext()) {\r
-                fetchData(getUri().toString() + pathsIt.next(), syncResult, fileIdsIt.next());\r
+            if (logmore) Log.v(TAG, "syncing: fetching many-files, TRYING TO RECURSE");\r
+            files = getStorageManager().getDirectoryContent(getStorageManager().getFileById(parentId));\r
+            for (OCFile file : files) {\r
+                if (file.getMimetype().equals("DIR")) {\r
+                    fetchData(getUri().toString() + file.getRemotePath(), syncResult, file.getFileId());\r
+                }\r

             }\r
 \r
 \r
             }\r
 \r
 \r