X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/16b5c6b9ad29bee58dec8aa301b21a2992d63d00..9b9b02c384b4453b3debd703c52e24b6136540f8:/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 230d3a75..14237e47 100644
--- 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;
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.Queue;
 import java.util.Vector;
 
 import org.apache.jackrabbit.webdav.DavException;
@@ -70,7 +72,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
         
         Log.d(TAG, "syncing owncloud account " + account.name);
 
-        sendStickyBroadcast(true, -1);  // starting message to UI
+        sendStickyBroadcast(true, -1);  // message to signal the start to the UI
 
         PropFindMethod query;
         try {
@@ -98,32 +100,46 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
         } catch (DavException e) {
             syncResult.stats.numIoExceptions++;
             e.printStackTrace();
+        } catch (RuntimeException r) {
+            //TODO count ; any type of exception should be treated, and the progress indicator finished;
+            //             reporting the user about bad synchronizations should be discussed
+            r.printStackTrace();
+            throw r;
         }
         sendStickyBroadcast(false, -1);        
     }
 
     private void fetchData(String uri, SyncResult syncResult, long parentId) {
         try {
+            Log.v(TAG, "syncing: fetching " + uri);
+            
+            boolean logmore = (uri.contains("many-files"));
+
+            // remote request 
+            if (logmore) Log.v(TAG, "syncing: fetching many-files, TO REQUEST");
             PropFindMethod query = new PropFindMethod(uri);
             getClient().executeMethod(query);
             MultiStatus resp = null;
+            
+            if (logmore) Log.v(TAG, "syncing: fetching many-files, TO PREPARE THE RESPONSE");
             resp = query.getResponseBodyAsMultiStatus();
-            List<String> paths = new ArrayList<String>();
-            List<Long> fileIds = new ArrayList<Long>(); 
+            
+            // insertion of updated files
+            if (logmore) Log.v(TAG, "syncing: fetching many-files, TO PARSE REPONSES");
             for (int i = 1; i < resp.getResponses().length; ++i) {
+                if (logmore) Log.v(TAG, "syncing: fetching many-files, PARSING REPONSE " + i + "-esima");
                 WebdavEntry we = new WebdavEntry(resp.getResponses()[i], getUri().getPath());
                 OCFile file = fillOCFile(we);
                 file.setParentId(parentId);
                 getStorageManager().saveFile(file);
                 if (parentId == 0)
                     parentId = file.getFileId();
-                if (we.contentType().equals("DIR")) {
-                    // for recursive fetch later
-                    paths.add(we.path());
-                    fileIds.add(file.getFileId());
-                }
             }
             
+            // removal of old files
+            // TODO - getDirectoryContent is crashing the app by lack of memory when a lot of files are in the same directory!!!!
+            //        tested with the path /
+            if (logmore) Log.v(TAG, "syncing: fetching many-files, RETRIEVING VECTOR OF FILES");
             Vector<OCFile> files = getStorageManager().getDirectoryContent(
                     getStorageManager().getFileById(parentId));
             for (OCFile file : files) {
@@ -132,13 +148,16 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
             }
             
             // synched folder -> notice to IU
+            if (logmore) Log.v(TAG, "syncing: fetching many-files, NOTIFYING THE UI");
             sendStickyBroadcast(true, parentId);
 
             // recursive fetch
-            Iterator<String> pathsIt = paths.iterator();
-            Iterator<Long> fileIdsIt = fileIds.iterator();
-            while (pathsIt.hasNext()) {
-                fetchData(getUri().toString() + pathsIt.next(), syncResult, fileIdsIt.next());
+            if (logmore) Log.v(TAG, "syncing: fetching many-files, TRYING TO RECURSE");
+            files = getStorageManager().getDirectoryContent(getStorageManager().getFileById(parentId));
+            for (OCFile file : files) {
+                if (file.getMimetype().equals("DIR")) {
+                    fetchData(getUri().toString() + file.getRemotePath(), syncResult, file.getFileId());
+                }
             }