allow username with @, hide search menu item until sherlockactionbar wont put it...

diff --git a/res/menu/menu.xml b/res/menu/menu.xml
index 7060056..8ba2c3a 100644 (file)
--- a/res/menu/menu.xml
+++ b/res/menu/menu.xml
@@ -4,7 +4,7 @@
     <item android:id="@+id/startSync" android:title="@string/actionbar_sync" android:icon="@drawable/ic_action_refresh"></item>
     <item android:id="@+id/createDirectoryItem" android:title="@string/actionbar_mkdir" android:icon="@drawable/ic_action_create_dir"></item>
     
     <item android:id="@+id/startSync" android:title="@string/actionbar_sync" android:icon="@drawable/ic_action_refresh"></item>
     <item android:id="@+id/createDirectoryItem" android:title="@string/actionbar_mkdir" android:icon="@drawable/ic_action_create_dir"></item>
     

-    <item android:id="@+id/search" android:title="@string/actionbar_search" android:icon="@drawable/ic_action_search"></item>
+    <!--  <item android:id="@+id/search" android:title="@string/actionbar_search" android:icon="@drawable/ic_action_search"></item>-->

     <item android:id="@+id/action_upload" android:title="@string/actionbar_upload" android:icon="@drawable/ic_action_upload"></item>
     <item android:id="@+id/action_settings" android:title="@string/actionbar_settings" android:icon="@android:drawable/ic_menu_preferences"></item>
     <item android:id="@+id/about_app" android:title="About" android:icon="@android:drawable/ic_menu_info_details"></item>
     <item android:id="@+id/action_upload" android:title="@string/actionbar_upload" android:icon="@drawable/ic_action_upload"></item>
     <item android:id="@+id/action_settings" android:title="@string/actionbar_settings" android:icon="@android:drawable/ic_menu_preferences"></item>
     <item android:id="@+id/about_app" android:title="About" android:icon="@android:drawable/ic_menu_info_details"></item>

diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java
index 150f9b8..939a22d 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
                 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
         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
         setCredentials(username, password);\r
     }\r
     \r