Merge pull request #740 from owncloud/revert-669-master

[pub/Android/ownCloud.git] / src / com / owncloud / android / authentication / AccountUtils.java

diff --git a/src/com/owncloud/android/authentication/AccountUtils.java b/src/com/owncloud/android/authentication/AccountUtils.java
index cfa00e3..dc02344 100644 (file)
--- a/src/com/owncloud/android/authentication/AccountUtils.java
+++ b/src/com/owncloud/android/authentication/AccountUtils.java
@@ -18,11 +18,14 @@
 \r
 package com.owncloud.android.authentication;\r
 \r
 \r
 package com.owncloud.android.authentication;\r
 \r

-import com.owncloud.android.utils.OwnCloudVersion;\r
+import java.util.Locale;\r
+\r
+import com.owncloud.android.MainApp;\r
+import com.owncloud.android.lib.common.accounts.AccountTypeUtils;\r
+import com.owncloud.android.lib.resources.status.OwnCloudVersion;\r

 \r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 \r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r

-import android.accounts.AccountsException;\r

 import android.content.Context;\r
 import android.content.SharedPreferences;\r
 import android.preference.PreferenceManager;\r
 import android.content.Context;\r
 import android.content.SharedPreferences;\r
 import android.preference.PreferenceManager;\r


@@ -32,6 +35,7 @@ public class AccountUtils {
     public static final String WEBDAV_PATH_2_0 = "/files/webdav.php";\r
     public static final String WEBDAV_PATH_4_0 = "/remote.php/webdav";\r
     private static final String ODAV_PATH = "/remote.php/odav";\r
     public static final String WEBDAV_PATH_2_0 = "/files/webdav.php";\r
     public static final String WEBDAV_PATH_4_0 = "/remote.php/webdav";\r
     private static final String ODAV_PATH = "/remote.php/odav";\r

+    private static final String SAML_SSO_PATH = "/remote.php/webdav";\r

     public static final String CARDDAV_PATH_2_0 = "/apps/contacts/carddav.php";\r
     public static final String CARDDAV_PATH_4_0 = "/remote/carddav.php";\r
     public static final String STATUS_PATH = "/status.php";\r
     public static final String CARDDAV_PATH_2_0 = "/apps/contacts/carddav.php";\r
     public static final String CARDDAV_PATH_4_0 = "/remote/carddav.php";\r
     public static final String STATUS_PATH = "/status.php";\r


@@ -47,7 +51,7 @@ public class AccountUtils {
      */\r
     public static Account getCurrentOwnCloudAccount(Context context) {\r
         Account[] ocAccounts = AccountManager.get(context).getAccountsByType(\r
      */\r
     public static Account getCurrentOwnCloudAccount(Context context) {\r
         Account[] ocAccounts = AccountManager.get(context).getAccountsByType(\r

-                AccountAuthenticator.ACCOUNT_TYPE);\r
+                MainApp.getAccountType());\r

         Account defaultAccount = null;\r
 \r
         SharedPreferences appPreferences = PreferenceManager\r
         Account defaultAccount = null;\r
 \r
         SharedPreferences appPreferences = PreferenceManager\r


@@ -74,6 +78,30 @@ public class AccountUtils {
     }\r
 \r
     \r
     }\r
 \r
     \r

+    public static boolean exists(Account account, Context context) {\r
+        Account[] ocAccounts = AccountManager.get(context).getAccountsByType(\r
+                MainApp.getAccountType());\r
+\r
+        if (account != null && account.name != null) {\r
+            int lastAtPos = account.name.lastIndexOf("@");\r
+            String hostAndPort = account.name.substring(lastAtPos + 1);\r
+            String username = account.name.substring(0, lastAtPos);\r
+            String otherHostAndPort, otherUsername;\r
+            Locale currentLocale = context.getResources().getConfiguration().locale;\r
+            for (Account otherAccount : ocAccounts) {\r
+                lastAtPos = otherAccount.name.lastIndexOf("@");\r
+                otherHostAndPort = otherAccount.name.substring(lastAtPos + 1);\r
+                otherUsername = otherAccount.name.substring(0, lastAtPos);\r
+                if (otherHostAndPort.equals(hostAndPort) &&\r
+                        otherUsername.toLowerCase(currentLocale).\r
+                            equals(username.toLowerCase(currentLocale))) {\r
+                    return true;\r
+                }\r
+            }\r
+        }\r
+        return false;\r
+    }\r
+    \r

 \r
     /**\r
      * Checks, whether or not there are any ownCloud accounts setup.\r
 \r
     /**\r
      * Checks, whether or not there are any ownCloud accounts setup.\r


@@ -83,7 +111,7 @@ public class AccountUtils {
     public static boolean accountsAreSetup(Context context) {\r
         AccountManager accMan = AccountManager.get(context);\r
         Account[] accounts = accMan\r
     public static boolean accountsAreSetup(Context context) {\r
         AccountManager accMan = AccountManager.get(context);\r
         Account[] accounts = accMan\r

-                .getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);\r
+                .getAccountsByType(MainApp.getAccountType());\r

         return accounts.length > 0;\r
     }\r
     \r
         return accounts.length > 0;\r
     }\r
     \r


@@ -92,7 +120,7 @@ public class AccountUtils {
         boolean result = false;\r
         if (accountName != null) {\r
             Account[] ocAccounts = AccountManager.get(context).getAccountsByType(\r
         boolean result = false;\r
         if (accountName != null) {\r
             Account[] ocAccounts = AccountManager.get(context).getAccountsByType(\r

-                    AccountAuthenticator.ACCOUNT_TYPE);\r
+                    MainApp.getAccountType());\r

             boolean found = false;\r
             for (Account account : ocAccounts) {\r
                 found = (account.name.equals(accountName));\r
             boolean found = false;\r
             for (Account account : ocAccounts) {\r
                 found = (account.name.equals(accountName));\r


@@ -111,15 +139,21 @@ public class AccountUtils {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

+     * Returns the proper URL path to access the WebDAV interface of an ownCloud server,\r
+     * according to its version and the authorization method used.\r

      * \r
      * \r

-     * @param version version of owncloud\r
-     * @return webdav path for given OC version, null if OC version unknown\r
+     * @param   version         Version of ownCloud server.\r
+     * @param   authTokenType   Authorization token type, matching some of the AUTH_TOKEN_TYPE_* constants in {@link AccountAuthenticator}. \r
+     * @return                  WebDAV path for given OC version and authorization method, null if OC version is unknown.\r

      */\r
      */\r

-    public static String getWebdavPath(OwnCloudVersion version, boolean supportsOAuth) {\r
+    public static String getWebdavPath(OwnCloudVersion version, String authTokenType) {\r

         if (version != null) {\r
         if (version != null) {\r

-            if (supportsOAuth) {\r
+            if (AccountTypeUtils.getAuthTokenTypeAccessToken(MainApp.getAccountType()).equals(authTokenType)) {\r

                 return ODAV_PATH;\r
             }\r
                 return ODAV_PATH;\r
             }\r

+            if (AccountTypeUtils.getAuthTokenTypeSamlSessionCookie(MainApp.getAccountType()).equals(authTokenType)) {\r
+                return SAML_SSO_PATH;\r
+            }\r

             if (version.compareTo(OwnCloudVersion.owncloud_v4) >= 0)\r
                 return WEBDAV_PATH_4_0;\r
             if (version.compareTo(OwnCloudVersion.owncloud_v3) >= 0\r
             if (version.compareTo(OwnCloudVersion.owncloud_v4) >= 0)\r
                 return WEBDAV_PATH_4_0;\r
             if (version.compareTo(OwnCloudVersion.owncloud_v3) >= 0\r


@@ -131,42 +165,4 @@ public class AccountUtils {
         return null;\r
     }\r
     \r
         return null;\r
     }\r
     \r

-    /**\r
-     * Constructs full url to host and webdav resource basing on host version\r
-     * @param context\r
-     * @param account\r
-     * @return url or null on failure\r
-     * @throws AccountNotFoundException     When 'account' is unknown for the AccountManager\r
-     */\r
-    public static String constructFullURLForAccount(Context context, Account account) throws AccountNotFoundException {\r
-        AccountManager ama = AccountManager.get(context);\r
-        String baseurl = ama.getUserData(account, AccountAuthenticator.KEY_OC_BASE_URL);\r
-        String strver  = ama.getUserData(account, AccountAuthenticator.KEY_OC_VERSION);\r
-        boolean supportsOAuth = (ama.getUserData(account, AccountAuthenticator.KEY_SUPPORTS_OAUTH2) != null);\r
-        OwnCloudVersion ver = new OwnCloudVersion(strver);\r
-        String webdavpath = getWebdavPath(ver, supportsOAuth);\r
-\r
-        if (baseurl == null || webdavpath == null) \r
-            throw new AccountNotFoundException(account, "Account not found", null);\r
-        \r
-        return baseurl + webdavpath;\r
-    }\r
-    \r
-    \r
-    public static class AccountNotFoundException extends AccountsException {\r
-        \r
-        private static final long serialVersionUID = 4276870654168776992L;\r
-        \r
-        private Account mFailedAccount; \r
-                \r
-        public AccountNotFoundException(Account failedAccount, String message, Throwable cause) {\r
-            super(message, cause);\r
-            mFailedAccount = failedAccount;\r
-        }\r
-        \r
-        public Account getFailedAccount() {\r
-            return mFailedAccount;\r
-        }\r
-    }\r
-\r

 }\r
 }\r