X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/91bc3fdb1eb923053b469b94e5b200482f522010..6e469559c558d87d7e3cc81fc024b597e00be313:/src/com/owncloud/android/syncadapter/FileSyncAdapter.java

diff --git a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
index 5f59475a..c5776de1 100644
--- a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
@@ -20,17 +20,19 @@ package com.owncloud.android.syncadapter;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Vector;
 
-import org.apache.http.HttpStatus;
 import org.apache.jackrabbit.webdav.DavException;
-import org.apache.jackrabbit.webdav.MultiStatus;
-import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
+import org.json.JSONObject;
 
+import com.owncloud.android.AccountUtils;
 import com.owncloud.android.R;
+import com.owncloud.android.authenticator.AccountAuthenticator;
+import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.files.services.FileDownloader;
+import com.owncloud.android.operations.RemoteOperationResult;
+import com.owncloud.android.operations.SynchronizeFolderOperation;
+import com.owncloud.android.utils.OwnCloudVersion;
 
 import android.accounts.Account;
 import android.app.Notification;
@@ -43,8 +45,7 @@ import android.content.Intent;
 import android.content.SyncResult;
 import android.os.Bundle;
 import android.util.Log;
-import eu.alefzero.webdav.WebdavEntry;
-import eu.alefzero.webdav.WebdavUtils;
+import eu.alefzero.webdav.WebdavClient;
 
 /**
  * SyncAdapter implementation for syncing sample SyncAdapter contacts to the
@@ -56,14 +57,6 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
 
     private final static String TAG = "FileSyncAdapter"; 
     
-    /*  Commented code for ugly performance tests
-    private final static int MAX_DELAYS = 100;
-    private static long[] mResponseDelays = new long[MAX_DELAYS]; 
-    private static long[] mSaveDelays = new long[MAX_DELAYS];
-    private int mDelaysIndex = 0;
-    private int mDelaysCount = 0;
-    */
-    
     private long mCurrentSyncTime;
     private boolean mCancellation;
     private boolean mIsManualSync;
@@ -86,54 +79,23 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
         this.setContentProvider(provider);
         this.setStorageManager(new FileDataStorageManager(account, getContentProvider()));
         
-        /*  Commented code for ugly performance tests
-        mDelaysIndex = 0;
-        mDelaysCount = 0;
-        */
-        
-        
         Log.d(TAG, "syncing owncloud account " + account.name);
 
         sendStickyBroadcast(true, null);  // message to signal the start to the UI
-
-        String uri = getUri().toString();
-        PropFindMethod query = null;
+        
         try {
+            updateOCVersion();
             mCurrentSyncTime = System.currentTimeMillis();
-            query = new PropFindMethod(uri + "/");
-            int status = getClient().executeMethod(query);
-            if (status != HttpStatus.SC_UNAUTHORIZED) {
-                MultiStatus resp = query.getResponseBodyAsMultiStatus();
-
-                if (resp.getResponses().length > 0) {
-                    WebdavEntry we = new WebdavEntry(resp.getResponses()[0], getUri().getPath());
-                    OCFile file = fillOCFile(we);
-                    file.setParentId(0);
-                    getStorageManager().saveFile(file);
-                    if (!mCancellation) {
-                        fetchData(uri, syncResult, file.getFileId());
-                    }
-                }
+            if (!mCancellation) {
+                fetchData(OCFile.PATH_SEPARATOR, syncResult, DataStorageManager.ROOT_PARENT_ID);
                 
             } else {
-                syncResult.stats.numAuthExceptions++;
+                Log.d(TAG, "Leaving synchronization before any remote request due to cancellation was requested");
             }
-        } catch (IOException e) {
-            syncResult.stats.numIoExceptions++;
-            logException(e, uri + "/");
-            
-        } catch (DavException e) {
-            syncResult.stats.numParseExceptions++;
-            logException(e, uri + "/");
-            
-        } catch (Exception e) {
-            // TODO something smart with syncresult
-            logException(e, uri + "/");
-            mRightSync = false;
             
         } finally {
-            if (query != null)
-                query.releaseConnection();  // let the connection available for other methods
+            // it's important making this although very unexpected errors occur; that's the reason for the finally
+            
             mRightSync &= (syncResult.stats.numIoExceptions == 0 && syncResult.stats.numAuthExceptions == 0 && syncResult.stats.numParseExceptions == 0);
             if (!mRightSync && mIsManualSync) {
                 /// don't let the system synchronization manager retries MANUAL synchronizations
@@ -141,206 +103,173 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                 syncResult.tooManyRetries = true;
                 
                 /// notify the user about the failure of MANUAL synchronization
-                Notification notification = new Notification(R.drawable.icon, getContext().getString(R.string.sync_fail_ticker), System.currentTimeMillis());
-                notification.flags |= Notification.FLAG_AUTO_CANCEL;
-                // TODO put something smart in the contentIntent below
-                notification.contentIntent = PendingIntent.getActivity(getContext().getApplicationContext(), 0, new Intent(), PendingIntent.FLAG_UPDATE_CURRENT);
-                notification.setLatestEventInfo(getContext().getApplicationContext(), 
-                                                getContext().getString(R.string.sync_fail_ticker), 
-                                                String.format(getContext().getString(R.string.sync_fail_content), account.name), 
-                                                notification.contentIntent);
-                ((NotificationManager) getContext().getSystemService(Context.NOTIFICATION_SERVICE)).notify(R.string.sync_fail_ticker, notification);
+                notifyFailedSynchronization();
             }
             sendStickyBroadcast(false, null);        // message to signal the end to the UI
         }
         
-        /*  Commented code for ugly performance tests
-        long sum = 0, mean = 0, max = 0, min = Long.MAX_VALUE;
-        for (int i=0; i<MAX_DELAYS && i<mDelaysCount; i++) {
-            sum += mResponseDelays[i];
-            max = Math.max(max, mResponseDelays[i]);
-            min = Math.min(min, mResponseDelays[i]);
-        }
-        mean = sum / mDelaysCount;
-        Log.e(TAG, "SYNC STATS - response: mean time = " + mean + " ; max time = " + max + " ; min time = " + min);
-        
-        sum = 0; max = 0; min = Long.MAX_VALUE;
-        for (int i=0; i<MAX_DELAYS && i<mDelaysCount; i++) {
-            sum += mSaveDelays[i];
-            max = Math.max(max, mSaveDelays[i]);
-            min = Math.min(min, mSaveDelays[i]);
-        }
-        mean = sum / mDelaysCount;
-        Log.e(TAG, "SYNC STATS - save:     mean time = " + mean + " ; max time = " + max + " ; min time = " + min);
-        Log.e(TAG, "SYNC STATS - folders measured: " + mDelaysCount);
-        */
-        
     }
-
-    private void fetchData(String uri, SyncResult syncResult, long parentId) {
-        PropFindMethod query = null;
+    
+    
+    
+    /**
+     * Called by system SyncManager when a synchronization is required to be cancelled.
+     * 
+     * Sets the mCancellation flag to 'true'. THe synchronization will be stopped when before a new folder is fetched. Data of the last folder
+     * fetched will be still saved in the database. See onPerformSync implementation.
+     */
+    @Override
+    public void onSyncCanceled() {
+        Log.d(TAG, "Synchronization of " + getAccount().name + " has been requested to cancel");
+        mCancellation = true;
+        super.onSyncCanceled();
+    }
+    
+    
+    /**
+     * Updates the locally stored version value of the ownCloud server
+     */
+    private void updateOCVersion() {
+        String statUrl = getAccountManager().getUserData(getAccount(), AccountAuthenticator.KEY_OC_BASE_URL);
+        statUrl += AccountUtils.STATUS_PATH;
+        
         try {
-            Log.d(TAG, "fetching " + uri);
-            
-            // remote request 
-            query = new PropFindMethod(uri);
-            /*  Commented code for ugly performance tests
-            long responseDelay = System.currentTimeMillis();
-            */
-            int status = getClient().executeMethod(query);
-            /*  Commented code for ugly performance tests
-            responseDelay = System.currentTimeMillis() - responseDelay;
-            Log.e(TAG, "syncing: RESPONSE TIME for " + uri + " contents, " + responseDelay + "ms");
-            */
-            if (status != HttpStatus.SC_UNAUTHORIZED) {
-                MultiStatus resp = query.getResponseBodyAsMultiStatus();
-            
-                // insertion or update of files
-                List<OCFile> updatedFiles = new Vector<OCFile>(resp.getResponses().length - 1);
-                for (int i = 1; i < resp.getResponses().length; ++i) {
-                    WebdavEntry we = new WebdavEntry(resp.getResponses()[i], getUri().getPath());
-                    OCFile file = fillOCFile(we);
-                    file.setParentId(parentId);
-                    if (getStorageManager().getFileByPath(file.getRemotePath()) != null &&
-                            getStorageManager().getFileByPath(file.getRemotePath()).keepInSync() &&
-                            file.getModificationTimestamp() > getStorageManager().getFileByPath(file.getRemotePath())
-                                                                         .getModificationTimestamp()) {
-                        Intent intent = new Intent(this.getContext(), FileDownloader.class);
-                        intent.putExtra(FileDownloader.EXTRA_ACCOUNT, getAccount());
-                        intent.putExtra(FileDownloader.EXTRA_FILE_PATH, file.getRemotePath());
-                        intent.putExtra(FileDownloader.EXTRA_REMOTE_PATH, file.getRemotePath());
-                        intent.putExtra(FileDownloader.EXTRA_FILE_SIZE, file.getFileLength());
-                        file.setKeepInSync(true);
-                        getContext().startService(intent);
+            String result = getClient().getResultAsString(statUrl);
+            if (result != null) {
+                try {
+                    JSONObject json = new JSONObject(result);
+                    if (json != null && json.getString("version") != null) {
+                        OwnCloudVersion ocver = new OwnCloudVersion(json.getString("version"));
+                        if (ocver.isVersionValid()) {
+                            getAccountManager().setUserData(getAccount(), AccountAuthenticator.KEY_OC_VERSION, ocver.toString());
+                            Log.d(TAG, "Got new OC version " + ocver.toString());
+                        } else {
+                            Log.w(TAG, "Invalid version number received from server: " + json.getString("version"));
+                        }
                     }
-                    if (getStorageManager().getFileByPath(file.getRemotePath()) != null)
-                        file.setKeepInSync(getStorageManager().getFileByPath(file.getRemotePath()).keepInSync());
-                
-                    // Log.v(TAG, "adding file: " + file);
-                    updatedFiles.add(file);
-                    if (parentId == 0)
-                        parentId = file.getFileId();
+                } catch (Throwable e) {
+                    Log.w(TAG, "Couldn't parse version response", e);
                 }
-                /*  Commented code for ugly performance tests
-                long saveDelay = System.currentTimeMillis();
-                 */            
-                getStorageManager().saveFiles(updatedFiles);    // all "at once" ; trying to get a best performance in database update
-                /*  Commented code for ugly performance tests
-                saveDelay = System.currentTimeMillis() - saveDelay;
-                Log.e(TAG, "syncing: SAVE TIME for " + uri + " contents, " + mSaveDelays[mDelaysIndex] + "ms");
-                 */
-            
-                // removal of obsolete files
-                Vector<OCFile> files = getStorageManager().getDirectoryContent(
-                        getStorageManager().getFileById(parentId));
-                OCFile file;
-                String currentSavePath = FileDownloader.getSavePath(getAccount().name);
-                for (int i=0; i < files.size(); ) {
-                    file = files.get(i);
-                    if (file.getLastSyncDate() != mCurrentSyncTime) {
-                        Log.v(TAG, "removing file: " + file);
-                        getStorageManager().removeFile(file, (file.isDown() && file.getStoragePath().startsWith(currentSavePath)));
-                        files.remove(i);
-                    } else {
-                        i++;
-                    }
-                }
-            
-                // recursive fetch
-                for (int i=0; i < files.size() && !mCancellation; i++) {
-                    OCFile newFile = files.get(i);
-                    if (newFile.getMimetype().equals("DIR")) {
-                        fetchData(getUri().toString() + WebdavUtils.encodePath(newFile.getRemotePath()), syncResult, newFile.getFileId());
-                    }
-                }
-                if (mCancellation) Log.d(TAG, "Leaving " + uri + " because cancelation request");
-                
-                /*  Commented code for ugly performance tests
-                mResponseDelays[mDelaysIndex] = responseDelay;
-                mSaveDelays[mDelaysIndex] = saveDelay;
-                mDelaysCount++;
-                mDelaysIndex++;
-                if (mDelaysIndex >= MAX_DELAYS)
-                    mDelaysIndex = 0;
-                 */
-
             } else {
-                syncResult.stats.numAuthExceptions++;
+                Log.w(TAG, "Problem while getting ocversion from server");
             }
+        } catch (Exception e) {
+            Log.e(TAG, "Problem getting response from server", e);
+        }
+    }
+
+    
+    
+    /**
+     * Synchronize the properties of files and folders contained in a remote folder given by remotePath.
+     * 
+     * @param remotePath        Remote path to the folder to synchronize.
+     * @param parentId          Database Id of the folder to synchronize.
+     * @param syncResult        Object to update for communicate results to the system's synchronization manager.        
+     */
+    private void fetchData(String remotePath, SyncResult syncResult, long parentId) {
+        
+        // get client object to connect to the remote ownCloud server
+        WebdavClient client = null;
+        try {
+            client = getClient();
         } catch (IOException e) {
             syncResult.stats.numIoExceptions++;
-            logException(e, uri);
+            Log.d(TAG, "Could not get client object while trying to synchronize - impossible to continue");
+            return;
+        }
+        
+        // perform folder synchronization
+        SynchronizeFolderOperation synchFolderOp = new SynchronizeFolderOperation(  remotePath, 
+                                                                                    mCurrentSyncTime, 
+                                                                                    parentId, 
+                                                                                    getStorageManager(), 
+                                                                                    getAccount(), 
+                                                                                    getContext()
+                                                                                  );
+        RemoteOperationResult result = synchFolderOp.execute(client);
+        
+        
+        // synchronized folder -> notice to UI - ALWAYS, although !result.isSuccess
+        sendStickyBroadcast(true, remotePath);
+        
+        if (result.isSuccess()) {
+            // synchronize children folders 
+            List<OCFile> children = synchFolderOp.getChildren();
+            fetchChildren(children, syncResult);    // beware of the 'hidden' recursion here!
             
-        } catch (DavException e) {
-            syncResult.stats.numParseExceptions++;
-            logException(e, uri);
+        } else {
+            if (result.getCode() == RemoteOperationResult.ResultCode.UNAUTHORIZED) {
+                syncResult.stats.numAuthExceptions++;
+                
+            } else if (result.getException() instanceof DavException) {
+                syncResult.stats.numParseExceptions++;
+                
+            } else if (result.getException() instanceof IOException) { 
+                syncResult.stats.numIoExceptions++;
+                
+            } else if (result.getException() != null) {
+                // TODO maybe something smarter with syncResult
+                mRightSync = false;
+            }
+        }
             
-        } catch (Exception e) {
-            // TODO something smart with syncresult
-            mRightSync = false;
-            logException(e, uri);
-
-        } finally {
-            if (query != null)
-                query.releaseConnection();  // let the connection available for other methods
+    }
 
-            // synchronized folder -> notice to UI
-            sendStickyBroadcast(true, getStorageManager().getFileById(parentId).getRemotePath());
+    /**
+     * Synchronize data of folders in the list of received files
+     * 
+     * @param files         Files to recursively fetch 
+     * @param syncResult    Updated object to provide results to the Synchronization Manager
+     */
+    private void fetchChildren(List<OCFile> files, SyncResult syncResult) {
+        int i;
+        for (i=0; i < files.size() && !mCancellation; i++) {
+            OCFile newFile = files.get(i);
+            if (newFile.isDirectory()) {
+                fetchData(newFile.getRemotePath(), syncResult, newFile.getFileId());
+            }
         }
+        if (mCancellation && i <files.size()) Log.d(TAG, "Leaving synchronization before synchronizing " + files.get(i).getRemotePath() + " because cancelation request");
     }
 
-    private OCFile fillOCFile(WebdavEntry we) {
-        OCFile file = new OCFile(we.decodedPath());
-        file.setCreationTimestamp(we.createTimestamp());
-        file.setFileLength(we.contentLength());
-        file.setMimetype(we.contentType());
-        file.setModificationTimestamp(we.modifiedTimesamp());
-        file.setLastSyncDate(mCurrentSyncTime);
-        return file;
-    }
-    
     
-    private void sendStickyBroadcast(boolean inProgress, String dirRemotePath) {
+    /**
+     * Sends a message to any app component interested in the progress of the synchronization.
+     * 
+     * @param inProgress        'True' when the synchronization progress is not finished.
+     * @param dirRemotePath     Remote path of a folder that was just synchronized (with or without success)
+     */
+    private void sendStickyBroadcast(boolean inProgress, String dirRemotePath/*, RemoteOperationResult result*/) {
         Intent i = new Intent(FileSyncService.SYNC_MESSAGE);
         i.putExtra(FileSyncService.IN_PROGRESS, inProgress);
         i.putExtra(FileSyncService.ACCOUNT_NAME, getAccount().name);
         if (dirRemotePath != null) {
             i.putExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH, dirRemotePath);
         }
+        /*if (result != null) {
+            i.putExtra(FileSyncService.SYNC_RESULT, result);
+        }*/
         getContext().sendStickyBroadcast(i);
     }
-    
-    /**
-     * Called by system SyncManager when a synchronization is required to be cancelled.
-     * 
-     * Sets the mCancellation flag to 'true'. THe synchronization will be stopped when before a new folder is fetched. Data of the last folder
-     * fetched will be still saved in the database. See onPerformSync implementation.
-     */
-    @Override
-    public void onSyncCanceled() {
-        Log.d(TAG, "Synchronization of " + getAccount().name + " has been requested to cancel");
-        mCancellation = true;
-        super.onSyncCanceled();
-    }
 
     
+    
     /**
-     * Logs an exception triggered in a synchronization request. 
-     * 
-     * @param e       Caught exception.
-     * @param uri     Uri to the remote directory that was fetched when the synchronization failed 
+     * Notifies the user about a failed synchronization through the status notification bar 
      */
-    private void logException(Exception e, String uri) {
-        if (e instanceof IOException) {
-            Log.e(TAG, "Unrecovered transport exception while synchronizing " + uri + " at " + getAccount().name, e);
-
-        } else if (e instanceof DavException) {
-            Log.e(TAG, "Unexpected WebDAV exception while synchronizing " + uri + " at " + getAccount().name, e);
-
-        } else {
-            Log.e(TAG, "Unexpected exception while synchronizing " + uri  + " at " + getAccount().name, e);
-        }
+    private void notifyFailedSynchronization() {
+        Notification notification = new Notification(R.drawable.icon, getContext().getString(R.string.sync_fail_ticker), System.currentTimeMillis());
+        notification.flags |= Notification.FLAG_AUTO_CANCEL;
+        // TODO put something smart in the contentIntent below
+        notification.contentIntent = PendingIntent.getActivity(getContext().getApplicationContext(), (int)System.currentTimeMillis(), new Intent(), 0);
+        notification.setLatestEventInfo(getContext().getApplicationContext(), 
+                                        getContext().getString(R.string.sync_fail_ticker), 
+                                        String.format(getContext().getString(R.string.sync_fail_content), getAccount().name), 
+                                        notification.contentIntent);
+        ((NotificationManager) getContext().getSystemService(Context.NOTIFICATION_SERVICE)).notify(R.string.sync_fail_ticker, notification);
     }
 
     
+
 }