Merge tag 'oc-android-1-3-22' 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 6f9dc6d..aadf4d9 100644 (file)
--- a/src/com/owncloud/android/Uploader.java
+++ b/src/com/owncloud/android/Uploader.java
@@ -31,7 +31,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.network.OwnCloudClientUtils;\r
 \r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
@@ -61,7 +60,6 @@ import android.widget.SimpleAdapter;
 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
@@ -141,8 +139,8 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
                         // in API7 < this constatant is defined in\r
                         // Settings.ADD_ACCOUNT_SETTINGS\r
                         // and Settings.EXTRA_AUTHORITIES\r
-                        Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS");\r
-                        intent.putExtra("authorities", new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });\r
+                        Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT);\r
+                        intent.putExtra("authorities", new String[] { AccountAuthenticator.AUTHORITY });\r
                         startActivityForResult(intent, REQUEST_CODE_SETUP_ACCOUNT);\r
                     } else {\r
                         // since in API7 there is no direct call for\r
@@ -358,12 +356,13 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
 \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
-\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