Workaround to show hidden accents in options menu

[pub/Android/ownCloud.git] / src / com / owncloud / android / files / services / InstantUploadService.java

diff --git a/src/com/owncloud/android/files/services/InstantUploadService.java b/src/com/owncloud/android/files/services/InstantUploadService.java
index 0324f59..e7d28ff 100644 (file)
--- a/src/com/owncloud/android/files/services/InstantUploadService.java
+++ b/src/com/owncloud/android/files/services/InstantUploadService.java
@@ -18,25 +18,17 @@
 
 package com.owncloud.android.files.services;
 
 
 package com.owncloud.android.files.services;
 

-import java.io.IOException;

 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 

-import org.apache.commons.httpclient.HttpException;
-import org.apache.jackrabbit.webdav.client.methods.MkColMethod;
-
-import com.owncloud.android.AccountUtils;
-import com.owncloud.android.authenticator.AccountAuthenticator;
-import com.owncloud.android.utils.OwnCloudVersion;
+import com.owncloud.android.network.OwnCloudClientUtils;

 
 import eu.alefzero.webdav.WebdavClient;
 
 import android.accounts.Account;
 
 import eu.alefzero.webdav.WebdavClient;
 
 import android.accounts.Account;

-import android.accounts.AccountManager;

 import android.app.Service;
 import android.content.Intent;
 import android.app.Service;
 import android.content.Intent;

-import android.net.Uri;

 import android.os.IBinder;
 import android.util.Log;
 
 import android.os.IBinder;
 import android.util.Log;
 


@@ -126,34 +118,20 @@ public class InstantUploadService extends Service {
         
         public void run() {
             HashMap<String, Object> working_map;
         
         public void run() {
             HashMap<String, Object> working_map;

-            AccountManager am = AccountManager.get(getApplicationContext());

             
             while ((working_map = getFirstObject()) != null) {
                 Account account = (Account) working_map.get(KEY_ACCOUNT);
             
             while ((working_map = getFirstObject()) != null) {
                 Account account = (Account) working_map.get(KEY_ACCOUNT);

-                String username = account.name.substring(0, account.name.lastIndexOf('@'));
-                String password = am.getPassword(account);

                 String filename = (String) working_map.get(KEY_DISPLAY_NAME);
                 String filepath = (String) working_map.get(KEY_FILE_PATH);
                 String mimetype = (String) working_map.get(KEY_MIME_TYPE);
                 
                 String filename = (String) working_map.get(KEY_DISPLAY_NAME);
                 String filepath = (String) working_map.get(KEY_FILE_PATH);
                 String mimetype = (String) working_map.get(KEY_MIME_TYPE);
                 

-                String oc_base_url = am.getUserData(account, AccountAuthenticator.KEY_OC_BASE_URL);
-                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(account, getApplicationContext());
-                wdc.allowSelfsignedCertificates();
-                wdc.setCredentials(username, password);
+                WebdavClient wdc = OwnCloudClientUtils.createOwnCloudClient(account, getApplicationContext());

                 
                 

-                MkColMethod mkcol = new MkColMethod(oc_base_url+webdav_path+INSTANT_UPLOAD_DIR);
-                int status = 0;
+                wdc.createDirectory(INSTANT_UPLOAD_DIR);    // fail could just mean that it already exists; put will be tried anyway

                 try {
                 try {

-                    status = wdc.executeMethod(mkcol);
-                    Log.e(TAG, "mkcol returned " + status);

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

-                } catch (HttpException e) {
-                    e.printStackTrace();
-                } catch (IOException e) {
-                    e.printStackTrace();
+                } catch (Exception e) {
+                    // nothing to do; this service is deprecated, indeed

                 }
             }
         }
                 }
             }
         }