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 816e79e..ef7a3d5 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
@@ -19,6 +19,9 @@
 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.io.ObjectInputStream.GetField;\r
+import java.util.List;\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,10 +34,11 @@ 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.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


@@ -45,96 +49,221 @@ 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
-\r
-                       this.setAccount(account);\r
-                       this.setContentProvider(provider);\r
-                       this.setStorageManager(new FileDataStorageManager(account, getContentProvider()));\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
+    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
+        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
+        /*  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
+        sendStickyBroadcast(true, null);  // message to signal the start to the UI\r
+\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
+            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(), account);\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
+        } 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
+        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
         }\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
-\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
+        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 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 void fetchData(String uri, SyncResult syncResult, long parentId, Account account) {\r
+        try {\r
+            //Log.v(TAG, "syncing: fetching " + uri);\r
+            \r
+            // remote request \r
+            PropFindMethod query = new PropFindMethod(uri);\r
+            /*  Commented code for ugly performance tests\r
+            long responseDelay = System.currentTimeMillis();\r
+            */\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
+            \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
+                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
+            }\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
+            // removal of obsolete files\r
+            Vector<OCFile> files = getStorageManager().getDirectoryContent(\r
+                    getStorageManager().getFileById(parentId));\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
+                    files.remove(i);\r
+                } else {\r
+                    i++;\r
+                }\r
+            }\r
+            \r
+            // synchronized folder -> notice to UI\r
+            sendStickyBroadcast(true, getStorageManager().getFileById(parentId).getRemotePath());\r
+\r
+            // recursive fetch\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
+            /*  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
+            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
+        } 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
+    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
+        file.setLastSyncDate(mCurrentSyncTime);\r
+        return file;\r
+    }\r
+    \r
+    \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
+        if (dirRemotePath != null) {\r
+            i.putExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH, dirRemotePath);\r
+        }\r
+        getContext().sendStickyBroadcast(i);\r
+    }\r
+\r

 }\r
 }\r