Completing previous commit
[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / authenticator / AccountAuthenticator.java
index 7c62b65..be0b8e0 100644 (file)
@@ -26,252 +26,255 @@ import android.os.Bundle;
 import android.util.Log;\r
 \r
 public class AccountAuthenticator extends AbstractAccountAuthenticator {\r
-  /**\r
-   * Is used by android system to assign accounts to authenticators. Should be\r
-   * used by application and all extensions.\r
-   */\r
-  public static final String ACCOUNT_TYPE = "owncloud";\r
-  public static final String AUTH_TOKEN_TYPE = "org.owncloud";\r
-\r
-  public static final String KEY_AUTH_TOKEN_TYPE = "authTokenType";\r
-  public static final String KEY_REQUIRED_FEATURES = "requiredFeatures";\r
-  public static final String KEY_LOGIN_OPTIONS = "loginOptions";\r
-  public static final String KEY_ACCOUNT = "account";\r
-  /**\r
-   * Value under this key should handle path to webdav php script. Will be\r
-   * removed and usage should be replaced by combining\r
-   * {@link eu.alefzero.owncloud.authenticator.KEY_OC_BASE_URL} and\r
-   * {@link eu.alefzero.owncloud.utils.OwnCloudVersion}\r
-   * \r
-   * @deprecated\r
-   */\r
-  public static final String KEY_OC_URL = "oc_url";\r
-  /**\r
-   * Version should be 3 numbers separated by dot so it can be parsed by\r
-   * {@link eu.alefzero.owncloud.utils.OwnCloudVersion}\r
-   */\r
-  public static final String KEY_OC_VERSION = "oc_version";\r
-  /**\r
-   * Base url should point to owncloud installation without trailing / ie:\r
-   * http://server/path or https://owncloud.server\r
-   */\r
-  public static final String KEY_OC_BASE_URL = "oc_base_url";\r
-\r
-  private static final String TAG = "AccountAuthenticator";\r
-  private Context mContext;\r
-\r
-  public AccountAuthenticator(Context context) {\r
-    super(context);\r
-    mContext = context;\r
-  }\r
-\r
-  /**\r
-   * {@inheritDoc}\r
-   */\r
-  @Override\r
-  public Bundle addAccount(AccountAuthenticatorResponse response,\r
-                           String accountType,\r
-                           String authTokenType,\r
-                           String[] requiredFeatures,\r
-                           Bundle options) throws NetworkErrorException {\r
-    Log.i(TAG, "Adding account with type " + accountType + " and auth token " + authTokenType);\r
-    try {\r
-      validateAccountType(accountType);\r
-    } catch (AuthenticatorException e) {\r
-      Log.e(TAG, "Failed to validate account type "+ accountType +": " + e.getMessage());\r
-      e.printStackTrace();\r
-      return e.getFailureBundle();\r
+    /**\r
+     * Is used by android system to assign accounts to authenticators. Should be\r
+     * used by application and all extensions.\r
+     */\r
+    public static final String ACCOUNT_TYPE = "owncloud";\r
+    public static final String AUTH_TOKEN_TYPE = "org.owncloud";\r
+\r
+    public static final String KEY_AUTH_TOKEN_TYPE = "authTokenType";\r
+    public static final String KEY_REQUIRED_FEATURES = "requiredFeatures";\r
+    public static final String KEY_LOGIN_OPTIONS = "loginOptions";\r
+    public static final String KEY_ACCOUNT = "account";\r
+    /**\r
+     * Value under this key should handle path to webdav php script. Will be\r
+     * removed and usage should be replaced by combining\r
+     * {@link eu.alefzero.owncloud.authenticator.KEY_OC_BASE_URL} and\r
+     * {@link eu.alefzero.owncloud.utils.OwnCloudVersion}\r
+     * \r
+     * @deprecated\r
+     */\r
+    public static final String KEY_OC_URL = "oc_url";\r
+    /**\r
+     * Version should be 3 numbers separated by dot so it can be parsed by\r
+     * {@link eu.alefzero.owncloud.utils.OwnCloudVersion}\r
+     */\r
+    public static final String KEY_OC_VERSION = "oc_version";\r
+    /**\r
+     * Base url should point to owncloud installation without trailing / ie:\r
+     * http://server/path or https://owncloud.server\r
+     */\r
+    public static final String KEY_OC_BASE_URL = "oc_base_url";\r
+\r
+    private static final String TAG = "AccountAuthenticator";\r
+    private Context mContext;\r
+\r
+    public AccountAuthenticator(Context context) {\r
+        super(context);\r
+        mContext = context;\r
     }\r
-    final Intent intent = new Intent(mContext, AuthenticatorActivity.class);\r
-    intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response);\r
-    intent.putExtra(KEY_AUTH_TOKEN_TYPE, authTokenType);\r
-    intent.putExtra(KEY_REQUIRED_FEATURES, requiredFeatures);\r
-    intent.putExtra(KEY_LOGIN_OPTIONS, options);\r
-\r
-    setIntentFlags(intent);\r
-    final Bundle bundle = new Bundle();\r
-    bundle.putParcelable(AccountManager.KEY_INTENT, intent);\r
-    return bundle;\r
-  }\r
-\r
-  /**\r
-   * {@inheritDoc}\r
-   */\r
-  @Override\r
-  public Bundle confirmCredentials(AccountAuthenticatorResponse response,\r
-      Account account, Bundle options) throws NetworkErrorException {\r
-    try {\r
-      validateAccountType(account.type);\r
-    } catch (AuthenticatorException e) {\r
-      Log.e(TAG, "Failed to validate account type "+ account.type +": " + e.getMessage());\r
-      e.printStackTrace();\r
-      return e.getFailureBundle();\r
+\r
+    /**\r
+     * {@inheritDoc}\r
+     */\r
+    @Override\r
+    public Bundle addAccount(AccountAuthenticatorResponse response,\r
+            String accountType, String authTokenType,\r
+            String[] requiredFeatures, Bundle options)\r
+            throws NetworkErrorException {\r
+        Log.i(TAG, "Adding account with type " + accountType\r
+                + " and auth token " + authTokenType);\r
+        try {\r
+            validateAccountType(accountType);\r
+        } catch (AuthenticatorException e) {\r
+            Log.e(TAG, "Failed to validate account type " + accountType + ": "\r
+                    + e.getMessage());\r
+            e.printStackTrace();\r
+            return e.getFailureBundle();\r
+        }\r
+        final Intent intent = new Intent(mContext, AuthenticatorActivity.class);\r
+        intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE,\r
+                response);\r
+        intent.putExtra(KEY_AUTH_TOKEN_TYPE, authTokenType);\r
+        intent.putExtra(KEY_REQUIRED_FEATURES, requiredFeatures);\r
+        intent.putExtra(KEY_LOGIN_OPTIONS, options);\r
+\r
+        setIntentFlags(intent);\r
+        final Bundle bundle = new Bundle();\r
+        bundle.putParcelable(AccountManager.KEY_INTENT, intent);\r
+        return bundle;\r
+    }\r
+\r
+    /**\r
+     * {@inheritDoc}\r
+     */\r
+    @Override\r
+    public Bundle confirmCredentials(AccountAuthenticatorResponse response,\r
+            Account account, Bundle options) throws NetworkErrorException {\r
+        try {\r
+            validateAccountType(account.type);\r
+        } catch (AuthenticatorException e) {\r
+            Log.e(TAG, "Failed to validate account type " + account.type + ": "\r
+                    + e.getMessage());\r
+            e.printStackTrace();\r
+            return e.getFailureBundle();\r
+        }\r
+        Intent intent = new Intent(mContext, AuthenticatorActivity.class);\r
+        intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE,\r
+                response);\r
+        intent.putExtra(KEY_ACCOUNT, account);\r
+        intent.putExtra(KEY_LOGIN_OPTIONS, options);\r
+\r
+        setIntentFlags(intent);\r
+\r
+        Bundle resultBundle = new Bundle();\r
+        resultBundle.putParcelable(AccountManager.KEY_INTENT, intent);\r
+        return resultBundle;\r
+    }\r
+\r
+    @Override\r
+    public Bundle editProperties(AccountAuthenticatorResponse response,\r
+            String accountType) {\r
+        return null;\r
+    }\r
+\r
+    @Override\r
+    public Bundle getAuthToken(AccountAuthenticatorResponse response,\r
+            Account account, String authTokenType, Bundle options)\r
+            throws NetworkErrorException {\r
+        try {\r
+            validateAccountType(account.type);\r
+            validateAuthTokenType(authTokenType);\r
+        } catch (AuthenticatorException e) {\r
+            Log.e(TAG, "Failed to validate account type " + account.type + ": "\r
+                    + e.getMessage());\r
+            e.printStackTrace();\r
+            return e.getFailureBundle();\r
+        }\r
+        final AccountManager am = AccountManager.get(mContext);\r
+        final String password = am.getPassword(account);\r
+        if (password != null) {\r
+            final Bundle result = new Bundle();\r
+            result.putString(AccountManager.KEY_ACCOUNT_NAME, account.name);\r
+            result.putString(AccountManager.KEY_ACCOUNT_TYPE, ACCOUNT_TYPE);\r
+            result.putString(AccountManager.KEY_AUTHTOKEN, password);\r
+            return result;\r
+        }\r
+\r
+        final Intent intent = new Intent(mContext, AuthenticatorActivity.class);\r
+        intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE,\r
+                response);\r
+        intent.putExtra(KEY_AUTH_TOKEN_TYPE, authTokenType);\r
+        intent.putExtra(KEY_LOGIN_OPTIONS, options);\r
+        intent.putExtra(AuthenticatorActivity.PARAM_USERNAME, account.name);\r
+\r
+        final Bundle bundle = new Bundle();\r
+        bundle.putParcelable(AccountManager.KEY_INTENT, intent);\r
+        return bundle;\r
     }\r
-    Intent intent = new Intent(mContext, AuthenticatorActivity.class);\r
-    intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response);\r
-    intent.putExtra(KEY_ACCOUNT, account);\r
-    intent.putExtra(KEY_LOGIN_OPTIONS, options);\r
-\r
-    setIntentFlags(intent);\r
-\r
-    Bundle resultBundle = new Bundle();\r
-    resultBundle.putParcelable(AccountManager.KEY_INTENT, intent);\r
-    return resultBundle;\r
-  }\r
-\r
-  @Override\r
-  public Bundle editProperties(AccountAuthenticatorResponse response,\r
-                               String accountType) {\r
-    return null;\r
-  }\r
-\r
-  @Override\r
-  public Bundle getAuthToken(AccountAuthenticatorResponse response,\r
-                             Account account,\r
-                             String authTokenType,\r
-                             Bundle options) throws NetworkErrorException {\r
-    try {\r
-      validateAccountType(account.type);\r
-      validateAuthTokenType(authTokenType);\r
-    } catch (AuthenticatorException e) {\r
-      Log.e(TAG, "Failed to validate account type "+ account.type +": " + e.getMessage());\r
-      e.printStackTrace();\r
-      return e.getFailureBundle();\r
+\r
+    @Override\r
+    public String getAuthTokenLabel(String authTokenType) {\r
+        return null;\r
     }\r
-    final AccountManager am = AccountManager.get(mContext);\r
-    final String password = am.getPassword(account);\r
-    if (password != null) {\r
-      final Bundle result = new Bundle();\r
-      result.putString(AccountManager.KEY_ACCOUNT_NAME, account.name);\r
-      result.putString(AccountManager.KEY_ACCOUNT_TYPE, ACCOUNT_TYPE);\r
-      result.putString(AccountManager.KEY_AUTHTOKEN, password);\r
-      return result;\r
+\r
+    @Override\r
+    public Bundle hasFeatures(AccountAuthenticatorResponse response,\r
+            Account account, String[] features) throws NetworkErrorException {\r
+        final Bundle result = new Bundle();\r
+        result.putBoolean(AccountManager.KEY_BOOLEAN_RESULT, false);\r
+        return result;\r
     }\r
 \r
-    final Intent intent = new Intent(mContext, AuthenticatorActivity.class);\r
-    intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response);\r
-    intent.putExtra(KEY_AUTH_TOKEN_TYPE, authTokenType);\r
-    intent.putExtra(KEY_LOGIN_OPTIONS, options);\r
-    intent.putExtra(AuthenticatorActivity.PARAM_USERNAME, account.name);\r
-\r
-    final Bundle bundle = new Bundle();\r
-    bundle.putParcelable(AccountManager.KEY_INTENT, intent);\r
-    return bundle;\r
-  }\r
-\r
-  @Override\r
-  public String getAuthTokenLabel(String authTokenType) {\r
-    return null;\r
-  }\r
-\r
-  @Override\r
-  public Bundle hasFeatures(AccountAuthenticatorResponse response,\r
-                            Account account,\r
-                            String[] features) throws NetworkErrorException {\r
-    final Bundle result = new Bundle();\r
-    result.putBoolean(AccountManager.KEY_BOOLEAN_RESULT, false);\r
-    return result;\r
-  }\r
-\r
-  @Override\r
-  public Bundle updateCredentials(AccountAuthenticatorResponse response,\r
-                                  Account account,\r
-                                  String authTokenType,\r
-                                  Bundle options) throws NetworkErrorException {\r
-    final Intent intent = new Intent(mContext, AuthenticatorActivity.class);\r
-    intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response);\r
-    intent.putExtra(KEY_ACCOUNT, account);\r
-    intent.putExtra(KEY_AUTH_TOKEN_TYPE, authTokenType);\r
-    intent.putExtra(KEY_LOGIN_OPTIONS, options);\r
-    setIntentFlags(intent);\r
-\r
-    final Bundle bundle = new Bundle();\r
-    bundle.putParcelable(AccountManager.KEY_INTENT, intent);\r
-    return bundle;\r
-  }\r
-\r
-  @Override\r
-  public Bundle getAccountRemovalAllowed(AccountAuthenticatorResponse response,\r
-      Account account) throws NetworkErrorException {\r
-    return super.getAccountRemovalAllowed(response, account);\r
-  }\r
-\r
-  private void setIntentFlags(Intent intent) {\r
-    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);\r
-    intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);\r
-    intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);\r
-    intent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);\r
-    intent.addFlags(Intent.FLAG_FROM_BACKGROUND);\r
-  }\r
-\r
-  private void validateAccountType(String type)\r
-      throws UnsupportedAccountTypeException {\r
-    if (!type.equals(ACCOUNT_TYPE)) {\r
-      throw new UnsupportedAccountTypeException();\r
+    @Override\r
+    public Bundle updateCredentials(AccountAuthenticatorResponse response,\r
+            Account account, String authTokenType, Bundle options)\r
+            throws NetworkErrorException {\r
+        final Intent intent = new Intent(mContext, AuthenticatorActivity.class);\r
+        intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE,\r
+                response);\r
+        intent.putExtra(KEY_ACCOUNT, account);\r
+        intent.putExtra(KEY_AUTH_TOKEN_TYPE, authTokenType);\r
+        intent.putExtra(KEY_LOGIN_OPTIONS, options);\r
+        setIntentFlags(intent);\r
+\r
+        final Bundle bundle = new Bundle();\r
+        bundle.putParcelable(AccountManager.KEY_INTENT, intent);\r
+        return bundle;\r
     }\r
-  }\r
 \r
-  private void validateAuthTokenType(String authTokenType)\r
-      throws UnsupportedAuthTokenTypeException {\r
-    if (!authTokenType.equals(AUTH_TOKEN_TYPE)) {\r
-      throw new UnsupportedAuthTokenTypeException();\r
+    @Override\r
+    public Bundle getAccountRemovalAllowed(\r
+            AccountAuthenticatorResponse response, Account account)\r
+            throws NetworkErrorException {\r
+        return super.getAccountRemovalAllowed(response, account);\r
     }\r
-  }\r
 \r
-  public static class AuthenticatorException extends Exception {\r
-    private static final long serialVersionUID = 1L;\r
-    private Bundle mFailureBundle;\r
+    private void setIntentFlags(Intent intent) {\r
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);\r
+        intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);\r
+        intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);\r
+        intent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);\r
+        intent.addFlags(Intent.FLAG_FROM_BACKGROUND);\r
+    }\r
 \r
-    public AuthenticatorException(int code, String errorMsg) {\r
-      mFailureBundle = new Bundle();\r
-      mFailureBundle.putInt(AccountManager.KEY_ERROR_CODE, code);\r
-      mFailureBundle.putString(AccountManager.KEY_ERROR_MESSAGE, errorMsg);\r
+    private void validateAccountType(String type)\r
+            throws UnsupportedAccountTypeException {\r
+        if (!type.equals(ACCOUNT_TYPE)) {\r
+            throw new UnsupportedAccountTypeException();\r
+        }\r
     }\r
 \r
-    public Bundle getFailureBundle() {\r
-      return mFailureBundle;\r
+    private void validateAuthTokenType(String authTokenType)\r
+            throws UnsupportedAuthTokenTypeException {\r
+        if (!authTokenType.equals(AUTH_TOKEN_TYPE)) {\r
+            throw new UnsupportedAuthTokenTypeException();\r
+        }\r
     }\r
-  }\r
 \r
-  public static class UnsupportedAccountTypeException\r
-      extends\r
-        AuthenticatorException {\r
-    private static final long serialVersionUID = 1L;\r
+    public static class AuthenticatorException extends Exception {\r
+        private static final long serialVersionUID = 1L;\r
+        private Bundle mFailureBundle;\r
+\r
+        public AuthenticatorException(int code, String errorMsg) {\r
+            mFailureBundle = new Bundle();\r
+            mFailureBundle.putInt(AccountManager.KEY_ERROR_CODE, code);\r
+            mFailureBundle\r
+                    .putString(AccountManager.KEY_ERROR_MESSAGE, errorMsg);\r
+        }\r
 \r
-    public UnsupportedAccountTypeException() {\r
-      super(AccountManager.ERROR_CODE_UNSUPPORTED_OPERATION,\r
-          "Unsupported account type");\r
+        public Bundle getFailureBundle() {\r
+            return mFailureBundle;\r
+        }\r
     }\r
-  }\r
 \r
-  public static class UnsupportedAuthTokenTypeException\r
-      extends\r
-        AuthenticatorException {\r
-    private static final long serialVersionUID = 1L;\r
+    public static class UnsupportedAccountTypeException extends\r
+            AuthenticatorException {\r
+        private static final long serialVersionUID = 1L;\r
 \r
-    public UnsupportedAuthTokenTypeException() {\r
-      super(AccountManager.ERROR_CODE_UNSUPPORTED_OPERATION,\r
-          "Unsupported auth token type");\r
+        public UnsupportedAccountTypeException() {\r
+            super(AccountManager.ERROR_CODE_UNSUPPORTED_OPERATION,\r
+                    "Unsupported account type");\r
+        }\r
     }\r
-  }\r
 \r
-  public static class UnsupportedFeaturesException\r
-      extends\r
-        AuthenticatorException {\r
-    public static final long serialVersionUID = 1L;\r
+    public static class UnsupportedAuthTokenTypeException extends\r
+            AuthenticatorException {\r
+        private static final long serialVersionUID = 1L;\r
 \r
-    public UnsupportedFeaturesException() {\r
-      super(AccountManager.ERROR_CODE_UNSUPPORTED_OPERATION,\r
-          "Unsupported features");\r
+        public UnsupportedAuthTokenTypeException() {\r
+            super(AccountManager.ERROR_CODE_UNSUPPORTED_OPERATION,\r
+                    "Unsupported auth token type");\r
+        }\r
     }\r
-  }\r
 \r
-  public static class AccessDeniedException extends AuthenticatorException {\r
-    public AccessDeniedException(int code, String errorMsg) {\r
-      super(AccountManager.ERROR_CODE_INVALID_RESPONSE, "Access Denied");\r
+    public static class UnsupportedFeaturesException extends\r
+            AuthenticatorException {\r
+        public static final long serialVersionUID = 1L;\r
+\r
+        public UnsupportedFeaturesException() {\r
+            super(AccountManager.ERROR_CODE_UNSUPPORTED_OPERATION,\r
+                    "Unsupported features");\r
+        }\r
     }\r
 \r
-    private static final long serialVersionUID = 1L;\r
+    public static class AccessDeniedException extends AuthenticatorException {\r
+        public AccessDeniedException(int code, String errorMsg) {\r
+            super(AccountManager.ERROR_CODE_INVALID_RESPONSE, "Access Denied");\r
+        }\r
+\r
+        private static final long serialVersionUID = 1L;\r
 \r
-  }\r
+    }\r
 }\r