Fixed local path NULL when making favourite a file not down ; fixed change of local...

[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 a0b5b77..e7d28ff 100644 (file)
--- a/src/com/owncloud/android/files/services/InstantUploadService.java
+++ b/src/com/owncloud/android/files/services/InstantUploadService.java
@@ -18,26 +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.OwnCloudClientUtils;
-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;
 


@@ -136,10 +127,12 @@ public class InstantUploadService extends Service {
                 
                 WebdavClient wdc = OwnCloudClientUtils.createOwnCloudClient(account, getApplicationContext());
                 
                 
                 WebdavClient wdc = OwnCloudClientUtils.createOwnCloudClient(account, getApplicationContext());
                 

-                int status = 0;
-                wdc.createDirectory(INSTANT_UPLOAD_DIR);
-                Log.e(TAG, "mkcol returned " + status);
-                wdc.putFile(filepath, INSTANT_UPLOAD_DIR + "/" + filename, mimetype);
+                wdc.createDirectory(INSTANT_UPLOAD_DIR);    // fail could just mean that it already exists; put will be tried anyway
+                try {
+                    wdc.putFile(filepath, INSTANT_UPLOAD_DIR + "/" + filename, mimetype);
+                } catch (Exception e) {
+                    // nothing to do; this service is deprecated, indeed
+                }

             }
         }
     }
             }
         }
     }