Merge branch 'develop' into refactor_remote_operation_to_download_file

Conflicts:
	oc_framework-test-project/AndroidManifest.xml
	oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java

diff --combined oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java
index 4fe3cd3,c42aca2..11f74cf
--- 1/oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java
--- 2/oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java
+++ b/oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java
@@@ -1,37 -1,17 +1,39 @@@
 +/* 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;
  
 +import java.io.File;
 +
  import com.owncloud.android.oc_framework.network.webdav.OwnCloudClientFactory;
  import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
 +import com.owncloud.android.oc_framework.operations.RemoteFile;
  import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
+ import com.owncloud.android.oc_framework.operations.remote.ChunkedUploadRemoteFileOperation;
  import com.owncloud.android.oc_framework.operations.remote.CreateRemoteFolderOperation;
 +import com.owncloud.android.oc_framework.operations.remote.DownloadRemoteFileOperation;
  import com.owncloud.android.oc_framework.operations.remote.ReadRemoteFolderOperation;
  import com.owncloud.android.oc_framework.operations.remote.RemoveRemoteFileOperation;
  import com.owncloud.android.oc_framework.operations.remote.RenameRemoteFileOperation;
+ import com.owncloud.android.oc_framework.operations.remote.UploadRemoteFileOperation;
  
  import android.net.Uri;
  import android.os.Bundle;
 +import android.os.Environment;
  import android.app.Activity;
  import android.view.Menu;
  
@@@ -40,13 -20,13 +42,14 @@@
   * @author masensio
   * @author David A. Velasco
   */
 +
  public class TestActivity extends Activity {
        
        // This account must exists on the simulator / device
        private static final String mServerUri = "https://beta.owncloud.com/owncloud/remote.php/webdav";
        private static final String mUser = "testandroid";
        private static final String mPass = "testandroid";
+       private static final boolean mChunked = true;
        
        //private Account mAccount = null;
        private WebdavClient mClient;
@@@ -128,23 -108,24 +131,43 @@@
                return result;
        }
        
 +      /**
 +       * Access to the library method to Download a File
 +       * @param remotePath
 +       * 
 +       * @return
 +       */
 +      public RemoteOperationResult downloadFile(RemoteFile remoteFile, String temporalFolder) {
 +              // Create folder 
 +              String path =  "/owncloud/tmp/" + temporalFolder;
 +              File sdCard = Environment.getExternalStorageDirectory();
 +              File folder = new File(sdCard.getAbsolutePath() + "/" + path);
 +              folder.mkdirs();
 +              
 +              DownloadRemoteFileOperation downloadOperation = new DownloadRemoteFileOperation(remoteFile, folder.getAbsolutePath());
 +              RemoteOperationResult result = downloadOperation.execute(mClient);
 +
 +              return result;
 +      }
 +      
+       /** Access to the library method to Upload a File 
+        * @param storagePath
+        * @param remotePath
+        * @param mimeType
+        * 
+        * @return
+        */
+       public RemoteOperationResult uploadFile(String storagePath, String remotePath, String mimeType) {
+ 
+               UploadRemoteFileOperation uploadOperation;
+               if (mChunked) {
+             uploadOperation = new ChunkedUploadRemoteFileOperation(storagePath, remotePath, mimeType);
+         } else {
+             uploadOperation = new UploadRemoteFileOperation(storagePath, remotePath, mimeType);
+         }
+               
+               RemoteOperationResult result = uploadOperation.execute(mClient);
+               
+               return result;
+       }
  }