OC-1508: App crashes when changing the orientation

[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 10f7771..47269bc 100644 (file)
--- a/src/com/owncloud/android/authentication/AccountUtils.java
+++ b/src/com/owncloud/android/authentication/AccountUtils.java
@@ -22,6 +22,7 @@ import com.owncloud.android.utils.OwnCloudVersion;
 \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
@@ -31,6 +32,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
+    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
@@ -73,6 +75,20 @@ public class AccountUtils {
     }\r
 \r
     \r
+    public static boolean exists(Account account, Context context) {\r
+        Account[] ocAccounts = AccountManager.get(context).getAccountsByType(\r
+                AccountAuthenticator.ACCOUNT_TYPE);\r
+\r
+        if (account != null && account.name != null) {\r
+            for (Account ac : ocAccounts) {\r
+                if (ac.name.equals(account.name)) {\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
@@ -114,11 +130,41 @@ public class AccountUtils {
      * @param version version of owncloud\r
      * @return webdav path for given OC version, null if OC version unknown\r
      */\r
-    public static String getWebdavPath(OwnCloudVersion version, boolean supportsOAuth) {\r
+    public static String getWebdavPath(OwnCloudVersion version, boolean supportsOAuth, boolean supportsSamlSso) {\r
         if (version != null) {\r
             if (supportsOAuth) {\r
                 return ODAV_PATH;\r
             }\r
+            if (supportsSamlSso) {\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
+                    || version.compareTo(OwnCloudVersion.owncloud_v2) >= 0)\r
+                return WEBDAV_PATH_2_0;\r
+            if (version.compareTo(OwnCloudVersion.owncloud_v1) >= 0)\r
+                return WEBDAV_PATH_1_2;\r
+        }\r
+        return null;\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
+     * @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
+    public static String getWebdavPath(OwnCloudVersion version, String authTokenType) {\r
+        if (version != null) {\r
+            if (AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(authTokenType)) {\r
+                return ODAV_PATH;\r
+            }\r
+            if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.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
@@ -135,21 +181,38 @@ public class AccountUtils {
      * @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) {\r
-        try {\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
+    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
+        boolean supportsSamlSso = (ama.getUserData(account, AccountAuthenticator.KEY_SUPPORTS_SAML_WEB_SSO) != null);\r
+        OwnCloudVersion ver = new OwnCloudVersion(strver);\r
+        String webdavpath = getWebdavPath(ver, supportsOAuth, supportsSamlSso);\r
 \r
-            if (webdavpath == null) return null;\r
-            return baseurl + webdavpath;\r
-        } catch (Exception e) {\r
-            e.printStackTrace();\r
-            return null;\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
+        /** Generated - should be refreshed every time the class changes!! */\r
+        private static final long serialVersionUID = -9013287181793186830L;\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