Merge branch 'develop' into setup_buttons

[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 47269bc..3b79c39 100644 (file)
--- a/src/com/owncloud/android/authentication/AccountUtils.java
+++ b/src/com/owncloud/android/authentication/AccountUtils.java
@@ -18,6 +18,7 @@
 \r
 package com.owncloud.android.authentication;\r
 \r
 \r
 package com.owncloud.android.authentication;\r
 \r

+import com.owncloud.android.MainApp;\r

 import com.owncloud.android.utils.OwnCloudVersion;\r
 \r
 import android.accounts.Account;\r
 import com.owncloud.android.utils.OwnCloudVersion;\r
 \r
 import android.accounts.Account;\r


@@ -48,7 +49,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


@@ -77,7 +78,7 @@ public class AccountUtils {
     \r
     public static boolean exists(Account account, Context context) {\r
         Account[] ocAccounts = AccountManager.get(context).getAccountsByType(\r
     \r
     public static boolean exists(Account account, Context context) {\r
         Account[] ocAccounts = AccountManager.get(context).getAccountsByType(\r

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

 \r
         if (account != null && account.name != null) {\r
             for (Account ac : ocAccounts) {\r
 \r
         if (account != null && account.name != null) {\r
             for (Account ac : ocAccounts) {\r


@@ -98,7 +99,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


@@ -107,7 +108,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


@@ -159,10 +160,10 @@ public class AccountUtils {
      */\r
     public static String getWebdavPath(OwnCloudVersion version, String authTokenType) {\r
         if (version != null) {\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
+            if (MainApp.getAuthTokenTypeAccessToken().equals(authTokenType)) {\r

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

-            if (AccountAuthenticator.AUTH_TOKEN_TYPE_SAML_WEB_SSO_SESSION_COOKIE.equals(authTokenType)) {\r
+            if (MainApp.getAuthTokenTypeSamlSessionCookie().equals(authTokenType)) {\r

                 return SAML_SSO_PATH;\r
             }\r
             if (version.compareTo(OwnCloudVersion.owncloud_v4) >= 0)\r
                 return SAML_SSO_PATH;\r
             }\r
             if (version.compareTo(OwnCloudVersion.owncloud_v4) >= 0)\r