Fix the local file name saved in database when a file is renamed

[pub/Android/ownCloud.git] / src / eu / alefzero / webdav / WebdavClient.java

diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java
index 44b6e6b..bd58fcc 100644 (file)
--- a/src/eu/alefzero/webdav/WebdavClient.java
+++ b/src/eu/alefzero/webdav/WebdavClient.java
@@ -80,11 +80,11 @@ public class WebdavClient extends HttpClient {
                 AccountAuthenticator.KEY_OC_VERSION));\r
         String baseUrl = AccountManager.get(context).getUserData(account, AccountAuthenticator.KEY_OC_BASE_URL);\r
         String webDavPath = AccountUtils.getWebdavPath(ownCloudVersion);        \r
-        String username = account.name.substring(0, account.name.indexOf('@'));\r
+        String username = account.name.substring(0, account.name.lastIndexOf('@'));\r
         String password = AccountManager.get(context).getPassword(account);\r
         \r
         mUri = Uri.parse(baseUrl + webDavPath);\r
-\r
+Log.e("ASD", ""+username);\r
         setCredentials(username, password);\r
     }\r
     \r
@@ -97,7 +97,7 @@ public class WebdavClient extends HttpClient {
     }\r
 \r
     public void setCredentials(String username, String password) {\r
-        //getParams().setAuthenticationPreemptive(true);\r
+        getParams().setAuthenticationPreemptive(true);\r
         getState().setCredentials(AuthScope.ANY,\r
                 getCredentials(username, password));\r
     }\r
@@ -144,9 +144,9 @@ public class WebdavClient extends HttpClient {
                         mDataTransferListener.transferProgress(readResult);\r
                     fos.write(bytes, 0, readResult);\r
                 }\r
-                \r
+                ret = true;\r
             }\r
-            ret = true;\r
+            \r
         } catch (Throwable e) {\r
             e.printStackTrace();\r
             targetPath.delete();\r
@@ -186,7 +186,7 @@ public class WebdavClient extends HttpClient {
      */\r
     public boolean putFile(String localFile, String remoteTarget,\r
             String contentType) {\r
-        boolean result = true;\r
+        boolean result = false;\r
 \r
         try {\r
             Log.e("ASD", contentType + "");\r
@@ -200,7 +200,11 @@ public class WebdavClient extends HttpClient {
             int status = executeMethod(put, 0);\r
             Log.d(TAG, "PUT method return with status " + status);\r
 \r
-            Log.i(TAG, "Uploading, done");\r
+            if (status == HttpStatus.SC_OK || status == HttpStatus.SC_CREATED || status == HttpStatus.SC_NO_CONTENT) {\r
+                result = true;\r
+                Log.i(TAG, "Uploading, done");\r
+            }\r
+            \r
         } catch (final Exception e) {\r
             Log.i(TAG, "" + e.getMessage());\r
             result = false;\r
@@ -248,6 +252,23 @@ public class WebdavClient extends HttpClient {
         }\r
         return true;\r
     }\r
+    \r
+    \r
+    /**\r
+     * Check if a file exists in the OC server\r
+     * \r
+     * @return      'Boolean.TRUE' if the file exists; 'Boolean.FALSE' it doesn't exist; NULL if couldn't be checked\r
+     */\r
+    public Boolean existsFile(String path) {\r
+        try {\r
+            HeadMethod head = new HeadMethod(mUri.toString() + WebdavUtils.encodePath(path));\r
+            int status = executeMethod(head);\r
+            return (status == HttpStatus.SC_OK);\r
+        } catch (Exception e) {\r
+            e.printStackTrace();\r
+            return null;\r
+        }\r
+    }\r
 \r
 \r
     /**\r