Avoid the progress circle is visible when starting the app after updating it in the...

[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 230d3a7..ef7a3d5 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
@@ -19,8 +19,7 @@
 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.io.ObjectInputStream.GetField;\r

 import java.util.List;\r
 import java.util.Vector;\r
 \r
 import java.util.List;\r
 import java.util.Vector;\r
 \r


@@ -37,9 +36,9 @@ 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.owncloud.datamodel.FileDataStorageManager;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r

+import eu.alefzero.owncloud.files.services.FileDownloader;\r

 import eu.alefzero.webdav.WebdavEntry;\r
 \r
 /**\r
 import eu.alefzero.webdav.WebdavEntry;\r
 \r
 /**\r


@@ -52,6 +51,14 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
 \r
     private final static String TAG = "FileSyncAdapter"; \r
     \r
 \r
     private final static String TAG = "FileSyncAdapter"; \r
     \r

+    /*  Commented code for ugly performance tests\r
+    private final static int MAX_DELAYS = 100;\r
+    private static long[] mResponseDelays = new long[MAX_DELAYS]; \r
+    private static long[] mSaveDelays = new long[MAX_DELAYS];\r
+    private int mDelaysIndex = 0;\r
+    private int mDelaysCount = 0;\r
+    */\r
+    \r

     private long mCurrentSyncTime;\r
     \r
     public FileSyncAdapter(Context context, boolean autoInitialize) {\r
     private long mCurrentSyncTime;\r
     \r
     public FileSyncAdapter(Context context, boolean autoInitialize) {\r


@@ -68,9 +75,15 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
         this.setStorageManager(new FileDataStorageManager(account,\r
                 getContentProvider()));\r
         \r
         this.setStorageManager(new FileDataStorageManager(account,\r
                 getContentProvider()));\r
         \r

+        /*  Commented code for ugly performance tests\r
+        mDelaysIndex = 0;\r
+        mDelaysCount = 0;\r
+        */\r
+        \r
+        \r

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

-        sendStickyBroadcast(true, -1);  // starting message to UI\r
+        sendStickyBroadcast(true, null);  // message to signal the start to the UI\r

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


@@ -85,7 +98,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                 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

-                fetchData(getUri().toString(), syncResult, file.getFileId());\r
+                fetchData(getUri().toString(), syncResult, file.getFileId(), account);\r

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


@@ -98,48 +111,120 @@ 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 (Throwable t) {\r
+            // TODO update syncResult\r
+            Log.e(TAG, "problem while synchronizing owncloud account " + account.name, t);\r
+            t.printStackTrace();\r
+        }\r
+        \r
+        /*  Commented code for ugly performance tests\r
+        long sum = 0, mean = 0, max = 0, min = Long.MAX_VALUE;\r
+        for (int i=0; i<MAX_DELAYS && i<mDelaysCount; i++) {\r
+            sum += mResponseDelays[i];\r
+            max = Math.max(max, mResponseDelays[i]);\r
+            min = Math.min(min, mResponseDelays[i]);\r

         }\r
         }\r

-        sendStickyBroadcast(false, -1);        \r
+        mean = sum / mDelaysCount;\r
+        Log.e(TAG, "SYNC STATS - response: mean time = " + mean + " ; max time = " + max + " ; min time = " + min);\r
+        \r
+        sum = 0; max = 0; min = Long.MAX_VALUE;\r
+        for (int i=0; i<MAX_DELAYS && i<mDelaysCount; i++) {\r
+            sum += mSaveDelays[i];\r
+            max = Math.max(max, mSaveDelays[i]);\r
+            min = Math.min(min, mSaveDelays[i]);\r
+        }\r
+        mean = sum / mDelaysCount;\r
+        Log.e(TAG, "SYNC STATS - save:     mean time = " + mean + " ; max time = " + max + " ; min time = " + min);\r
+        Log.e(TAG, "SYNC STATS - folders measured: " + mDelaysCount);\r
+        */\r
+        \r
+        sendStickyBroadcast(false, null);        \r

     }\r
 \r
     }\r
 \r

-    private void fetchData(String uri, SyncResult syncResult, long parentId) {\r
+    private void fetchData(String uri, SyncResult syncResult, long parentId, Account account) {\r

         try {\r
         try {\r

+            //Log.v(TAG, "syncing: fetching " + uri);\r
+            \r
+            // remote request \r

             PropFindMethod query = new PropFindMethod(uri);\r
             PropFindMethod query = new PropFindMethod(uri);\r

+            /*  Commented code for ugly performance tests\r
+            long responseDelay = System.currentTimeMillis();\r
+            */\r

             getClient().executeMethod(query);\r
             getClient().executeMethod(query);\r

+            /*  Commented code for ugly performance tests\r
+            responseDelay = System.currentTimeMillis() - responseDelay;\r
+            Log.e(TAG, "syncing: RESPONSE TIME for " + uri + " contents, " + responseDelay + "ms");\r
+            */\r

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

-            List<String> paths = new ArrayList<String>();\r
-            List<Long> fileIds = new ArrayList<Long>(); \r
+            \r
+            // insertion or update of files\r
+            List<OCFile> updatedFiles = new Vector<OCFile>(resp.getResponses().length - 1);\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
             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 (getStorageManager().getFileByPath(file.getRemotePath()) != null &&\r
+                    getStorageManager().getFileByPath(file.getRemotePath()).keepInSync() &&\r
+                    file.getModificationTimestamp() > getStorageManager().getFileByPath(file.getRemotePath())\r
+                                                                         .getModificationTimestamp()) {\r
+                    Intent intent = new Intent(this.getContext(), FileDownloader.class);\r
+                    intent.putExtra(FileDownloader.EXTRA_ACCOUNT, getAccount());\r
+                    intent.putExtra(FileDownloader.EXTRA_FILE_PATH, file.getURLDecodedRemotePath());\r
+                    intent.putExtra(FileDownloader.EXTRA_REMOTE_PATH, file.getRemotePath());\r
+                    intent.putExtra(FileDownloader.EXTRA_FILE_SIZE, file.getFileLength());\r
+                    file.setKeepInSync(true);\r
+                    getContext().startService(intent);\r
+                }\r
+                if (getStorageManager().getFileByPath(file.getRemotePath()) != null)\r
+                    file.setKeepInSync(getStorageManager().getFileByPath(file.getRemotePath()).keepInSync());\r
+                //getStorageManager().saveFile(file);\r
+                updatedFiles.add(file);\r

                 if (parentId == 0)\r
                     parentId = file.getFileId();\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

+            /*  Commented code for ugly performance tests\r
+            long saveDelay = System.currentTimeMillis();\r
+            */            \r
+            getStorageManager().saveFiles(updatedFiles);    // all "at once" ; trying to get a best performance in database update\r
+            /*  Commented code for ugly performance tests\r
+            saveDelay = System.currentTimeMillis() - saveDelay;\r
+            Log.e(TAG, "syncing: SAVE TIME for " + uri + " contents, " + mSaveDelays[mDelaysIndex] + "ms");\r
+            */\r

             \r
             \r

+            // removal of obsolete files\r

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

-            for (OCFile file : files) {\r
-                if (file.getLastSyncDate() != mCurrentSyncTime && file.getLastSyncDate() != 0)\r
+            OCFile file;\r
+            for (int i=0; i < files.size(); ) {\r
+                file = files.get(i);\r
+                if (file.getLastSyncDate() != mCurrentSyncTime && file.getLastSyncDate() != 0) {\r

                     getStorageManager().removeFile(file);\r
                     getStorageManager().removeFile(file);\r

+                    files.remove(i);\r
+                } else {\r
+                    i++;\r
+                }\r

             }\r
             \r
             }\r
             \r

-            // synched folder -> notice to IU\r
-            sendStickyBroadcast(true, parentId);\r
+            // synchronized folder -> notice to UI\r
+            sendStickyBroadcast(true, getStorageManager().getFileById(parentId).getRemotePath());\r

 \r
             // recursive fetch\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
+            for (OCFile newFile : files) {\r
+                if (newFile.getMimetype().equals("DIR")) {\r
+                    fetchData(getUri().toString() + newFile.getRemotePath(), syncResult, newFile.getFileId(), account);\r
+                }\r

             }\r
             }\r

+            \r
+            /*  Commented code for ugly performance tests\r
+            mResponseDelays[mDelaysIndex] = responseDelay;\r
+            mSaveDelays[mDelaysIndex] = saveDelay;\r
+            mDelaysCount++;\r
+            mDelaysIndex++;\r
+            if (mDelaysIndex >= MAX_DELAYS)\r
+                mDelaysIndex = 0;\r
+             */\r
+            \r

 \r
 \r
         } catch (OperationCanceledException e) {\r
 \r
 \r
         } catch (OperationCanceledException e) {\r


@@ -153,6 +238,10 @@ 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 (Throwable t) {\r
+            // TODO update syncResult\r
+            Log.e(TAG, "problem while synchronizing owncloud account " + account.name, t);\r
+            t.printStackTrace();\r

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


@@ -167,12 +256,12 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
     }\r
     \r
     \r
     }\r
     \r
     \r

-    private void sendStickyBroadcast(boolean inProgress, long OCDirId) {\r
+    private void sendStickyBroadcast(boolean inProgress, String dirRemotePath) {\r

         Intent i = new Intent(FileSyncService.SYNC_MESSAGE);\r
         i.putExtra(FileSyncService.IN_PROGRESS, inProgress);\r
         i.putExtra(FileSyncService.ACCOUNT_NAME, getAccount().name);\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
+        if (dirRemotePath != null) {\r
+            i.putExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH, dirRemotePath);\r

         }\r
         getContext().sendStickyBroadcast(i);\r
     }\r
         }\r
         getContext().sendStickyBroadcast(i);\r
     }\r