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 150f9b8..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
@@ -252,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