Merge branch 'develop' into refactor_remote_operation_to_read_file

Conflicts:
	oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteFile.java
	oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteOperationResult.java
	oc_framework/src/com/owncloud/android/oc_framework/utils/FileUtils.java
	src/com/owncloud/android/operations/SynchronizeFolderOperation.java

diff --cc oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/ReadFileTest.java
index 0000000,0000000..b75732b
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/ReadFileTest.java
@@@ -1,0 -1,0 +1,61 @@@
++/* ownCloud Android client application
++ *   Copyright (C) 2012-2013 ownCloud Inc.
++ *
++ *   This program is free software: you can redistribute it and/or modify
++ *   it under the terms of the GNU General Public License version 2,
++ *   as published by the Free Software Foundation.
++ *
++ *   This program is distributed in the hope that it will be useful,
++ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *   GNU General Public License for more details.
++ *
++ *   You should have received a copy of the GNU General Public License
++ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ */
++
++package com.owncloud.android.oc_framework_test_project.test;
++
++import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
++import com.owncloud.android.oc_framework_test_project.TestActivity;
++
++import android.test.ActivityInstrumentationTestCase2;
++
++/**
++ * Class to test Read File Operation
++ * @author masensio
++ *
++ */
++
++public class ReadFileTest extends     ActivityInstrumentationTestCase2<TestActivity> {
++      
++      /* File data to read. This file must exist on the account */
++    private final String mRemoteFolderPath = "/fileToRead.txt";
++    
++    
++    private TestActivity mActivity;
++    
++    public ReadFileTest() {
++        super(TestActivity.class);
++    }
++    
++    @Override
++      protected void setUp() throws Exception {
++        super.setUp();
++        setActivityInitialTouchMode(false);
++        mActivity = getActivity();
++    }
++
++    /**
++     * Test Read File
++     */
++    public void testReadFile() {
++
++            RemoteOperationResult result = mActivity.readFile(mRemoteFolderPath);
++            assertTrue(result.getData().size() ==  1);
++            assertTrue(result.isSuccess());
++    }
++    
++
++}

diff --cc oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteOperationResult.java
index eb1c2ac,666e312..58accf9
--- 1/oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteOperationResult.java
--- 2/oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteOperationResult.java
+++ b/oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteOperationResult.java
@@@ -99,7 -99,7 +99,7 @@@ public class RemoteOperationResult impl
      private String mRedirectedLocation;
  
      private ArrayList<RemoteFile> mFiles;
-         
 -      
++    
      public RemoteOperationResult(ResultCode code) {
          mCode = code;
          mSuccess = (code == ResultCode.OK || code == ResultCode.OK_SSL || code == ResultCode.OK_NO_SSL);

diff --cc oc_framework/src/com/owncloud/android/oc_framework/utils/FileUtils.java
Simple merge

diff --cc src/com/owncloud/android/operations/SynchronizeFolderOperation.java
index 52f60e8,e93736c..866b020
--- 1/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
--- 2/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
@@@ -29,10 -30,9 +30,6 @@@ import java.util.Map
  import java.util.Vector;
  
  import org.apache.http.HttpStatus;
--import org.apache.jackrabbit.webdav.DavConstants;
- import org.apache.jackrabbit.webdav.MultiStatus;
--import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
--
  import android.accounts.Account;
  import android.content.Context;
  import android.content.Intent;
@@@ -41,11 -41,12 +38,12 @@@ import com.owncloud.android.datamodel.F
  import com.owncloud.android.datamodel.OCFile;
  import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
  import com.owncloud.android.oc_framework.network.webdav.WebdavEntry;
--import com.owncloud.android.oc_framework.network.webdav.WebdavUtils;
  import com.owncloud.android.oc_framework.operations.RemoteOperation;
  import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
  import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode;
 +import com.owncloud.android.oc_framework.operations.remote.ReadRemoteFileOperation;
+ import com.owncloud.android.oc_framework.operations.remote.ReadRemoteFolderOperation;
+ import com.owncloud.android.oc_framework.operations.RemoteFile;
  import com.owncloud.android.syncadapter.FileSyncService;
  import com.owncloud.android.utils.FileStorageUtils;
  import com.owncloud.android.utils.Log_OC;