Merge branch 'master' into oauth_login

[pub/Android/ownCloud.git] / src / com / owncloud / android / Uploader.java

diff --git a/src/com/owncloud/android/Uploader.java b/src/com/owncloud/android/Uploader.java
index e19a972..6ec8c4f 100644 (file)
--- a/src/com/owncloud/android/Uploader.java
+++ b/src/com/owncloud/android/Uploader.java
@@ -30,7 +30,6 @@ import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.datamodel.OCFile;\r
 import com.owncloud.android.files.services.FileUploader;\r
 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.datamodel.OCFile;\r
 import com.owncloud.android.files.services.FileUploader;\r

-import com.owncloud.android.network.OwnCloudClientUtils;\r

 \r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 \r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r


@@ -60,7 +59,6 @@ import android.widget.SimpleAdapter;
 import android.widget.Toast;\r
 \r
 import com.owncloud.android.R;\r
 import android.widget.Toast;\r
 \r
 import com.owncloud.android.R;\r

-import eu.alefzero.webdav.WebdavClient;\r

 \r
 /**\r
  * This can be used to upload things to an ownCloud instance.\r
 \r
 /**\r
  * This can be used to upload things to an ownCloud instance.\r


@@ -357,12 +355,13 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
 \r
     public void uploadFiles() {\r
         try {\r
 \r
     public void uploadFiles() {\r
         try {\r

+            /* TODO - mCreateDir can never be true at this moment; we will replace wdc.createDirectory by CreateFolderOperation when that is fixed \r

             WebdavClient wdc = OwnCloudClientUtils.createOwnCloudClient(mAccount, getApplicationContext());\r
             WebdavClient wdc = OwnCloudClientUtils.createOwnCloudClient(mAccount, getApplicationContext());\r

-\r

             // create last directory in path if necessary\r
             if (mCreateDir) {\r
                 wdc.createDirectory(mUploadPath);\r
             }\r
             // create last directory in path if necessary\r
             if (mCreateDir) {\r
                 wdc.createDirectory(mUploadPath);\r
             }\r

+            */\r

 \r
             String[] local = new String[mStreamsToUpload.size()], remote = new String[mStreamsToUpload.size()];\r
 \r
 \r
             String[] local = new String[mStreamsToUpload.size()], remote = new String[mStreamsToUpload.size()];\r
 \r