X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/390949b8323633b26d56b3a837e83941cbc24b4b..890bf7fa51135aa24e07ab8d02c002b22a66716a:/src/eu/alefzero/owncloud/authenticator/AccountAuthenticator.java

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