keep file in sync and initial commit for file sharing

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


@@ -34,9 +35,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


@@ -64,13 +65,10 @@ 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
+        \r

         Log.d(TAG, "syncing owncloud account " + account.name);\r
 \r
         Log.d(TAG, "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, null);  // message to signal the start to the UI\r

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


@@ -85,7 +83,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,33 +96,71 @@ 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

-        i.putExtra(FileSyncService.IN_PROGRESS, false);\r
-        getContext().sendStickyBroadcast(i);\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
             getClient().executeMethod(query);\r
             MultiStatus resp = null;\r
             PropFindMethod query = new PropFindMethod(uri);\r
             getClient().executeMethod(query);\r
             MultiStatus resp = null;\r

+            \r

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

+            \r
+            // insertion of updated files\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

+                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
+                    file.setKeepInSync(true);\r
+                    getContext().startService(intent);\r
+                }\r

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

             }\r
             }\r

+            \r
+            // removal of old 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
+            // 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
+\r

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


@@ -136,6 +172,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


@@ -143,19 +183,21 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
         OCFile file = new OCFile(we.path());\r
         file.setCreationTimestamp(we.createTimestamp());\r
         file.setFileLength(we.contentLength());\r
         OCFile file = new OCFile(we.path());\r
         file.setCreationTimestamp(we.createTimestamp());\r
         file.setFileLength(we.contentLength());\r

-        \r
-        // dvelasco; looks like server is not sending very precise mimeTypes; mp3 file results un application/oct\r
-        String filename = file.getFileName();\r
-        String mimeType = MimeTypeMap.getSingleton()\r
-                .getMimeTypeFromExtension(filename.substring(filename.lastIndexOf('.') + 1));\r
-        if (mimeType == null)\r
-            file.setMimetype(we.contentType());\r
-        else\r
-            file.setMimetype(mimeType);\r
-        \r
+        file.setMimetype(we.contentType());\r

         file.setModificationTimestamp(we.modifiedTimesamp());\r
         file.setLastSyncDate(mCurrentSyncTime);\r
         return file;\r
     }\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
 }\r