From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 2 Jun 2014 13:13:09 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.7.0_signed~295
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/0a1447e866377773af2661ffdd0affb73e71547e?hp=445c3dc9ac925588cb1ea08ee913e0d0638ffa37

Merge branch 'master' into develop
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4cd20c0a..acf695b4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,8 +18,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 <manifest package="com.owncloud.android"
-    android:versionCode="105006"
-    android:versionName="1.5.6" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionCode="105007"
+    android:versionName="1.5.7" xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
diff --git a/oc_jb_workaround/AndroidManifest.xml b/oc_jb_workaround/AndroidManifest.xml
index 0d6002ab..069a7d3a 100644
--- a/oc_jb_workaround/AndroidManifest.xml
+++ b/oc_jb_workaround/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android.workaround.accounts"
-    android:versionCode="0100015"
-    android:versionName="1.0.15" >
+    android:versionCode="0100016"
+    android:versionName="1.0.16" >
 
     <uses-sdk
         android:minSdkVersion="16"
diff --git a/src/com/owncloud/android/operations/SynchronizeFileOperation.java b/src/com/owncloud/android/operations/SynchronizeFileOperation.java
index 1614ba1c..450cd4a7 100644
--- a/src/com/owncloud/android/operations/SynchronizeFileOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFileOperation.java
@@ -53,33 +53,63 @@ public class SynchronizeFileOperation extends SyncOperation {
     private Context mContext;
     
     private boolean mTransferWasRequested = false;
+
     
+    /**
+     * Constructor.
+     * 
+     * Uses remotePath to retrieve all the data in local cache and remote server when the operation
+     * is executed, instead of reusing {@link OCFile} instances.
+     * 
+     * @param 
+     * @param account               ownCloud account holding the file.
+     * @param syncFileContents      When 'true', transference of data will be started by the 
+     *                              operation if needed and no conflict is detected.
+     * @param context               Android context; needed to start transfers.
+     */
     public SynchronizeFileOperation(
-            OCFile localFile,
-            OCFile serverFile,          // make this null to let the operation checks the server; added to reuse info from SynchronizeFolderOperation 
+            String remotePath,  
             Account account, 
             boolean syncFileContents,
             Context context) {
         
-        mLocalFile = localFile;
-        mServerFile = serverFile;
+        mRemotePath = remotePath;
+        mLocalFile = null;
+        mServerFile = null;
         mAccount = account;
         mSyncFileContents = syncFileContents;
         mContext = context;
     }
 
+    
+    /**
+     * Constructor allowing to reuse {@link OCFile} instances just queried from cache or network.
+     * 
+     * Useful for folder / account synchronizations.
+     * 
+     * @param localFile             Data of file currently hold in device cache. MUSTN't be null.
+     * @param serverFile            Data of file just retrieved from network. If null, will be
+     *                              retrieved from network by the operation when executed.
+     * @param account               ownCloud account holding the file.
+     * @param syncFileContents      When 'true', transference of data will be started by the 
+     *                              operation if needed and no conflict is detected.
+     * @param context               Android context; needed to start transfers.
+     */
     public SynchronizeFileOperation(
-            String remotePath,  
+            OCFile localFile,
+            OCFile serverFile, 
             Account account, 
             boolean syncFileContents,
             Context context) {
         
-        mRemotePath = remotePath;
-        mServerFile = null;
+        mLocalFile = localFile;
+        mServerFile = serverFile;
+        mRemotePath = localFile.getRemotePath();
         mAccount = account;
         mSyncFileContents = syncFileContents;
         mContext = context;
     }
+    
 
     @Override
     protected RemoteOperationResult run(OwnCloudClient client) {
@@ -87,8 +117,10 @@ public class SynchronizeFileOperation extends SyncOperation {
         RemoteOperationResult result = null;
         mTransferWasRequested = false;
         
-        // Get local file from the DB
-        mLocalFile = getStorageManager().getFileByPath(mRemotePath);
+        if (mLocalFile == null) {
+            // Get local file from the DB
+            mLocalFile = getStorageManager().getFileByPath(mRemotePath);
+        }
         
         if (!mLocalFile.isDown()) {
             /// easy decision
@@ -99,8 +131,7 @@ public class SynchronizeFileOperation extends SyncOperation {
             /// local copy in the device -> need to think a bit more before do anything
 
             if (mServerFile == null) {
-                String remotePath = mLocalFile.getRemotePath();
-                ReadRemoteFileOperation operation = new ReadRemoteFileOperation(remotePath);
+                ReadRemoteFileOperation operation = new ReadRemoteFileOperation(mRemotePath);
                 result = operation.execute(client);
                 if (result.isSuccess()){
                     mServerFile = FileStorageUtils.fillOCFile((RemoteFile) result.getData().get(0));