Quick patch to fix operations not ready for HTTPS

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / files / services / InstantUploadService.java

diff --git a/src/eu/alefzero/owncloud/files/services/InstantUploadService.java b/src/eu/alefzero/owncloud/files/services/InstantUploadService.java
index 9ac0411..b666e59 100644 (file)
--- a/src/eu/alefzero/owncloud/files/services/InstantUploadService.java
+++ b/src/eu/alefzero/owncloud/files/services/InstantUploadService.java
@@ -139,7 +139,7 @@ public class InstantUploadService extends Service {
                 String oc_version = am.getUserData(account, AccountAuthenticator.KEY_OC_VERSION);
                 OwnCloudVersion ocv = new OwnCloudVersion(oc_version);
                 String webdav_path = AccountUtils.getWebdavPath(ocv);
                 String oc_version = am.getUserData(account, AccountAuthenticator.KEY_OC_VERSION);
                 OwnCloudVersion ocv = new OwnCloudVersion(oc_version);
                 String webdav_path = AccountUtils.getWebdavPath(ocv);

-                WebdavClient wdc = new WebdavClient(Uri.parse(oc_base_url + webdav_path));
+                WebdavClient wdc = new WebdavClient(account, getApplicationContext());

                 wdc.allowSelfsignedCertificates();
                 wdc.setCredentials(username, password);
                 
                 wdc.allowSelfsignedCertificates();
                 wdc.setCredentials(username, password);
                 


@@ -148,7 +148,7 @@ public class InstantUploadService extends Service {
                 try {
                     status = wdc.executeMethod(mkcol);
                     Log.e(TAG, "mkcol returned " + status);
                 try {
                     status = wdc.executeMethod(mkcol);
                     Log.e(TAG, "mkcol returned " + status);

-                    wdc.putFile(filepath, INSTANT_UPLOAD_DIR + "/" + Uri.encode(filename), mimetype);
+                    wdc.putFile(filepath, INSTANT_UPLOAD_DIR + "/" + filename, mimetype);

                 } catch (HttpException e) {
                     e.printStackTrace();
                 } catch (IOException e) {
                 } catch (HttpException e) {
                     e.printStackTrace();
                 } catch (IOException e) {