From 53bc15cdbf41c0df50404fa2163521beeb07042f Mon Sep 17 00:00:00 2001 From: Bartek Przybylski Date: Sun, 22 Jul 2012 09:01:22 +0200 Subject: [PATCH] allow username with @, hide search menu item until sherlockactionbar wont put it to master --- res/menu/menu.xml | 2 +- src/eu/alefzero/webdav/WebdavClient.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/res/menu/menu.xml b/res/menu/menu.xml index 70600560..8ba2c3a9 100644 --- a/res/menu/menu.xml +++ b/res/menu/menu.xml @@ -4,7 +4,7 @@ - + diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java index 150f9b89..939a22d3 100644 --- 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)); String baseUrl = AccountManager.get(context).getUserData(account, AccountAuthenticator.KEY_OC_BASE_URL); String webDavPath = AccountUtils.getWebdavPath(ownCloudVersion); - String username = account.name.substring(0, account.name.indexOf('@')); + String username = account.name.substring(0, account.name.lastIndexOf('@')); String password = AccountManager.get(context).getPassword(account); mUri = Uri.parse(baseUrl + webDavPath); - +Log.e("ASD", ""+username); setCredentials(username, password); } -- 2.11.0