OAuth clean-up and refactoring

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f031ad4..ea0c1aa 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -128,7 +128,7 @@
                 <action android:name="android.intent.action.VIEW" />\r
                 <category android:name="android.intent.category.DEFAULT" />\r
                 <category android:name="android.intent.category.BROWSABLE" />\r
                 <action android:name="android.intent.action.VIEW" />\r
                 <category android:name="android.intent.category.DEFAULT" />\r
                 <category android:name="android.intent.category.BROWSABLE" />\r

-                <data android:scheme="oauth-mobile-app" />\r
+                <data android:scheme="@string/oauth2_redirect_scheme" />\r

             </intent-filter>\r
             <intent-filter>\r
                 <action android:name="com.owncloud.android.workaround.accounts.CREATE" />\r
             </intent-filter>\r
             <intent-filter>\r
                 <action android:name="com.owncloud.android.workaround.accounts.CREATE" />\r

diff --git a/res/layout-land/account_setup.xml b/res/layout-land/account_setup.xml
index b8a8fcd..ab380ba 100644 (file)
--- a/res/layout-land/account_setup.xml
+++ b/res/layout-land/account_setup.xml
@@ -125,7 +125,7 @@
                        android:layout_weight="1"
                        android:ems="10"
                        android:enabled="false"
                        android:layout_weight="1"
                        android:ems="10"
                        android:enabled="false"

-                       android:text="@string/oauth_url_endpoint_auth"
+                       android:text="@string/oauth2_url_endpoint_auth"

                        android:singleLine="true"
                        android:visibility="gone" >
        
                        android:singleLine="true"
                        android:visibility="gone" >
        


@@ -139,7 +139,7 @@
                        android:layout_weight="1"
                        android:ems="10"
                        android:enabled="false"
                        android:layout_weight="1"
                        android:ems="10"
                        android:enabled="false"

-                       android:text="@string/oauth_url_endpoint_access"
+                       android:text="@string/oauth2_url_endpoint_access"

                        android:singleLine="true"
                        android:visibility="gone" >
        
                        android:singleLine="true"
                        android:visibility="gone" >
        

diff --git a/res/layout/account_setup.xml b/res/layout/account_setup.xml
index a4868a4..e74ddf7 100644 (file)
--- a/res/layout/account_setup.xml
+++ b/res/layout/account_setup.xml
@@ -120,7 +120,7 @@
                 android:layout_weight="1"
                 android:ems="10"
                 android:enabled="false"
                 android:layout_weight="1"
                 android:ems="10"
                 android:enabled="false"

-                android:text="@string/oauth_url_endpoint_auth"
+                android:text="@string/oauth2_url_endpoint_auth"

                 android:singleLine="true"
                 android:visibility="gone" >
 
                 android:singleLine="true"
                 android:visibility="gone" >
 


@@ -134,7 +134,7 @@
                 android:layout_weight="1"
                 android:ems="10"
                 android:enabled="false"
                 android:layout_weight="1"
                 android:ems="10"
                 android:enabled="false"

-                   android:text="@string/oauth_url_endpoint_access"
+                   android:text="@string/oauth2_url_endpoint_access"

                 android:singleLine="true"
                 android:visibility="gone" >
 
                 android:singleLine="true"
                 android:visibility="gone" >
 

diff --git a/res/values/oauth.xml b/res/values/oauth.xml
deleted file mode 100644 (file)
index 66bb225..0000000
--- a/res/values/oauth.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- string name="oauth_url_endpoint_auth">https://frko.surfnetlabs.nl/workshop/php-oauth/authorize.php</string>
-    <string name="oauth_url_endpoint_access">https://frko.surfnetlabs.nl/workshop/php-oauth/token.php</string -->
-    <string name="oauth_url_endpoint_auth">http://owncloud.tuxed.net/oauth/php-oauth/authorize.php</string>
-    <string name="oauth_url_endpoint_access">http://owncloud.tuxed.net/oauth/php-oauth/token.php</string>
-</resources>

diff --git a/res/values/oauth2_configuration.xml b/res/values/oauth2_configuration.xml
new file mode 100644 (file)
index 0000000..04efddc
--- /dev/null
+++ b/res/values/oauth2_configuration.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- constants that must be respected by the authorization server; if changed, the app must be rebuild -->
+    <string name="oauth2_redirect_scheme">oauth-mobile-app</string>
+    <string name="oauth2_redirect_uri">oauth-mobile-app://callback</string>
+    
+    <!-- values that should be provided by ownCloud server -->
+    <string name="oauth2_url_endpoint_auth">http://owncloud.tuxed.net/oauth/php-oauth/authorize.php</string>
+    <string name="oauth2_url_endpoint_access">http://owncloud.tuxed.net/oauth/php-oauth/token.php</string>
+    <string name="oauth2_scope">grades</string>
+    <string name="oauth2_grant_type">authorization_code</string>       <!-- the only one supported right now -->
+    <string name="oauth2_response_type">code</string>                          <!-- depends on oauth2_grant_type -->
+    
+    <!-- values that should be agreed between app and authorization server, but can be loaded without rebuilding the app -->
+    <string name="oauth2_client_id">oc-android-test</string>           <!-- preferable that client decides this -->
+    <string name="oauth2_client_secret"></string>                                      <!-- preferable that client decides this -->
+    
+</resources>

diff --git a/src/com/owncloud/android/AccountUtils.java b/src/com/owncloud/android/AccountUtils.java
index fba0c36..ea47f15 100644 (file)
--- a/src/com/owncloud/android/AccountUtils.java
+++ b/src/com/owncloud/android/AccountUtils.java
@@ -19,7 +19,7 @@
 \r
 package com.owncloud.android;\r
 \r
 \r
 package com.owncloud.android;\r
 \r

-import com.owncloud.android.authenticator.AccountAuthenticator;\r
+import com.owncloud.android.authentication.AccountAuthenticator;\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

diff --git a/src/com/owncloud/android/Uploader.java b/src/com/owncloud/android/Uploader.java
index aadf4d9..862ede8 100644 (file)
--- a/src/com/owncloud/android/Uploader.java
+++ b/src/com/owncloud/android/Uploader.java
@@ -26,7 +26,7 @@ import java.util.List;
 import java.util.Stack;\r
 import java.util.Vector;\r
 \r
 import java.util.Stack;\r
 import java.util.Vector;\r
 \r

-import com.owncloud.android.authenticator.AccountAuthenticator;\r
+import com.owncloud.android.authentication.AccountAuthenticator;\r

 import com.owncloud.android.datamodel.DataStorageManager;\r
 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.datamodel.OCFile;\r
 import com.owncloud.android.datamodel.DataStorageManager;\r
 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.datamodel.OCFile;\r

diff --git a/src/com/owncloud/android/authentication/AccountAuthenticator.java b/src/com/owncloud/android/authentication/AccountAuthenticator.java
new file mode 100644 (file)
index 0000000..d6acbbb
--- /dev/null
+++ b/src/com/owncloud/android/authentication/AccountAuthenticator.java
@@ -0,0 +1,318 @@
+/* ownCloud Android client application\r
+ *   Copyright (C) 2012  Bartek Przybylski\r
+ *   Copyright (C) 2012-2013 ownCloud Inc.\r
+ *\r
+ *   This program is free software: you can redistribute it and/or modify\r
+ *   it under the terms of the GNU General Public License as published by\r
+ *   the Free Software Foundation, either version 2 of the License, or\r
+ *   (at your option) any later version.\r
+ *\r
+ *   This program is distributed in the hope that it will be useful,\r
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ *   GNU General Public License for more details.\r
+ *\r
+ *   You should have received a copy of the GNU General Public License\r
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
+ *\r
+ */\r
+\r
+package com.owncloud.android.authentication;\r
+\r
+\r
+import android.accounts.*;\r
+import android.content.Context;\r
+import android.content.Intent;\r
+import android.os.Bundle;\r
+import android.util.Log;\r
+\r
+\r
+/**\r
+ *  Authenticator for ownCloud accounts.\r
+ * \r
+ *  Controller class accessed from the system AccountManager, providing integration of ownCloud accounts with the Android system.\r
+ * \r
+ *  TODO - better separation in operations for OAuth-capable and regular ownCloud accounts.\r
+ *  TODO - review completeness \r
+ * \r
+ * @author David A. Velasco\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 AUTHORITY = "org.owncloud";\r
+    public static final String AUTH_TOKEN_TYPE = "org.owncloud";\r
+    public static final String AUTH_TOKEN_TYPE_PASSWORD = "owncloud.password";\r
+    public static final String AUTH_TOKEN_TYPE_ACCESS_TOKEN = "owncloud.oauth2.access_token";\r
+    public static final String AUTH_TOKEN_TYPE_REFRESH_TOKEN = "owncloud.oauth2.refresh_token";\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 com.owncloud.android.authentication.AuthenticatorActivity.KEY_OC_BASE_URL} and\r
+     * {@link com.owncloud.android.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 com.owncloud.android.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
+     * Flag signaling if the ownCloud server can be accessed with OAuth2 access tokens.\r
+     */\r
+    public static final String KEY_SUPPORTS_OAUTH2 = "oc_supports_oauth2";\r
+    \r
+    private static final String TAG = AccountAuthenticator.class.getSimpleName();\r
+    \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, 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, response);\r
+        intent.putExtra(KEY_AUTH_TOKEN_TYPE, authTokenType);\r
+        intent.putExtra(KEY_REQUIRED_FEATURES, requiredFeatures);\r
+        intent.putExtra(KEY_LOGIN_OPTIONS, options);\r
+        intent.putExtra(AuthenticatorActivity.EXTRA_ACTION, AuthenticatorActivity.ACTION_CREATE);\r
+\r
+        setIntentFlags(intent);\r
+        \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
+    /**\r
+     * {@inheritDoc}\r
+     */\r
+    @Override\r
+    public Bundle getAuthToken(AccountAuthenticatorResponse response,\r
+            Account account, String authTokenType, Bundle options)\r
+            throws NetworkErrorException {\r
+        /// validate parameters\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
+        \r
+        /// check if required token is stored\r
+        final AccountManager am = AccountManager.get(mContext);\r
+        String accessToken;\r
+        if (authTokenType.equals(AUTH_TOKEN_TYPE_PASSWORD)) {\r
+            accessToken = am.getPassword(account);\r
+        } else {\r
+            accessToken = am.peekAuthToken(account, authTokenType);\r
+        }\r
+        if (accessToken != 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, accessToken);\r
+            return result;\r
+        }\r
+        \r
+        /// if not stored, return Intent to access the AuthenticatorActivity and UPDATE the token for the account\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.EXTRA_ACCOUNT, account);\r
+        intent.putExtra(AuthenticatorActivity.EXTRA_ACTION, AuthenticatorActivity.ACTION_UPDATE_TOKEN);\r
+        \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, String[] features) throws NetworkErrorException {\r
+        final Bundle result = new Bundle();\r
+        result.putBoolean(AccountManager.KEY_BOOLEAN_RESULT, true);\r
+        return result;\r
+    }\r
+\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
+    @Override\r
+    public Bundle getAccountRemovalAllowed(\r
+            AccountAuthenticatorResponse response, Account account)\r
+            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); // incompatible with the authorization code grant in OAuth\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
+        }\r
+    }\r
+\r
+    private void validateAuthTokenType(String authTokenType)\r
+            throws UnsupportedAuthTokenTypeException {\r
+        if (!authTokenType.equals(AUTH_TOKEN_TYPE) &&\r
+            !authTokenType.equals(AUTH_TOKEN_TYPE_PASSWORD) &&\r
+            !authTokenType.equals(AUTH_TOKEN_TYPE_ACCESS_TOKEN) &&\r
+            !authTokenType.equals(AUTH_TOKEN_TYPE_REFRESH_TOKEN) ) {\r
+            throw new UnsupportedAuthTokenTypeException();\r
+        }\r
+    }\r
+\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 Bundle getFailureBundle() {\r
+            return mFailureBundle;\r
+        }\r
+    }\r
+\r
+    public static class UnsupportedAccountTypeException extends\r
+            AuthenticatorException {\r
+        private static final long serialVersionUID = 1L;\r
+\r
+        public UnsupportedAccountTypeException() {\r
+            super(AccountManager.ERROR_CODE_UNSUPPORTED_OPERATION,\r
+                    "Unsupported account type");\r
+        }\r
+    }\r
+\r
+    public static class UnsupportedAuthTokenTypeException 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
+        }\r
+    }\r
+\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
+    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

diff --git a/src/com/owncloud/android/authentication/AccountAuthenticatorService.java b/src/com/owncloud/android/authentication/AccountAuthenticatorService.java
new file mode 100644 (file)
index 0000000..971d6f0
--- /dev/null
+++ b/src/com/owncloud/android/authentication/AccountAuthenticatorService.java
@@ -0,0 +1,42 @@
+/* ownCloud Android client application
+ *   Copyright (C) 2011  Bartek Przybylski
+ *   Copyright (C) 2012-2013 ownCloud Inc.
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.owncloud.android.authentication;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+
+public class AccountAuthenticatorService extends Service {
+
+    private AccountAuthenticator mAuthenticator;
+    static final public String ACCOUNT_TYPE = "owncloud";
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        mAuthenticator = new AccountAuthenticator(this);
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mAuthenticator.getIBinder();
+    }
+
+}

diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
new file mode 100644 (file)
index 0000000..9b2dd85
--- /dev/null
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -0,0 +1,1077 @@
+/* ownCloud Android client application\r
+ *   Copyright (C) 2012  Bartek Przybylski\r
+ *   Copyright (C) 2012-2013 ownCloud Inc.\r
+ *\r
+ *   This program is free software: you can redistribute it and/or modify\r
+ *   it under the terms of the GNU General Public License as published by\r
+ *   the Free Software Foundation, either version 2 of the License, or\r
+ *   (at your option) any later version.\r
+ *\r
+ *   This program is distributed in the hope that it will be useful,\r
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+ *   GNU General Public License for more details.\r
+ *\r
+ *   You should have received a copy of the GNU General Public License\r
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
+ *\r
+ */\r
+\r
+package com.owncloud.android.authentication;\r
+\r
+import com.owncloud.android.AccountUtils;\r
+import com.owncloud.android.ui.dialog.SslValidatorDialog;\r
+import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;\r
+import com.owncloud.android.utils.OwnCloudVersion;\r
+import com.owncloud.android.network.OwnCloudClientUtils;\r
+import com.owncloud.android.operations.OwnCloudServerCheckOperation;\r
+import com.owncloud.android.operations.ExistenceCheckOperation;\r
+import com.owncloud.android.operations.OAuth2GetAccessToken;\r
+import com.owncloud.android.operations.OnRemoteOperationListener;\r
+import com.owncloud.android.operations.RemoteOperation;\r
+import com.owncloud.android.operations.RemoteOperationResult;\r
+import com.owncloud.android.operations.RemoteOperationResult.ResultCode;\r
+\r
+import android.accounts.Account;\r
+import android.accounts.AccountAuthenticatorActivity;\r
+import android.accounts.AccountManager;\r
+import android.app.AlertDialog;\r
+import android.app.Dialog;\r
+import android.app.ProgressDialog;\r
+import android.content.ContentResolver;\r
+import android.content.DialogInterface;\r
+import android.content.Intent;\r
+import android.content.SharedPreferences;\r
+import android.net.Uri;\r
+import android.os.Bundle;\r
+import android.os.Handler;\r
+import android.preference.PreferenceManager;\r
+import android.text.InputType;\r
+import android.util.Log;\r
+import android.view.View;\r
+import android.view.View.OnFocusChangeListener;\r
+import android.view.Window;\r
+import android.widget.CheckBox;\r
+import android.widget.EditText;\r
+import android.widget.Button;\r
+import android.widget.ImageView;\r
+import android.widget.TextView;\r
+import android.widget.Toast;\r
+\r
+import com.owncloud.android.R;\r
+\r
+import eu.alefzero.webdav.WebdavClient;\r
+\r
+/**\r
+ * This Activity is used to add an ownCloud account to the App\r
+ * \r
+ * @author Bartek Przybylski\r
+ * @author David A. Velasco\r
+ */\r
+public class AuthenticatorActivity extends AccountAuthenticatorActivity\r
+        implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeListener {\r
+\r
+    private static final String TAG = AuthenticatorActivity.class.getSimpleName();\r
+\r
+    public static final String EXTRA_ACCOUNT = "ACCOUNT";\r
+    public static final String EXTRA_USER_NAME = "USER_NAME";\r
+    public static final String EXTRA_HOST_NAME = "HOST_NAME";\r
+    public static final String EXTRA_ACTION = "ACTION";\r
+    \r
+    private static final String KEY_HOST_URL_TEXT = "HOST_URL_TEXT";\r
+    private static final String KEY_OC_VERSION = "OC_VERSION";\r
+    private static final String KEY_ACCOUNT = "ACCOUNT";\r
+    private static final String KEY_STATUS_TEXT = "STATUS_TEXT";\r
+    private static final String KEY_STATUS_ICON = "STATUS_ICON";\r
+    private static final String KEY_STATUS_CORRECT = "STATUS_CORRECT";\r
+    private static final String KEY_IS_SSL_CONN = "IS_SSL_CONN";\r
+    private static final String KEY_OAUTH2_STATUS_TEXT = "OAUTH2_STATUS_TEXT";\r
+    private static final String KEY_OAUTH2_STATUS_ICON = "OAUTH2_STATUS_ICON";\r
+\r
+    private static final int DIALOG_LOGIN_PROGRESS = 0;\r
+    private static final int DIALOG_SSL_VALIDATOR = 1;\r
+    private static final int DIALOG_CERT_NOT_SAVED = 2;\r
+    private static final int DIALOG_OAUTH2_LOGIN_PROGRESS = 3;\r
+\r
+    public static final byte ACTION_CREATE = 0;\r
+    public static final byte ACTION_UPDATE_TOKEN = 1;\r
+\r
+    \r
+    private String mHostBaseUrl;\r
+    private OwnCloudVersion mDiscoveredVersion;\r
+    \r
+    private int mStatusText, mStatusIcon;\r
+    private boolean mStatusCorrect, mIsSslConn;\r
+    private int mOAuth2StatusText, mOAuth2StatusIcon;    \r
+    \r
+    private final Handler mHandler = new Handler();\r
+    private Thread mOperationThread;\r
+    private OwnCloudServerCheckOperation mOcServerChkOperation;\r
+    private ExistenceCheckOperation mAuthCheckOperation;\r
+    private RemoteOperationResult mLastSslUntrustedServerResult;\r
+\r
+    private Uri mNewCapturedUriFromOAuth2Redirection;\r
+    \r
+    private AccountManager mAccountMgr;\r
+    private boolean mJustCreated;\r
+    private byte mAction;\r
+    private Account mAccount;\r
+    \r
+    private ImageView mRefreshButton;\r
+    private ImageView mViewPasswordButton;\r
+    private EditText mHostUrlInput;\r
+    private EditText mUsernameInput;\r
+    private EditText mPasswordInput;\r
+    private CheckBox mOAuth2Check;\r
+    private String mOAuthAccessToken;\r
+    private View mOkButton;\r
+    private TextView mAuthStatusLayout;\r
+    \r
+    private TextView mOAuthAuthEndpointText;\r
+    private TextView mOAuthTokenEndpointText;\r
+    \r
+    \r
+    /**\r
+     * {@inheritDoc}\r
+     * \r
+     * IMPORTANT ENTRY POINT 1: activity is shown to the user\r
+     */\r
+    @Override\r
+    protected void onCreate(Bundle savedInstanceState) {\r
+        super.onCreate(savedInstanceState);\r
+        getWindow().requestFeature(Window.FEATURE_NO_TITLE);\r
+        \r
+        /// set view and get references to view elements\r
+        setContentView(R.layout.account_setup);\r
+        mRefreshButton = (ImageView) findViewById(R.id.refreshButton);\r
+        mViewPasswordButton = (ImageView) findViewById(R.id.viewPasswordButton);\r
+        mHostUrlInput = (EditText) findViewById(R.id.hostUrlInput);\r
+        mUsernameInput = (EditText) findViewById(R.id.account_username);\r
+        mPasswordInput = (EditText) findViewById(R.id.account_password);\r
+        mOAuthAuthEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_1);\r
+        mOAuthTokenEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_2);\r
+        mOAuth2Check = (CheckBox) findViewById(R.id.oauth_onOff_check);\r
+        mOkButton = findViewById(R.id.buttonOK);\r
+        mAuthStatusLayout = (TextView) findViewById(R.id.auth_status_text); \r
+        \r
+\r
+        /// complete label for 'register account' button\r
+        Button b = (Button) findViewById(R.id.account_register);\r
+        if (b != null) {\r
+            b.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name)));\r
+        }\r
+\r
+        /// bind view elements to listeners\r
+        mHostUrlInput.setOnFocusChangeListener(this);\r
+        mPasswordInput.setOnFocusChangeListener(this);\r
+        \r
+        /// initialization\r
+        mAccountMgr = AccountManager.get(this);\r
+        mNewCapturedUriFromOAuth2Redirection = null;\r
+        mAction = getIntent().getByteExtra(EXTRA_ACTION, ACTION_CREATE); \r
+        mAccount = null;\r
+\r
+        if (savedInstanceState == null) {\r
+            /// connection state and info\r
+            mStatusText = mStatusIcon = 0;\r
+            mStatusCorrect = false;\r
+            mIsSslConn = false;\r
+            \r
+            /// retrieve extras from intent\r
+            String tokenType = getIntent().getExtras().getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE);\r
+            boolean oAuthRequired = AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(tokenType);\r
+            \r
+            mAccount = getIntent().getExtras().getParcelable(EXTRA_ACCOUNT);\r
+            if (mAccount != null) {\r
+                String ocVersion = mAccountMgr.getUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION);\r
+                if (ocVersion != null) {\r
+                    mDiscoveredVersion = new OwnCloudVersion(ocVersion);\r
+                }\r
+                mHostBaseUrl = mAccountMgr.getUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL);\r
+                mHostUrlInput.setText(mHostBaseUrl);\r
+                String userName = mAccount.name.substring(0, mAccount.name.lastIndexOf('@'));\r
+                mUsernameInput.setText(userName);\r
+                oAuthRequired = (mAccountMgr.getUserData(mAccount, AccountAuthenticator.KEY_SUPPORTS_OAUTH2) != null);\r
+            }\r
+            mOAuth2Check.setChecked(oAuthRequired);\r
+            changeViewByOAuth2Check(oAuthRequired);\r
+            \r
+\r
+        } else {\r
+            loadSavedInstanceState(savedInstanceState);\r
+        }\r
+        \r
+        if (mAction == ACTION_UPDATE_TOKEN) {\r
+            /// lock things that should not change\r
+            mHostUrlInput.setEnabled(false);\r
+            mUsernameInput.setEnabled(false);\r
+            mOAuth2Check.setVisibility(View.GONE);\r
+            checkOcServer(); \r
+        }\r
+        \r
+        mPasswordInput.setText("");     // clean password to avoid social hacking (disadvantage: password in removed if the device is turned aside)\r
+        mJustCreated = true;\r
+    }\r
+\r
+\r
+    /**\r
+     * Saves relevant state before {@link #onPause()}\r
+     * \r
+     * Do NOT save {@link #mNewCapturedUriFromOAuth2Redirection}; it keeps a temporal flag, intended to defer the \r
+     * processing of the redirection caught in {@link #onNewIntent(Intent)} until {@link #onResume()} \r
+     * \r
+     * See {@link #loadSavedInstanceState(Bundle)}\r
+     */\r
+    @Override\r
+    protected void onSaveInstanceState(Bundle outState) {\r
+        super.onSaveInstanceState(outState);\r
+        \r
+        /// connection state and info\r
+        outState.putInt(KEY_STATUS_TEXT, mStatusText);\r
+        outState.putInt(KEY_STATUS_ICON, mStatusIcon);\r
+        outState.putBoolean(KEY_STATUS_CORRECT, mStatusCorrect);\r
+        outState.putBoolean(KEY_IS_SSL_CONN, mIsSslConn);\r
+\r
+        /// server data\r
+        if (mDiscoveredVersion != null) \r
+            outState.putString(KEY_OC_VERSION, mDiscoveredVersion.toString());\r
+        outState.putString(KEY_HOST_URL_TEXT, mHostBaseUrl);\r
+        \r
+        /// account data, if updating\r
+        if (mAccount != null)\r
+            outState.putParcelable(KEY_ACCOUNT, mAccount);\r
+        \r
+        // Saving the state of oAuth2 components.\r
+        outState.putInt(KEY_OAUTH2_STATUS_ICON, mOAuth2StatusIcon);\r
+        outState.putInt(KEY_OAUTH2_STATUS_TEXT, mOAuth2StatusText);\r
+        \r
+    }\r
+\r
+\r
+    /**\r
+     * Loads saved state\r
+     * \r
+     * See {@link #onSaveInstanceState(Bundle)}.\r
+     * \r
+     * @param savedInstanceState    Saved state, as received in {@link #onCreate(Bundle)}.\r
+     */\r
+    private void loadSavedInstanceState(Bundle savedInstanceState) {\r
+        /// connection state and info\r
+        mStatusCorrect = savedInstanceState.getBoolean(KEY_STATUS_CORRECT);\r
+        mIsSslConn = savedInstanceState.getBoolean(KEY_IS_SSL_CONN);\r
+        mStatusText = savedInstanceState.getInt(KEY_STATUS_TEXT);\r
+        mStatusIcon = savedInstanceState.getInt(KEY_STATUS_ICON);\r
+        updateConnStatus();\r
+        \r
+        /// UI settings depending upon connection\r
+        mOkButton.setEnabled(mStatusCorrect);   // TODO really necessary?\r
+        if (!mStatusCorrect)\r
+            mRefreshButton.setVisibility(View.VISIBLE); // seems that setting visibility is necessary\r
+        else\r
+            mRefreshButton.setVisibility(View.INVISIBLE);\r
+        \r
+        /// server data\r
+        String ocVersion = savedInstanceState.getString(KEY_OC_VERSION);\r
+        if (ocVersion != null)\r
+            mDiscoveredVersion = new OwnCloudVersion(ocVersion);\r
+        mHostBaseUrl = savedInstanceState.getString(KEY_HOST_URL_TEXT);\r
+        \r
+        // account data, if updating\r
+        mAccount = savedInstanceState.getParcelable(KEY_ACCOUNT);\r
+        \r
+        // state of oAuth2 components\r
+        mOAuth2StatusIcon = savedInstanceState.getInt(KEY_OAUTH2_STATUS_ICON);\r
+        mOAuth2StatusText = savedInstanceState.getInt(KEY_OAUTH2_STATUS_TEXT);\r
+        // END of getting the state of oAuth2 components.\r
+    }\r
+\r
+    \r
+    /**\r
+     * The redirection triggered by the OAuth authentication server as response to the GET AUTHORIZATION request\r
+     * is caught here.\r
+     * \r
+     * To make this possible, this activity needs to be qualified with android:launchMode = "singleTask" in the\r
+     * AndroidManifest.xml file.\r
+     */\r
+    @Override\r
+    protected void onNewIntent (Intent intent) {\r
+        Log.d(TAG, "onNewIntent()");\r
+        Uri data = intent.getData();\r
+        if (data != null && data.toString().startsWith(getString(R.string.oauth2_redirect_uri))) {\r
+            mNewCapturedUriFromOAuth2Redirection = data;\r
+        }\r
+    }\r
+\r
+    \r
+    /**\r
+     * The redirection triggered by the OAuth authentication server as response to the GET AUTHORIZATION, and \r
+     * deferred in {@link #onNewIntent(Intent)}, is processed here.\r
+     */\r
+    @Override\r
+    protected void onResume() {\r
+        super.onResume();\r
+        // the state of mOAuth2Check is automatically recovered between configuration changes, but not before onCreate() finishes; so keep the next lines here\r
+        changeViewByOAuth2Check(mOAuth2Check.isChecked());  \r
+        if (mAction == ACTION_UPDATE_TOKEN && mJustCreated) {\r
+            if (mOAuth2Check.isChecked())\r
+                Toast.makeText(this, R.string.auth_expired_oauth_token_toast, Toast.LENGTH_LONG).show();\r
+            else\r
+                Toast.makeText(this, R.string.auth_expired_basic_auth_toast, Toast.LENGTH_LONG).show();\r
+        }\r
+        \r
+        if (mNewCapturedUriFromOAuth2Redirection != null) {\r
+            getOAuth2AccessTokenFromCapturedRedirection();            \r
+        }\r
+        \r
+        mJustCreated = false;\r
+    }\r
+    \r
+    \r
+    /**\r
+     * Parses the redirection with the response to the GET AUTHORIZATION request to the \r
+     * oAuth server and requests for the access token (GET ACCESS TOKEN)\r
+     */\r
+    private void getOAuth2AccessTokenFromCapturedRedirection() {\r
+        /// Parse data from OAuth redirection\r
+        String queryParameters = mNewCapturedUriFromOAuth2Redirection.getQuery();\r
+        mNewCapturedUriFromOAuth2Redirection = null;\r
+        \r
+        /// Showing the dialog with instructions for the user.\r
+        showDialog(DIALOG_OAUTH2_LOGIN_PROGRESS);\r
+\r
+        /// GET ACCESS TOKEN to the oAuth server \r
+        RemoteOperation operation = new OAuth2GetAccessToken(   getString(R.string.oauth2_client_id), \r
+                                                                getString(R.string.oauth2_redirect_uri), // TODO check - necessary here?      \r
+                                                                getString(R.string.oauth2_grant_type),\r
+                                                                queryParameters);\r
+        WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(getString(R.string.oauth2_url_endpoint_access)), getApplicationContext());\r
+        operation.execute(client, this, mHandler);\r
+    }\r
+    \r
+\r
+    \r
+    /**\r
+     * Handles the change of focus on the text inputs for the server URL and the password\r
+     */\r
+    public void onFocusChange(View view, boolean hasFocus) {\r
+        if (view.getId() == R.id.hostUrlInput) {\r
+            onUrlInputFocusChanged((TextView) view, hasFocus);\r
+            \r
+        } else if (view.getId() == R.id.account_password) {\r
+            onPasswordFocusChanged((TextView) view, hasFocus);\r
+        }\r
+    }\r
+    \r
+\r
+    /**\r
+     * Handles changes in focus on the text input for the server URL.\r
+     * \r
+     * IMPORTANT ENTRY POINT 2: When (!hasFocus), user wrote the server URL and changed to \r
+     * other field. The operation to check the existence of the server in the entered URL is\r
+     * started. \r
+     * \r
+     * When hasFocus:    user 'comes back' to write again the server URL.\r
+     * \r
+     * @param hostInput     TextView with the URL input field receiving the change of focus.\r
+     * @param hasFocus      'True' if focus is received, 'false' if is lost\r
+     */\r
+    private void onUrlInputFocusChanged(TextView hostInput, boolean hasFocus) {\r
+        if (!hasFocus) {\r
+            checkOcServer();\r
+            \r
+        } else {\r
+            // avoids that the 'connect' button can be clicked if the test was previously passed\r
+            mOkButton.setEnabled(false); \r
+        }\r
+    }\r
+\r
+\r
+    private void checkOcServer() {\r
+        String uri = mHostUrlInput.getText().toString().trim();\r
+        if (uri.length() != 0) {\r
+            mStatusText = R.string.auth_testing_connection;\r
+            mStatusIcon = R.drawable.progress_small;\r
+            updateConnStatus();\r
+            /** TODO cancel previous connection check if the user tries to ammend a wrong URL  \r
+            if(mConnChkOperation != null) {\r
+                mConnChkOperation.cancel();\r
+            } */\r
+            mOcServerChkOperation = new  OwnCloudServerCheckOperation(uri, this);\r
+            WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(uri), this);\r
+            mHostBaseUrl = "";\r
+            mDiscoveredVersion = null;\r
+            mOperationThread = mOcServerChkOperation.execute(client, this, mHandler);\r
+        } else {\r
+            mRefreshButton.setVisibility(View.INVISIBLE);\r
+            mStatusText = 0;\r
+            mStatusIcon = 0;\r
+            updateConnStatus();\r
+        }\r
+    }\r
+\r
+\r
+    /**\r
+     * Handles changes in focus on the text input for the password (basic authorization).\r
+     * \r
+     * When (hasFocus), the button to toggle password visibility is shown.\r
+     * \r
+     * When (!hasFocus), the button is made invisible and the password is hidden.\r
+     * \r
+     * @param passwordInput    TextView with the password input field receiving the change of focus.\r
+     * @param hasFocus          'True' if focus is received, 'false' if is lost\r
+     */\r
+    private void onPasswordFocusChanged(TextView passwordInput, boolean hasFocus) {\r
+        if (hasFocus) {\r
+            mViewPasswordButton.setVisibility(View.VISIBLE);\r
+        } else {\r
+            int input_type = InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD;\r
+            passwordInput.setInputType(input_type);\r
+            mViewPasswordButton.setVisibility(View.INVISIBLE);\r
+        }\r
+    }\r
+\r
+\r
+    \r
+    /**\r
+     * Cancels the authenticator activity\r
+     * \r
+     * IMPORTANT ENTRY POINT 3: Never underestimate the importance of cancellation\r
+     * \r
+     * This method is bound in the layout/acceoun_setup.xml resource file.\r
+     * \r
+     * @param view      Cancel button\r
+     */\r
+    public void onCancelClick(View view) {\r
+        setResult(RESULT_CANCELED);     // TODO review how is this related to AccountAuthenticator (debugging)\r
+        finish();\r
+    }\r
+    \r
+    \r
+    \r
+    /**\r
+     * Checks the credentials of the user in the root of the ownCloud server\r
+     * before creating a new local account.\r
+     * \r
+     * For basic authorization, a check of existence of the root folder is\r
+     * performed.\r
+     * \r
+     * For OAuth, starts the flow to get an access token; the credentials test \r
+     * is postponed until it is available.\r
+     * \r
+     * IMPORTANT ENTRY POINT 4\r
+     * \r
+     * @param view      OK button\r
+     */\r
+    public void onOkClick(View view) {\r
+        // this check should be unnecessary\r
+        if (mDiscoveredVersion == null || !mDiscoveredVersion.isVersionValid()  || mHostBaseUrl == null || mHostBaseUrl.length() == 0) {\r
+            mStatusIcon = R.drawable.common_error;\r
+            mStatusText = R.string.auth_wtf_reenter_URL;\r
+            updateConnStatus();\r
+            mOkButton.setEnabled(false);\r
+            Log.wtf(TAG,  "The user was allowed to click 'connect' to an unchecked server!!");\r
+            return;\r
+        }\r
+        \r
+        if (mOAuth2Check.isChecked()) {\r
+            startOauthorization();\r
+            \r
+        } else {\r
+            checkBasicAuthorization();\r
+        }\r
+    }\r
+    \r
+    \r
+    /**\r
+     * Tests the credentials entered by the user performing a check of existence on \r
+     * the root folder of the ownCloud server.\r
+     */\r
+    private void checkBasicAuthorization() {\r
+        /// get the path to the root folder through WebDAV from the version server\r
+        String webdav_path = AccountUtils.getWebdavPath(mDiscoveredVersion, false);\r
+        \r
+        /// get basic credentials entered by user\r
+        String username = mUsernameInput.getText().toString();\r
+        String password = mPasswordInput.getText().toString();\r
+        \r
+        /// be gentle with the user\r
+        showDialog(DIALOG_LOGIN_PROGRESS);\r
+        \r
+        /// test credentials accessing the root folder\r
+        mAuthCheckOperation = new  ExistenceCheckOperation("", this, false);\r
+        WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this);\r
+        client.setBasicCredentials(username, password);\r
+        mOperationThread = mAuthCheckOperation.execute(client, this, mHandler);\r
+    }\r
+\r
+\r
+    /**\r
+     * Starts the OAuth 'grant type' flow to get an access token, with \r
+     * a GET AUTHORIZATION request to the BUILT-IN authorization server. \r
+     */\r
+    private void startOauthorization() {\r
+        // be gentle with the user\r
+        mStatusIcon = R.drawable.progress_small;\r
+        mStatusText = R.string.oauth_login_connection;\r
+        updateAuthStatus();\r
+        \r
+        // GET AUTHORIZATION request\r
+        Uri uri = Uri.parse(getString(R.string.oauth2_url_endpoint_auth));\r
+        Uri.Builder uriBuilder = uri.buildUpon();\r
+        uriBuilder.appendQueryParameter(OAuth2Constants.KEY_RESPONSE_TYPE, getString(R.string.oauth2_response_type));\r
+        uriBuilder.appendQueryParameter(OAuth2Constants.KEY_REDIRECT_URI, getString(R.string.oauth2_redirect_uri));   \r
+        uriBuilder.appendQueryParameter(OAuth2Constants.KEY_CLIENT_ID, getString(R.string.oauth2_client_id));\r
+        uriBuilder.appendQueryParameter(OAuth2Constants.KEY_SCOPE, getString(R.string.oauth2_scope));\r
+        //uriBuilder.appendQueryParameter(OAuth2Constants.KEY_STATE, whateverwewant);\r
+        uri = uriBuilder.build();\r
+        Log.d(TAG, "Starting browser to view " + uri.toString());\r
+        Intent i = new Intent(Intent.ACTION_VIEW, uri);\r
+        startActivity(i);\r
+    }\r
+\r
+    \r
+    /**\r
+     * Callback method invoked when a RemoteOperation executed by this Activity finishes.\r
+     * \r
+     * Dispatches the operation flow to the right method.\r
+     */\r
+    @Override\r
+    public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) {\r
+\r
+        if (operation instanceof OwnCloudServerCheckOperation) {\r
+            onOcServerCheckFinish((OwnCloudServerCheckOperation) operation, result);\r
+            \r
+        } else if (operation instanceof OAuth2GetAccessToken) {\r
+            onGetOAuthAccessTokenFinish((OAuth2GetAccessToken)operation, result);\r
+                \r
+        } else if (operation instanceof ExistenceCheckOperation)  {\r
+            onAuthorizationCheckFinish((ExistenceCheckOperation)operation, result);\r
+                \r
+        }\r
+    }\r
+    \r
+\r
+    /**\r
+     * Processes the result of the server check performed when the user finishes the enter of the\r
+     * server URL.\r
+     * \r
+     * @param operation     Server check performed.\r
+     * @param result        Result of the check.\r
+     */\r
+    private void onOcServerCheckFinish(OwnCloudServerCheckOperation operation, RemoteOperationResult result) {\r
+        /// update status icon and text\r
+        updateStatusIconAndText(result);\r
+        updateConnStatus();\r
+\r
+        /// save result state\r
+        mStatusCorrect = result.isSuccess();\r
+        mIsSslConn = (result.getCode() == ResultCode.OK_SSL);\r
+        \r
+        /// very special case (TODO: move to a common place for all the remote operations)\r
+        if (result.getCode() == ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED) {\r
+            mLastSslUntrustedServerResult = result;\r
+            showDialog(DIALOG_SSL_VALIDATOR); \r
+        }\r
+        \r
+        /// update the visibility of the 'retry connection' button\r
+        if (!mStatusCorrect)\r
+            mRefreshButton.setVisibility(View.VISIBLE);\r
+        else\r
+            mRefreshButton.setVisibility(View.INVISIBLE);\r
+        \r
+        /// retrieve discovered version and normalize server URL\r
+        mDiscoveredVersion = operation.getDiscoveredVersion();\r
+        mHostBaseUrl = mHostUrlInput.getText().toString().trim();\r
+        if (!mHostBaseUrl.toLowerCase().startsWith("http://") &&\r
+            !mHostBaseUrl.toLowerCase().startsWith("https://")) {\r
+            \r
+            if (mIsSslConn) {\r
+                mHostBaseUrl = "https://" + mHostBaseUrl;\r
+            } else {\r
+                mHostBaseUrl = "http://" + mHostBaseUrl;\r
+            }\r
+            \r
+        }\r
+        if (mHostBaseUrl.endsWith("/"))\r
+            mHostBaseUrl = mHostBaseUrl.substring(0, mHostBaseUrl.length() - 1);\r
+        \r
+        /// allow or not the user try to access the server\r
+        mOkButton.setEnabled(mStatusCorrect);\r
+    }\r
+\r
+\r
+    /**\r
+     * Chooses the right icon and text to show to the user for the received operation result.\r
+     * \r
+     * @param result    Result of a remote operation performed in this activity\r
+     */\r
+    private void updateStatusIconAndText(RemoteOperationResult result) {\r
+        mStatusText = mStatusIcon = 0;\r
+\r
+        switch (result.getCode()) {\r
+        case OK_SSL:\r
+            mStatusIcon = android.R.drawable.ic_secure;\r
+            mStatusText = R.string.auth_secure_connection;\r
+            break;\r
+            \r
+        case OK_NO_SSL:\r
+        case OK:\r
+            if (mHostUrlInput.getText().toString().trim().toLowerCase().startsWith("http://") ) {\r
+                mStatusText = R.string.auth_connection_established;\r
+                mStatusIcon = R.drawable.ic_ok;\r
+            } else {\r
+                mStatusText = R.string.auth_nossl_plain_ok_title;\r
+                mStatusIcon = android.R.drawable.ic_partial_secure;\r
+            }\r
+            break;\r
+            \r
+        case SSL_RECOVERABLE_PEER_UNVERIFIED:\r
+            mStatusIcon = R.drawable.common_error;\r
+            mStatusText = R.string.auth_ssl_unverified_server_title;\r
+            break;\r
+                \r
+        case BAD_OC_VERSION:\r
+            mStatusIcon = R.drawable.common_error;\r
+            mStatusText = R.string.auth_bad_oc_version_title;\r
+            break;\r
+        case WRONG_CONNECTION:\r
+            mStatusIcon = R.drawable.common_error;\r
+            mStatusText = R.string.auth_wrong_connection_title;\r
+            break;\r
+        case TIMEOUT:\r
+            mStatusIcon = R.drawable.common_error;\r
+            mStatusText = R.string.auth_timeout_title;\r
+            break;\r
+        case INCORRECT_ADDRESS:\r
+            mStatusIcon = R.drawable.common_error;\r
+            mStatusText = R.string.auth_incorrect_address_title;\r
+            break;\r
+            \r
+        case SSL_ERROR:\r
+            mStatusIcon = R.drawable.common_error;\r
+            mStatusText = R.string.auth_ssl_general_error_title;\r
+            break;\r
+            \r
+        case UNAUTHORIZED:\r
+            mStatusIcon = R.drawable.common_error;\r
+            mStatusText = R.string.auth_unauthorized;\r
+            break;\r
+        case HOST_NOT_AVAILABLE:\r
+            mStatusIcon = R.drawable.common_error;\r
+            mStatusText = R.string.auth_unknown_host_title;\r
+            break;\r
+        case NO_NETWORK_CONNECTION:\r
+            mStatusIcon = R.drawable.no_network;\r
+            mStatusText = R.string.auth_no_net_conn_title;\r
+            break;\r
+        case INSTANCE_NOT_CONFIGURED:\r
+            mStatusIcon = R.drawable.common_error;\r
+            mStatusText = R.string.auth_not_configured_title;\r
+            break;\r
+        case FILE_NOT_FOUND:\r
+            mStatusIcon = R.drawable.common_error;\r
+            mStatusText = R.string.auth_incorrect_path_title;\r
+            break;\r
+        case OAUTH2_ERROR:\r
+            mStatusIcon = R.drawable.common_error;\r
+            mStatusText = R.string.auth_oauth_error;\r
+            break;\r
+        case OAUTH2_ERROR_ACCESS_DENIED:\r
+            mStatusIcon = R.drawable.common_error;\r
+            mStatusText = R.string.auth_oauth_error_access_denied;\r
+            break;\r
+        case UNHANDLED_HTTP_CODE:\r
+        case UNKNOWN_ERROR:\r
+            mStatusIcon = R.drawable.common_error;\r
+            mStatusText = R.string.auth_unknown_error_title;\r
+            break;\r
+            \r
+        default:\r
+            break;\r
+        }\r
+    }\r
+\r
+\r
+    /**\r
+     * Processes the result of the request for and access token send \r
+     * to an OAuth authorization server.\r
+     * \r
+     * @param operation     Operation performed requesting the access token.\r
+     * @param result        Result of the operation.\r
+     */\r
+    private void onGetOAuthAccessTokenFinish(OAuth2GetAccessToken operation, RemoteOperationResult result) {\r
+        try {\r
+            dismissDialog(DIALOG_OAUTH2_LOGIN_PROGRESS);\r
+        } catch (IllegalArgumentException e) {\r
+            // NOTHING TO DO ; can't find out what situation that leads to the exception in this code, but user logs signal that it happens\r
+        }\r
+\r
+        String webdav_path = AccountUtils.getWebdavPath(mDiscoveredVersion, true);\r
+        if (result.isSuccess() && webdav_path != null) {\r
+            /// be gentle with the user\r
+            showDialog(DIALOG_LOGIN_PROGRESS);\r
+            \r
+            /// time to test the retrieved access token on the ownCloud server\r
+            mOAuthAccessToken = ((OAuth2GetAccessToken)operation).getResultTokenMap().get(OAuth2Constants.KEY_ACCESS_TOKEN);\r
+            Log.d(TAG, "Got ACCESS TOKEN: " + mOAuthAccessToken);\r
+            mAuthCheckOperation = new ExistenceCheckOperation("", this, false);\r
+            WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this);\r
+            client.setBearerCredentials(mOAuthAccessToken);\r
+            mAuthCheckOperation.execute(client, this, mHandler);\r
+            \r
+        } else {\r
+            updateStatusIconAndText(result);\r
+            updateAuthStatus();\r
+            Log.d(TAG, "Access failed: " + result.getLogMessage());\r
+        }\r
+    }\r
+\r
+    \r
+    /**\r
+     * Processes the result of the access check performed to try the user credentials.\r
+     * \r
+     * Creates a new account through the AccountManager.\r
+     * \r
+     * @param operation     Access check performed.\r
+     * @param result        Result of the operation.\r
+     */\r
+    private void onAuthorizationCheckFinish(ExistenceCheckOperation operation, RemoteOperationResult result) {\r
+        try {\r
+            dismissDialog(DIALOG_LOGIN_PROGRESS);\r
+        } catch (IllegalArgumentException e) {\r
+            // NOTHING TO DO ; can't find out what situation that leads to the exception in this code, but user logs signal that it happens\r
+        }\r
+        \r
+        if (result.isSuccess()) {\r
+            Log.d(TAG, "Successful access - time to save the account");\r
+\r
+            if (mAction == ACTION_CREATE) {\r
+                createAccount();\r
+                \r
+            } else {\r
+                updateToken();\r
+            }\r
+            \r
+            finish();\r
+            \r
+        } else {\r
+            updateStatusIconAndText(result);\r
+            updateAuthStatus();\r
+            Log.d(TAG, "Access failed: " + result.getLogMessage());\r
+        }\r
+    }\r
+\r
+    \r
+    /**\r
+     * Sets the proper response to get that the Account Authenticator that started this activity saves \r
+     * a new authorization token for mAccount.\r
+     */\r
+    private void updateToken() {\r
+        Bundle response = new Bundle();\r
+        response.putString(AccountManager.KEY_ACCOUNT_NAME, mAccount.name);\r
+        response.putString(AccountManager.KEY_ACCOUNT_TYPE, mAccount.type);\r
+        boolean isOAuth = mOAuth2Check.isChecked();\r
+        if (isOAuth) {\r
+            response.putString(AccountManager.KEY_AUTHTOKEN, mOAuthAccessToken);\r
+            // the next line is necessary; by now, notifications are calling directly to the AuthenticatorActivity to update, without AccountManager intervention\r
+            mAccountMgr.setAuthToken(mAccount, AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN, mOAuthAccessToken);\r
+        } else {\r
+            response.putString(AccountManager.KEY_AUTHTOKEN, mPasswordInput.getText().toString());\r
+            mAccountMgr.setPassword(mAccount, mPasswordInput.getText().toString());\r
+        }\r
+        setAccountAuthenticatorResult(response);\r
+    }\r
+\r
+\r
+    /**\r
+     * Creates a new account through the Account Authenticator that started this activity. \r
+     * \r
+     * This makes the account permanent.\r
+     * \r
+     * TODO Decide how to name the OAuth accounts\r
+     */\r
+    private void createAccount() {\r
+        /// create and save new ownCloud account\r
+        boolean isOAuth = mOAuth2Check.isChecked();\r
+        \r
+        Uri uri = Uri.parse(mHostBaseUrl);\r
+        String username = mUsernameInput.getText().toString().trim();\r
+        if (isOAuth) {\r
+            username = "OAuth_user" + (new java.util.Random(System.currentTimeMillis())).nextLong();\r
+        }            \r
+        String accountName = username + "@" + uri.getHost();\r
+        if (uri.getPort() >= 0) {\r
+            accountName += ":" + uri.getPort();\r
+        }\r
+        mAccount = new Account(accountName, AccountAuthenticator.ACCOUNT_TYPE);\r
+        if (isOAuth) {\r
+            mAccountMgr.addAccountExplicitly(mAccount, "", null);  // with our implementation, the password is never input in the app\r
+        } else {\r
+            mAccountMgr.addAccountExplicitly(mAccount, mPasswordInput.getText().toString(), null);\r
+        }\r
+\r
+        /// add the new account as default in preferences, if there is none already\r
+        Account defaultAccount = AccountUtils.getCurrentOwnCloudAccount(this);\r
+        if (defaultAccount == null) {\r
+            SharedPreferences.Editor editor = PreferenceManager\r
+                    .getDefaultSharedPreferences(this).edit();\r
+            editor.putString("select_oc_account", accountName);\r
+            editor.commit();\r
+        }\r
+\r
+        /// prepare result to return to the Authenticator\r
+        //  TODO check again what the Authenticator makes with it; probably has the same effect as addAccountExplicitly, but it's not well done\r
+        final Intent intent = new Intent();       \r
+        intent.putExtra(AccountManager.KEY_ACCOUNT_TYPE,    AccountAuthenticator.ACCOUNT_TYPE);\r
+        intent.putExtra(AccountManager.KEY_ACCOUNT_NAME,    mAccount.name);\r
+        if (!isOAuth)\r
+            intent.putExtra(AccountManager.KEY_AUTHTOKEN,   AccountAuthenticator.ACCOUNT_TYPE); // TODO check this; not sure it's right; maybe\r
+        intent.putExtra(AccountManager.KEY_USERDATA,        username);\r
+        if (isOAuth) {\r
+            mAccountMgr.setAuthToken(mAccount, AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN, mOAuthAccessToken);\r
+        }\r
+        /// add user data to the new account; TODO probably can be done in the last parameter addAccountExplicitly, or in KEY_USERDATA\r
+        mAccountMgr.setUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION,    mDiscoveredVersion.toString());\r
+        mAccountMgr.setUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL,   mHostBaseUrl);\r
+        if (isOAuth)\r
+            mAccountMgr.setUserData(mAccount, AccountAuthenticator.KEY_SUPPORTS_OAUTH2, "TRUE");  // TODO this flag should be unnecessary\r
+    \r
+        setAccountAuthenticatorResult(intent.getExtras());\r
+        setResult(RESULT_OK, intent);\r
+        \r
+        /// immediately request for the synchronization of the new account\r
+        Bundle bundle = new Bundle();\r
+        bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r
+        ContentResolver.requestSync(mAccount, AccountAuthenticator.AUTHORITY, bundle);\r
+    }\r
+\r
+\r
+    /**\r
+     * {@inheritDoc}\r
+     * \r
+     * Necessary to update the contents of the SSL Dialog\r
+     * \r
+     * TODO move to some common place for all possible untrusted SSL failures\r
+     */\r
+    @Override\r
+    protected void onPrepareDialog(int id, Dialog dialog, Bundle args) {\r
+        switch (id) {\r
+        case DIALOG_LOGIN_PROGRESS:\r
+        case DIALOG_CERT_NOT_SAVED:\r
+        case DIALOG_OAUTH2_LOGIN_PROGRESS:\r
+            break;\r
+        case DIALOG_SSL_VALIDATOR: {\r
+            ((SslValidatorDialog)dialog).updateResult(mLastSslUntrustedServerResult);\r
+            break;\r
+        }\r
+        default:\r
+            Log.e(TAG, "Incorrect dialog called with id = " + id);\r
+        }\r
+    }\r
+\r
+    \r
+    /**\r
+     * {@inheritDoc}\r
+     */\r
+    @Override\r
+    protected Dialog onCreateDialog(int id) {\r
+        Dialog dialog = null;\r
+        switch (id) {\r
+        case DIALOG_LOGIN_PROGRESS: {\r
+            /// simple progress dialog\r
+            ProgressDialog working_dialog = new ProgressDialog(this);\r
+            working_dialog.setMessage(getResources().getString(R.string.auth_trying_to_login));\r
+            working_dialog.setIndeterminate(true);\r
+            working_dialog.setCancelable(true);\r
+            working_dialog\r
+                    .setOnCancelListener(new DialogInterface.OnCancelListener() {\r
+                        @Override\r
+                        public void onCancel(DialogInterface dialog) {\r
+                            /// TODO study if this is enough\r
+                            Log.i(TAG, "Login canceled");\r
+                            if (mOperationThread != null) {\r
+                                mOperationThread.interrupt();\r
+                                finish();\r
+                            }\r
+                        }\r
+                    });\r
+            dialog = working_dialog;\r
+            break;\r
+        }\r
+        case DIALOG_OAUTH2_LOGIN_PROGRESS: {\r
+            ProgressDialog working_dialog = new ProgressDialog(this);\r
+            working_dialog.setMessage(String.format("Getting authorization")); \r
+            working_dialog.setIndeterminate(true);\r
+            working_dialog.setCancelable(true);\r
+            working_dialog\r
+            .setOnCancelListener(new DialogInterface.OnCancelListener() {\r
+                @Override\r
+                public void onCancel(DialogInterface dialog) {\r
+                    Log.i(TAG, "Login canceled");\r
+                    finish();\r
+                }\r
+            });\r
+            dialog = working_dialog;\r
+            break;\r
+        }\r
+        case DIALOG_SSL_VALIDATOR: {\r
+            /// TODO start to use new dialog interface, at least for this (it is a FragmentDialog already)\r
+            dialog = SslValidatorDialog.newInstance(this, mLastSslUntrustedServerResult, this);\r
+            break;\r
+        }\r
+        case DIALOG_CERT_NOT_SAVED: {\r
+            AlertDialog.Builder builder = new AlertDialog.Builder(this);\r
+            builder.setMessage(getResources().getString(R.string.ssl_validator_not_saved));\r
+            builder.setCancelable(false);\r
+            builder.setPositiveButton(R.string.common_ok, new DialogInterface.OnClickListener() {\r
+                    @Override\r
+                    public void onClick(DialogInterface dialog, int which) {\r
+                        dialog.dismiss();\r
+                    };\r
+                });\r
+            dialog = builder.create();\r
+            break;\r
+        }\r
+        default:\r
+            Log.e(TAG, "Incorrect dialog called with id = " + id);\r
+        }\r
+        return dialog;\r
+    }\r
+\r
+    \r
+    /**\r
+     * Starts and activity to open the 'new account' page in the ownCloud web site\r
+     * \r
+     * @param view      'Account register' button\r
+     */\r
+    public void onRegisterClick(View view) {\r
+        Intent register = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.url_account_register)));\r
+        setResult(RESULT_CANCELED);\r
+        startActivity(register);\r
+    }\r
+\r
+    \r
+    /**\r
+     * Updates the content and visibility state of the icon and text associated\r
+     * to the last check on the ownCloud server.\r
+     */\r
+    private void updateConnStatus() {\r
+        ImageView iv = (ImageView) findViewById(R.id.action_indicator);\r
+        TextView tv = (TextView) findViewById(R.id.status_text);\r
+\r
+        if (mStatusIcon == 0 && mStatusText == 0) {\r
+            iv.setVisibility(View.INVISIBLE);\r
+            tv.setVisibility(View.INVISIBLE);\r
+        } else {\r
+            iv.setImageResource(mStatusIcon);\r
+            tv.setText(mStatusText);\r
+            iv.setVisibility(View.VISIBLE);\r
+            tv.setVisibility(View.VISIBLE);\r
+        }\r
+    }\r
+    \r
+    \r
+    /**\r
+     * Updates the content and visibility state of the icon and text associated\r
+     * to the interactions with the OAuth authorization server.\r
+     */\r
+    private void updateAuthStatus() {\r
+        if (mStatusIcon == 0 && mStatusText == 0) {\r
+            mAuthStatusLayout.setVisibility(View.INVISIBLE);\r
+        } else {\r
+            mAuthStatusLayout.setText(mStatusText);\r
+            mAuthStatusLayout.setCompoundDrawablesWithIntrinsicBounds(mStatusIcon, 0, 0, 0);\r
+            mAuthStatusLayout.setVisibility(View.VISIBLE);\r
+        }\r
+    }     \r
+\r
+    \r
+    /**\r
+     * Called when the refresh button in the input field for ownCloud host is clicked.\r
+     * \r
+     * Performs a new check on the URL in the input field.\r
+     * \r
+     * @param view      Refresh 'button'\r
+     */\r
+    public void onRefreshClick(View view) {\r
+        onFocusChange(mRefreshButton, false);\r
+    }\r
+    \r
+    \r
+    /**\r
+     * Called when the eye icon in the password field is clicked.\r
+     * \r
+     * Toggles the visibility of the password in the field. \r
+     * \r
+     * @param view      'View password' 'button'\r
+     */\r
+    public void onViewPasswordClick(View view) {\r
+        int selectionStart = mPasswordInput.getSelectionStart();\r
+        int selectionEnd = mPasswordInput.getSelectionEnd();\r
+        int input_type = mPasswordInput.getInputType();\r
+        if ((input_type & InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) == InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) {\r
+            input_type = InputType.TYPE_CLASS_TEXT\r
+                    | InputType.TYPE_TEXT_VARIATION_PASSWORD;\r
+        } else {\r
+            input_type = InputType.TYPE_CLASS_TEXT\r
+                    | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD;\r
+        }\r
+        mPasswordInput.setInputType(input_type);\r
+        mPasswordInput.setSelection(selectionStart, selectionEnd);\r
+    }    \r
+    \r
+    \r
+    /**\r
+     * Called when the checkbox for OAuth authorization is clicked.\r
+     * \r
+     * Hides or shows the input fields for user & password. \r
+     * \r
+     * @param view      'View password' 'button'\r
+     */\r
+    public void onCheckClick(View view) {\r
+        CheckBox oAuth2Check = (CheckBox)view;      \r
+        changeViewByOAuth2Check(oAuth2Check.isChecked());\r
+\r
+    }\r
+    \r
+    /**\r
+     * Changes the visibility of input elements depending upon the kind of authorization\r
+     * chosen by the user: basic or OAuth\r
+     * \r
+     * @param checked       'True' when OAuth is selected.\r
+     */\r
+    public void changeViewByOAuth2Check(Boolean checked) {\r
+        \r
+        if (checked) {\r
+            mOAuthAuthEndpointText.setVisibility(View.VISIBLE);\r
+            mOAuthTokenEndpointText.setVisibility(View.VISIBLE);\r
+            mUsernameInput.setVisibility(View.GONE);\r
+            mPasswordInput.setVisibility(View.GONE);\r
+            mViewPasswordButton.setVisibility(View.GONE);\r
+        } else {\r
+            mOAuthAuthEndpointText.setVisibility(View.GONE);\r
+            mOAuthTokenEndpointText.setVisibility(View.GONE);\r
+            mUsernameInput.setVisibility(View.VISIBLE);\r
+            mPasswordInput.setVisibility(View.VISIBLE);\r
+            mViewPasswordButton.setVisibility(View.INVISIBLE);\r
+        }     \r
+\r
+    }    \r
+    \r
+    /**\r
+     * Called from SslValidatorDialog when a new server certificate was correctly saved.\r
+     */\r
+    public void onSavedCertificate() {\r
+        mOperationThread = mOcServerChkOperation.retry(this, mHandler);                \r
+    }\r
+\r
+    /**\r
+     * Called from SslValidatorDialog when a new server certificate could not be saved \r
+     * when the user requested it.\r
+     */\r
+    @Override\r
+    public void onFailedSavingCertificate() {\r
+        showDialog(DIALOG_CERT_NOT_SAVED);\r
+    }\r
+\r
+}\r

diff --git a/src/com/owncloud/android/authentication/OAuth2Constants.java b/src/com/owncloud/android/authentication/OAuth2Constants.java
new file mode 100644 (file)
index 0000000..227accb
--- /dev/null
+++ b/src/com/owncloud/android/authentication/OAuth2Constants.java
@@ -0,0 +1,54 @@
+/* ownCloud Android client application
+ *   Copyright (C) 2012-2013 ownCloud Inc.
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.owncloud.android.authentication;
+
+/** 
+ * Constant values for OAuth 2 protocol.
+ * 
+ * Includes required and optional parameter NAMES used in the 'authorization code' grant type.
+ *  
+ * @author David A. Velasco
+ */
+
+public class OAuth2Constants {
+    
+    /// Parameters to send to the Authorization Endpoint
+    public static final String KEY_RESPONSE_TYPE = "response_type";
+    public static final String KEY_REDIRECT_URI = "redirect_uri";
+    public static final String KEY_CLIENT_ID = "client_id";
+    public static final String KEY_SCOPE = "scope";
+    public static final String KEY_STATE = "state"; 
+    
+    /// Additional parameters to send to the Token Endpoint
+    public static final String KEY_GRANT_TYPE = "grant_type";
+    public static final String KEY_CODE = "code";
+    
+    /// Parameters received in an OK response from the Token Endpoint 
+    public static final String KEY_ACCESS_TOKEN = "access_token";
+    public static final String KEY_TOKEN_TYPE = "token_type";
+    public static final String KEY_EXPIRES_IN = "expires_in";
+    public static final String KEY_REFRESH_TOKEN = "refresh_token";
+    
+    /// Parameters in an ERROR response
+    public static final String KEY_ERROR = "error";
+    public static final String KEY_ERROR_DESCRIPTION = "error_description";
+    public static final String KEY_ERROR_URI = "error_uri";
+    public static final String VALUE_ERROR_ACCESS_DENIED = "access_denied";
+    
+}

diff --git a/src/com/owncloud/android/authenticator/AccountAuthenticator.java b/src/com/owncloud/android/authenticator/AccountAuthenticator.java
deleted file mode 100644 (file)
index a42c1f2..0000000
--- a/src/com/owncloud/android/authenticator/AccountAuthenticator.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/* ownCloud Android client application\r
- *   Copyright (C) 2012  Bartek Przybylski\r
- *   Copyright (C) 2012-2013 ownCloud Inc.\r
- *\r
- *   This program is free software: you can redistribute it and/or modify\r
- *   it under the terms of the GNU General Public License as published by\r
- *   the Free Software Foundation, either version 2 of the License, or\r
- *   (at your option) any later version.\r
- *\r
- *   This program is distributed in the hope that it will be useful,\r
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- *   GNU General Public License for more details.\r
- *\r
- *   You should have received a copy of the GNU General Public License\r
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
- *\r
- */\r
-\r
-package com.owncloud.android.authenticator;\r
-\r
-import com.owncloud.android.ui.activity.AuthenticatorActivity;\r
-\r
-import android.accounts.*;\r
-import android.content.Context;\r
-import android.content.Intent;\r
-import android.os.Bundle;\r
-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 AUTHORITY = "org.owncloud";\r
-    public static final String AUTH_TOKEN_TYPE = "org.owncloud";\r
-    public static final String AUTH_TOKEN_TYPE_PASSWORD = "owncloud.password";\r
-    public static final String AUTH_TOKEN_TYPE_ACCESS_TOKEN = "owncloud.oauth2.access_token";\r
-    public static final String AUTH_TOKEN_TYPE_REFRESH_TOKEN = "owncloud.oauth2.refresh_token";\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 com.owncloud.android.authenticator.AuthenticatorActivity.KEY_OC_BASE_URL} and\r
-     * {@link com.owncloud.android.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 com.owncloud.android.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
-     * Flag signaling if the ownCloud server can be accessed with OAuth2 access tokens.\r
-     */\r
-    public static final String KEY_SUPPORTS_OAUTH2 = "oc_supports_oauth2";\r
-    \r
-    private static final String TAG = AccountAuthenticator.class.getSimpleName();\r
-    \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, 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, response);\r
-        intent.putExtra(KEY_AUTH_TOKEN_TYPE, authTokenType);\r
-        intent.putExtra(KEY_REQUIRED_FEATURES, requiredFeatures);\r
-        intent.putExtra(KEY_LOGIN_OPTIONS, options);\r
-        intent.putExtra(AuthenticatorActivity.EXTRA_ACTION, AuthenticatorActivity.ACTION_CREATE);\r
-\r
-        setIntentFlags(intent);\r
-        \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
-    /**\r
-     * {@inheritDoc}\r
-     */\r
-    @Override\r
-    public Bundle getAuthToken(AccountAuthenticatorResponse response,\r
-            Account account, String authTokenType, Bundle options)\r
-            throws NetworkErrorException {\r
-        /// validate parameters\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
-        \r
-        /// check if required token is stored\r
-        final AccountManager am = AccountManager.get(mContext);\r
-        String accessToken;\r
-        if (authTokenType.equals(AUTH_TOKEN_TYPE_PASSWORD)) {\r
-            accessToken = am.getPassword(account);\r
-        } else {\r
-            accessToken = am.peekAuthToken(account, authTokenType);\r
-        }\r
-        if (accessToken != 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, accessToken);\r
-            return result;\r
-        }\r
-        \r
-        /// if not stored, return Intent to access the AuthenticatorActivity and UPDATE the token for the account\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.EXTRA_ACCOUNT, account);\r
-        intent.putExtra(AuthenticatorActivity.EXTRA_ACTION, AuthenticatorActivity.ACTION_UPDATE_TOKEN);\r
-        \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, String[] features) throws NetworkErrorException {\r
-        final Bundle result = new Bundle();\r
-        result.putBoolean(AccountManager.KEY_BOOLEAN_RESULT, true);\r
-        return result;\r
-    }\r
-\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
-    @Override\r
-    public Bundle getAccountRemovalAllowed(\r
-            AccountAuthenticatorResponse response, Account account)\r
-            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); // incompatible with the authorization code grant in OAuth\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
-        }\r
-    }\r
-\r
-    private void validateAuthTokenType(String authTokenType)\r
-            throws UnsupportedAuthTokenTypeException {\r
-        if (!authTokenType.equals(AUTH_TOKEN_TYPE) &&\r
-            !authTokenType.equals(AUTH_TOKEN_TYPE_PASSWORD) &&\r
-            !authTokenType.equals(AUTH_TOKEN_TYPE_ACCESS_TOKEN) &&\r
-            !authTokenType.equals(AUTH_TOKEN_TYPE_REFRESH_TOKEN) ) {\r
-            throw new UnsupportedAuthTokenTypeException();\r
-        }\r
-    }\r
-\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 Bundle getFailureBundle() {\r
-            return mFailureBundle;\r
-        }\r
-    }\r
-\r
-    public static class UnsupportedAccountTypeException extends\r
-            AuthenticatorException {\r
-        private static final long serialVersionUID = 1L;\r
-\r
-        public UnsupportedAccountTypeException() {\r
-            super(AccountManager.ERROR_CODE_UNSUPPORTED_OPERATION,\r
-                    "Unsupported account type");\r
-        }\r
-    }\r
-\r
-    public static class UnsupportedAuthTokenTypeException 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
-        }\r
-    }\r
-\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
-    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

diff --git a/src/com/owncloud/android/authenticator/AccountAuthenticatorService.java b/src/com/owncloud/android/authenticator/AccountAuthenticatorService.java
deleted file mode 100644 (file)
index e3972b6..0000000
--- a/src/com/owncloud/android/authenticator/AccountAuthenticatorService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ownCloud Android client application
- *   Copyright (C) 2011  Bartek Przybylski
- *   Copyright (C) 2012-2013 ownCloud Inc.
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package com.owncloud.android.authenticator;
-
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-
-public class AccountAuthenticatorService extends Service {
-
-    private AccountAuthenticator mAuthenticator;
-    static final public String ACCOUNT_TYPE = "owncloud";
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        mAuthenticator = new AccountAuthenticator(this);
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return mAuthenticator.getIBinder();
-    }
-
-}

diff --git a/src/com/owncloud/android/authenticator/oauth2/OAuth2Context.java b/src/com/owncloud/android/authenticator/oauth2/OAuth2Context.java
deleted file mode 100644 (file)
index 7d36da7..0000000
--- a/src/com/owncloud/android/authenticator/oauth2/OAuth2Context.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.owncloud.android.authenticator.oauth2;
-
-/** 
- *  Class used to store data from the app registration in oAuth2 server.
- *  THIS VALUES ARE ORIENTATIVE.
- *  MUST BE CHANGED WITH THE CORRECT ONES.
- *  
- * @author SolidGear S.L.
- *
- */
-
-public class OAuth2Context {
-    
-    public static final String OAUTH2_G_DEVICE_CLIENT_ID = "1044165972576.apps.googleusercontent.com";  
-    public static final String OAUTH2_G_DEVICE_CLIENT_SECRET = "rwrA86fnIRCC3bZm0tWnKOkV";
-    public static final String OAUTH_G_DEVICE_GETTOKEN_GRANT_TYPE = "http://oauth.net/grant_type/device/1.0";
-    public static final String OAUTH2_G_DEVICE_GETCODE_URL = "https://accounts.google.com/o/oauth2/device/code";  
-    public static final String OAUTH2_G_DEVICE_GETTOKEN_URL = "https://accounts.google.com/o/oauth2/token";
-    public static final String OAUTH2_G_DEVICE_GETCODE_SCOPES = "https://www.googleapis.com/auth/userinfo.email";
-    
-    //public static final String OAUTH2_F_AUTHORIZATION_ENDPOINT_URL = "https://frko.surfnetlabs.nl/workshop/php-oauth/authorize.php";
-    //public static final String OAUTH2_F_TOKEN_ENDPOINT_URL = "https://frko.surfnetlabs.nl/workshop/php-oauth/token.php";
-    public static final String OAUTH2_F_CLIENT_ID = "oc-android-test";
-    public static final String OAUTH2_F_SCOPE = "grades";
-    
-    public static final String OAUTH2_AUTH_CODE_GRANT_TYPE = "authorization_code";
-    public static final String OAUTH2_CODE_RESPONSE_TYPE = "code";
-
-    public static final String OAUTH2_TOKEN_RECEIVED_ERROR = "error";
-
-    public static final String MY_REDIRECT_URI = "oauth-mobile-app://callback";   // THIS CAN'T BE READ DYNAMICALLY; MUST BE DEFINED IN INSTALLATION TIME
-    
-    public static final String KEY_ACCESS_TOKEN = "access_token";
-    public static final String KEY_TOKEN_TYPE = "token_type";
-    public static final String KEY_EXPIRES_IN = "expires_in";
-    public static final String KEY_REFRESH_TOKEN = "refresh_token";
-    public static final String KEY_SCOPE = "scope";
-    public static final String KEY_ERROR = "error";
-    public static final String KEY_ERROR_DESCRIPTION = "error_description";
-    public static final String KEY_ERROR_URI = "error_uri";
-    public static final String KEY_REDIRECT_URI = "redirect_uri";
-    public static final String KEY_GRANT_TYPE = "grant_type";
-    public static final String KEY_CODE = "code";
-    public static final String KEY_CLIENT_ID = "client_id";
-    
-    public static final String CODE_USER_CODE  =  "user_code";
-    public static final String CODE_CLIENT_ID  =  "client_id";
-    public static final String CODE_SCOPE  =  "scope";    
-    public static final String CODE_VERIFICATION_URL  =  "verification_url";
-    public static final String CODE_EXPIRES_IN  =  "expires_in";
-    public static final String CODE_DEVICE_CODE = "device_code";
-    public static final String CODE_INTERVAL = "interval";
-    public static final String CODE_RESPONSE_TYPE = "response_type";
-    public static final String CODE_REDIRECT_URI = "redirect_uri";
-    
-    public static final String ERROR_ACCESS_DENIED = "access_denied";
-    
-}

diff --git a/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
index c3ca6c8..781402d 100644 (file)
--- a/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
+++ b/src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
@@ -22,7 +22,7 @@ package com.owncloud.android.files;
 import java.io.File;
 
 import com.owncloud.android.AccountUtils;
 import java.io.File;
 
 import com.owncloud.android.AccountUtils;

-import com.owncloud.android.authenticator.AccountAuthenticator;
+import com.owncloud.android.authentication.AccountAuthenticator;

 import com.owncloud.android.db.DbHandler;
 import com.owncloud.android.files.services.FileUploader;
 
 import com.owncloud.android.db.DbHandler;
 import com.owncloud.android.files.services.FileUploader;
 

diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java
index 0d7a26b..00d5f19 100644 (file)
--- a/src/com/owncloud/android/files/services/FileDownloader.java
+++ b/src/com/owncloud/android/files/services/FileDownloader.java
@@ -27,6 +27,7 @@ import java.util.Vector;
 import java.util.concurrent.ConcurrentHashMap;\r
 import java.util.concurrent.ConcurrentMap;\r
 \r
 import java.util.concurrent.ConcurrentHashMap;\r
 import java.util.concurrent.ConcurrentMap;\r
 \r

+import com.owncloud.android.authentication.AuthenticatorActivity;\r

 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.datamodel.OCFile;\r
 import eu.alefzero.webdav.OnDatatransferProgressListener;\r
 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.datamodel.OCFile;\r
 import eu.alefzero.webdav.OnDatatransferProgressListener;\r


@@ -35,7 +36,6 @@ import com.owncloud.android.network.OwnCloudClientUtils;
 import com.owncloud.android.operations.DownloadFileOperation;\r
 import com.owncloud.android.operations.RemoteOperationResult;\r
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;\r
 import com.owncloud.android.operations.DownloadFileOperation;\r
 import com.owncloud.android.operations.RemoteOperationResult;\r
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;\r

-import com.owncloud.android.ui.activity.AuthenticatorActivity;\r

 import com.owncloud.android.ui.activity.FileDetailActivity;\r
 import com.owncloud.android.ui.fragment.FileDetailFragment;\r
 \r
 import com.owncloud.android.ui.activity.FileDetailActivity;\r
 import com.owncloud.android.ui.fragment.FileDetailFragment;\r
 \r

diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java
index 09988fb..04044e3 100644 (file)
--- a/src/com/owncloud/android/files/services/FileUploader.java
+++ b/src/com/owncloud/android/files/services/FileUploader.java
@@ -31,7 +31,8 @@ import org.apache.http.HttpStatus;
 import org.apache.jackrabbit.webdav.MultiStatus;
 import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
 
 import org.apache.jackrabbit.webdav.MultiStatus;
 import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
 

-import com.owncloud.android.authenticator.AccountAuthenticator;
+import com.owncloud.android.authentication.AccountAuthenticator;
+import com.owncloud.android.authentication.AuthenticatorActivity;

 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.InstantUploadBroadcastReceiver;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.InstantUploadBroadcastReceiver;


@@ -41,7 +42,6 @@ import com.owncloud.android.operations.RemoteOperation;
 import com.owncloud.android.operations.RemoteOperationResult;
 import com.owncloud.android.operations.UploadFileOperation;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.operations.RemoteOperationResult;
 import com.owncloud.android.operations.UploadFileOperation;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;

-import com.owncloud.android.ui.activity.AuthenticatorActivity;

 import com.owncloud.android.ui.activity.FileDetailActivity;
 import com.owncloud.android.ui.fragment.FileDetailFragment;
 import com.owncloud.android.utils.OwnCloudVersion;
 import com.owncloud.android.ui.activity.FileDetailActivity;
 import com.owncloud.android.ui.fragment.FileDetailFragment;
 import com.owncloud.android.utils.OwnCloudVersion;

diff --git a/src/com/owncloud/android/network/OwnCloudClientUtils.java b/src/com/owncloud/android/network/OwnCloudClientUtils.java
index a3f322b..7b2b64f 100644 (file)
--- a/src/com/owncloud/android/network/OwnCloudClientUtils.java
+++ b/src/com/owncloud/android/network/OwnCloudClientUtils.java
@@ -38,7 +38,7 @@ import org.apache.http.conn.ssl.BrowserCompatHostnameVerifier;
 import org.apache.http.conn.ssl.X509HostnameVerifier;
 
 import com.owncloud.android.AccountUtils;
 import org.apache.http.conn.ssl.X509HostnameVerifier;
 
 import com.owncloud.android.AccountUtils;

-import com.owncloud.android.authenticator.AccountAuthenticator;
+import com.owncloud.android.authentication.AccountAuthenticator;

 
 import eu.alefzero.webdav.WebdavClient;
 
 
 import eu.alefzero.webdav.WebdavClient;
 

diff --git a/src/com/owncloud/android/operations/OAuth2GetAccessToken.java b/src/com/owncloud/android/operations/OAuth2GetAccessToken.java
index 12e611c..fbbe254 100644 (file)
--- a/src/com/owncloud/android/operations/OAuth2GetAccessToken.java
+++ b/src/com/owncloud/android/operations/OAuth2GetAccessToken.java
@@ -8,7 +8,7 @@ import org.apache.commons.httpclient.NameValuePair;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 

-import com.owncloud.android.authenticator.oauth2.OAuth2Context;
+import com.owncloud.android.authentication.OAuth2Constants;

 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 
 import android.util.Log;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 
 import android.util.Log;


@@ -19,13 +19,19 @@ public class OAuth2GetAccessToken extends RemoteOperation {
     
     private static final String TAG = OAuth2GetAccessToken.class.getSimpleName();
     
     
     private static final String TAG = OAuth2GetAccessToken.class.getSimpleName();
     

+    private String mClientId;
+    private String mRedirectUri;
+    private String mGrantType;
+    

     private String mOAuth2AuthorizationResponse;
     private Map<String, String> mOAuth2ParsedAuthorizationResponse;
     private Map<String, String> mResultTokenMap;
 
     
     private String mOAuth2AuthorizationResponse;
     private Map<String, String> mOAuth2ParsedAuthorizationResponse;
     private Map<String, String> mResultTokenMap;
 
     

-    public OAuth2GetAccessToken(String oAuth2AuthorizationResponse) {
-        
+    public OAuth2GetAccessToken(String clientId, String redirectUri, String grantType, String oAuth2AuthorizationResponse) {
+        mClientId = clientId;
+        mRedirectUri = redirectUri;
+        mGrantType = grantType;

         mOAuth2AuthorizationResponse = oAuth2AuthorizationResponse;
         mOAuth2ParsedAuthorizationResponse = new HashMap<String, String>();
         mResultTokenMap = null;
         mOAuth2AuthorizationResponse = oAuth2AuthorizationResponse;
         mOAuth2ParsedAuthorizationResponse = new HashMap<String, String>();
         mResultTokenMap = null;


@@ -47,8 +53,8 @@ public class OAuth2GetAccessToken extends RemoteOperation {
         
         try {
             parseAuthorizationResponse();
         
         try {
             parseAuthorizationResponse();

-            if (mOAuth2ParsedAuthorizationResponse.keySet().contains(OAuth2Context.KEY_ERROR)) {
-                if (OAuth2Context.ERROR_ACCESS_DENIED.equals(mOAuth2ParsedAuthorizationResponse.get(OAuth2Context.KEY_ERROR))) {
+            if (mOAuth2ParsedAuthorizationResponse.keySet().contains(OAuth2Constants.KEY_ERROR)) {
+                if (OAuth2Constants.VALUE_ERROR_ACCESS_DENIED.equals(mOAuth2ParsedAuthorizationResponse.get(OAuth2Constants.KEY_ERROR))) {

                     result = new RemoteOperationResult(ResultCode.OAUTH2_ERROR_ACCESS_DENIED);
                 } else {
                     result = new RemoteOperationResult(ResultCode.OAUTH2_ERROR);
                     result = new RemoteOperationResult(ResultCode.OAUTH2_ERROR_ACCESS_DENIED);
                 } else {
                     result = new RemoteOperationResult(ResultCode.OAUTH2_ERROR);


@@ -57,11 +63,11 @@ public class OAuth2GetAccessToken extends RemoteOperation {
             
             if (result == null) { 
                 NameValuePair[] nameValuePairs = new NameValuePair[5];
             
             if (result == null) { 
                 NameValuePair[] nameValuePairs = new NameValuePair[5];

-                nameValuePairs[0] = new NameValuePair(OAuth2Context.KEY_CLIENT_ID, OAuth2Context.OAUTH2_F_CLIENT_ID);
-                nameValuePairs[1] = new NameValuePair(OAuth2Context.KEY_CODE, mOAuth2ParsedAuthorizationResponse.get(OAuth2Context.KEY_CODE));            
-                nameValuePairs[2] = new NameValuePair(OAuth2Context.KEY_SCOPE, mOAuth2ParsedAuthorizationResponse.get(OAuth2Context.KEY_SCOPE));            
-                nameValuePairs[3] = new NameValuePair(OAuth2Context.KEY_REDIRECT_URI, OAuth2Context.MY_REDIRECT_URI);            
-                nameValuePairs[4] = new NameValuePair(OAuth2Context.KEY_GRANT_TYPE, OAuth2Context.OAUTH2_AUTH_CODE_GRANT_TYPE);
+                nameValuePairs[0] = new NameValuePair(OAuth2Constants.KEY_GRANT_TYPE, mGrantType);
+                nameValuePairs[1] = new NameValuePair(OAuth2Constants.KEY_CODE, mOAuth2ParsedAuthorizationResponse.get(OAuth2Constants.KEY_CODE));            
+                nameValuePairs[2] = new NameValuePair(OAuth2Constants.KEY_REDIRECT_URI, mRedirectUri);       
+                nameValuePairs[3] = new NameValuePair(OAuth2Constants.KEY_CLIENT_ID, mClientId);
+                //nameValuePairs[4] = new NameValuePair(OAuth2Constants.KEY_SCOPE, mOAuth2ParsedAuthorizationResponse.get(OAuth2Constants.KEY_SCOPE));         

                 
                 postMethod = new PostMethod(client.getBaseUri().toString());
                 postMethod.setRequestBody(nameValuePairs);
                 
                 postMethod = new PostMethod(client.getBaseUri().toString());
                 postMethod.setRequestBody(nameValuePairs);


@@ -71,7 +77,7 @@ public class OAuth2GetAccessToken extends RemoteOperation {
                 if (response != null && response.length() > 0) {
                     JSONObject tokenJson = new JSONObject(response);
                     parseAccessTokenResult(tokenJson);
                 if (response != null && response.length() > 0) {
                     JSONObject tokenJson = new JSONObject(response);
                     parseAccessTokenResult(tokenJson);

-                    if (mResultTokenMap.get(OAuth2Context.OAUTH2_TOKEN_RECEIVED_ERROR) != null || mResultTokenMap.get(OAuth2Context.KEY_ACCESS_TOKEN) == null) {
+                    if (mResultTokenMap.get(OAuth2Constants.KEY_ERROR) != null || mResultTokenMap.get(OAuth2Constants.KEY_ACCESS_TOKEN) == null) {

                         result = new RemoteOperationResult(ResultCode.OAUTH2_ERROR);
                     
                     } else {
                         result = new RemoteOperationResult(ResultCode.OAUTH2_ERROR);
                     
                     } else {


@@ -98,7 +104,7 @@ public class OAuth2GetAccessToken extends RemoteOperation {
                 Log.e(TAG, "OAuth2 TOKEN REQUEST with auth code " + mOAuth2ParsedAuthorizationResponse.get("code") + " to " + client.getBaseUri() + ": " + result.getLogMessage(), result.getException());
                 
             } else if (result.getCode() == ResultCode.OAUTH2_ERROR) {
                 Log.e(TAG, "OAuth2 TOKEN REQUEST with auth code " + mOAuth2ParsedAuthorizationResponse.get("code") + " to " + client.getBaseUri() + ": " + result.getLogMessage(), result.getException());
                 
             } else if (result.getCode() == ResultCode.OAUTH2_ERROR) {

-                    Log.e(TAG, "OAuth2 TOKEN REQUEST with auth code " + mOAuth2ParsedAuthorizationResponse.get("code") + " to " + client.getBaseUri() + ": " + ((mResultTokenMap != null) ? mResultTokenMap.get(OAuth2Context.OAUTH2_TOKEN_RECEIVED_ERROR) : "NULL"));
+                    Log.e(TAG, "OAuth2 TOKEN REQUEST with auth code " + mOAuth2ParsedAuthorizationResponse.get("code") + " to " + client.getBaseUri() + ": " + ((mResultTokenMap != null) ? mResultTokenMap.get(OAuth2Constants.KEY_ERROR) : "NULL"));

                     
             } else {
                 Log.e(TAG, "OAuth2 TOKEN REQUEST with auth code " + mOAuth2ParsedAuthorizationResponse.get("code") + " to " + client.getBaseUri() + ": " + result.getLogMessage());
                     
             } else {
                 Log.e(TAG, "OAuth2 TOKEN REQUEST with auth code " + mOAuth2ParsedAuthorizationResponse.get("code") + " to " + client.getBaseUri() + ": " + result.getLogMessage());


@@ -140,29 +146,29 @@ public class OAuth2GetAccessToken extends RemoteOperation {
     private void parseAccessTokenResult (JSONObject tokenJson) throws JSONException {
         mResultTokenMap = new HashMap<String, String>();
         
     private void parseAccessTokenResult (JSONObject tokenJson) throws JSONException {
         mResultTokenMap = new HashMap<String, String>();
         

-        if (tokenJson.has(OAuth2Context.KEY_ACCESS_TOKEN)) {
-            mResultTokenMap.put(OAuth2Context.KEY_ACCESS_TOKEN, tokenJson.getString(OAuth2Context.KEY_ACCESS_TOKEN));
+        if (tokenJson.has(OAuth2Constants.KEY_ACCESS_TOKEN)) {
+            mResultTokenMap.put(OAuth2Constants.KEY_ACCESS_TOKEN, tokenJson.getString(OAuth2Constants.KEY_ACCESS_TOKEN));

         }
         }

-        if (tokenJson.has(OAuth2Context.KEY_TOKEN_TYPE)) {
-            mResultTokenMap.put(OAuth2Context.KEY_TOKEN_TYPE, tokenJson.getString(OAuth2Context.KEY_TOKEN_TYPE));
+        if (tokenJson.has(OAuth2Constants.KEY_TOKEN_TYPE)) {
+            mResultTokenMap.put(OAuth2Constants.KEY_TOKEN_TYPE, tokenJson.getString(OAuth2Constants.KEY_TOKEN_TYPE));

         }
         }

-        if (tokenJson.has(OAuth2Context.KEY_EXPIRES_IN)) {
-            mResultTokenMap.put(OAuth2Context.KEY_EXPIRES_IN, tokenJson.getString(OAuth2Context.KEY_EXPIRES_IN));
+        if (tokenJson.has(OAuth2Constants.KEY_EXPIRES_IN)) {
+            mResultTokenMap.put(OAuth2Constants.KEY_EXPIRES_IN, tokenJson.getString(OAuth2Constants.KEY_EXPIRES_IN));

         }
         }

-        if (tokenJson.has(OAuth2Context.KEY_REFRESH_TOKEN)) {
-            mResultTokenMap.put(OAuth2Context.KEY_REFRESH_TOKEN, tokenJson.getString(OAuth2Context.KEY_REFRESH_TOKEN));
+        if (tokenJson.has(OAuth2Constants.KEY_REFRESH_TOKEN)) {
+            mResultTokenMap.put(OAuth2Constants.KEY_REFRESH_TOKEN, tokenJson.getString(OAuth2Constants.KEY_REFRESH_TOKEN));

         }
         }

-        if (tokenJson.has(OAuth2Context.KEY_SCOPE)) {
-            mResultTokenMap.put(OAuth2Context.KEY_SCOPE, tokenJson.getString(OAuth2Context.KEY_SCOPE));
+        if (tokenJson.has(OAuth2Constants.KEY_SCOPE)) {
+            mResultTokenMap.put(OAuth2Constants.KEY_SCOPE, tokenJson.getString(OAuth2Constants.KEY_SCOPE));

         }
         }

-        if (tokenJson.has(OAuth2Context.KEY_ERROR)) {
-            mResultTokenMap.put(OAuth2Context.KEY_ERROR, tokenJson.getString(OAuth2Context.KEY_ERROR));
+        if (tokenJson.has(OAuth2Constants.KEY_ERROR)) {
+            mResultTokenMap.put(OAuth2Constants.KEY_ERROR, tokenJson.getString(OAuth2Constants.KEY_ERROR));

         }
         }

-        if (tokenJson.has(OAuth2Context.KEY_ERROR_DESCRIPTION)) {
-            mResultTokenMap.put(OAuth2Context.KEY_ERROR_DESCRIPTION, tokenJson.getString(OAuth2Context.KEY_ERROR_DESCRIPTION));
+        if (tokenJson.has(OAuth2Constants.KEY_ERROR_DESCRIPTION)) {
+            mResultTokenMap.put(OAuth2Constants.KEY_ERROR_DESCRIPTION, tokenJson.getString(OAuth2Constants.KEY_ERROR_DESCRIPTION));

         }
         }

-        if (tokenJson.has(OAuth2Context.KEY_ERROR_URI)) {
-            mResultTokenMap.put(OAuth2Context.KEY_ERROR_URI, tokenJson.getString(OAuth2Context.KEY_ERROR_URI));
+        if (tokenJson.has(OAuth2Constants.KEY_ERROR_URI)) {
+            mResultTokenMap.put(OAuth2Constants.KEY_ERROR_URI, tokenJson.getString(OAuth2Constants.KEY_ERROR_URI));

         }
     }
 
         }
     }
 

diff --git a/src/com/owncloud/android/operations/RemoteOperation.java b/src/com/owncloud/android/operations/RemoteOperation.java
index 19b67af..e7d4034 100644 (file)
--- a/src/com/owncloud/android/operations/RemoteOperation.java
+++ b/src/com/owncloud/android/operations/RemoteOperation.java
@@ -21,7 +21,7 @@ import java.io.IOException;
 
 import org.apache.commons.httpclient.Credentials;
 
 
 import org.apache.commons.httpclient.Credentials;
 

-import com.owncloud.android.authenticator.AccountAuthenticator;
+import com.owncloud.android.authentication.AccountAuthenticator;

 import com.owncloud.android.network.BearerCredentials;
 import com.owncloud.android.network.OwnCloudClientUtils;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.network.BearerCredentials;
 import com.owncloud.android.network.OwnCloudClientUtils;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;

diff --git a/src/com/owncloud/android/operations/UpdateOCVersionOperation.java b/src/com/owncloud/android/operations/UpdateOCVersionOperation.java
index 08a9c15..02f79c9 100644 (file)
--- a/src/com/owncloud/android/operations/UpdateOCVersionOperation.java
+++ b/src/com/owncloud/android/operations/UpdateOCVersionOperation.java
@@ -29,7 +29,7 @@ import android.content.Context;
 import android.util.Log;
 
 import com.owncloud.android.AccountUtils;
 import android.util.Log;
 
 import com.owncloud.android.AccountUtils;

-import com.owncloud.android.authenticator.AccountAuthenticator;
+import com.owncloud.android.authentication.AccountAuthenticator;

 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.utils.OwnCloudVersion;
 
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.utils.OwnCloudVersion;
 

diff --git a/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java b/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
index 1f307c9..0b0adae 100644 (file)
--- a/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
@@ -26,7 +26,7 @@ import org.apache.http.client.methods.HttpPut;
 import org.apache.http.entity.ByteArrayEntity;
 
 import com.owncloud.android.AccountUtils;
 import org.apache.http.entity.ByteArrayEntity;
 
 import com.owncloud.android.AccountUtils;

-import com.owncloud.android.authenticator.AccountAuthenticator;
+import com.owncloud.android.authentication.AccountAuthenticator;

 
 import android.accounts.Account;
 import android.accounts.AccountManager;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;

diff --git a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
index f78ed24..c3370f2 100644 (file)
--- a/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/FileSyncAdapter.java
@@ -28,6 +28,7 @@ import java.util.Map;
 import org.apache.jackrabbit.webdav.DavException;\r
 \r
 import com.owncloud.android.R;\r
 import org.apache.jackrabbit.webdav.DavException;\r
 \r
 import com.owncloud.android.R;\r

+import com.owncloud.android.authentication.AuthenticatorActivity;\r

 import com.owncloud.android.datamodel.DataStorageManager;\r
 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.datamodel.OCFile;\r
 import com.owncloud.android.datamodel.DataStorageManager;\r
 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.datamodel.OCFile;\r


@@ -35,7 +36,6 @@ import com.owncloud.android.operations.RemoteOperationResult;
 import com.owncloud.android.operations.SynchronizeFolderOperation;\r
 import com.owncloud.android.operations.UpdateOCVersionOperation;\r
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;\r
 import com.owncloud.android.operations.SynchronizeFolderOperation;\r
 import com.owncloud.android.operations.UpdateOCVersionOperation;\r
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;\r

-import com.owncloud.android.ui.activity.AuthenticatorActivity;\r

 import com.owncloud.android.ui.activity.ErrorsWhileCopyingHandlerActivity;\r
 \r
 import android.accounts.Account;\r
 import com.owncloud.android.ui.activity.ErrorsWhileCopyingHandlerActivity;\r
 \r
 import android.accounts.Account;\r

diff --git a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
index 9a04501..2c29e62 100644 (file)
--- a/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
+++ b/src/com/owncloud/android/ui/activity/AccountSelectActivity.java
@@ -50,7 +50,7 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.owncloud.android.AccountUtils;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.owncloud.android.AccountUtils;

-import com.owncloud.android.authenticator.AccountAuthenticator;
+import com.owncloud.android.authentication.AccountAuthenticator;

 
 import com.owncloud.android.R;
 
 
 import com.owncloud.android.R;
 

diff --git a/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java b/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
deleted file mode 100644 (file)
index 011abfc..0000000
--- a/src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
+++ /dev/null
@@ -1,1255 +0,0 @@
-/* ownCloud Android client application\r
- *   Copyright (C) 2012  Bartek Przybylski\r
- *   Copyright (C) 2012-2013 ownCloud Inc.\r
- *\r
- *   This program is free software: you can redistribute it and/or modify\r
- *   it under the terms of the GNU General Public License as published by\r
- *   the Free Software Foundation, either version 2 of the License, or\r
- *   (at your option) any later version.\r
- *\r
- *   This program is distributed in the hope that it will be useful,\r
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- *   GNU General Public License for more details.\r
- *\r
- *   You should have received a copy of the GNU General Public License\r
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
- *\r
- */\r
-\r
-package com.owncloud.android.ui.activity;\r
-\r
-import com.owncloud.android.AccountUtils;\r
-import com.owncloud.android.authenticator.AccountAuthenticator;\r
-import com.owncloud.android.authenticator.oauth2.OAuth2Context;\r
-import com.owncloud.android.ui.dialog.SslValidatorDialog;\r
-import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;\r
-import com.owncloud.android.utils.OwnCloudVersion;\r
-import com.owncloud.android.network.OwnCloudClientUtils;\r
-import com.owncloud.android.operations.OwnCloudServerCheckOperation;\r
-import com.owncloud.android.operations.ExistenceCheckOperation;\r
-import com.owncloud.android.operations.OAuth2GetAccessToken;\r
-import com.owncloud.android.operations.OnRemoteOperationListener;\r
-import com.owncloud.android.operations.RemoteOperation;\r
-import com.owncloud.android.operations.RemoteOperationResult;\r
-import com.owncloud.android.operations.RemoteOperationResult.ResultCode;\r
-\r
-import android.accounts.Account;\r
-import android.accounts.AccountAuthenticatorActivity;\r
-import android.accounts.AccountManager;\r
-import android.app.AlertDialog;\r
-import android.app.Dialog;\r
-import android.app.ProgressDialog;\r
-import android.content.ContentResolver;\r
-import android.content.DialogInterface;\r
-import android.content.Intent;\r
-import android.content.SharedPreferences;\r
-import android.net.Uri;\r
-import android.os.Bundle;\r
-import android.os.Handler;\r
-import android.preference.PreferenceManager;\r
-import android.text.InputType;\r
-import android.util.Log;\r
-import android.view.View;\r
-import android.view.View.OnFocusChangeListener;\r
-import android.view.Window;\r
-import android.widget.CheckBox;\r
-import android.widget.EditText;\r
-import android.widget.Button;\r
-import android.widget.ImageView;\r
-import android.widget.TextView;\r
-import android.widget.Toast;\r
-\r
-import com.owncloud.android.R;\r
-\r
-import eu.alefzero.webdav.WebdavClient;\r
-\r
-/**\r
- * This Activity is used to add an ownCloud account to the App\r
- * \r
- * @author Bartek Przybylski\r
- * @author David A. Velasco\r
- */\r
-public class AuthenticatorActivity extends AccountAuthenticatorActivity\r
-        implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeListener {\r
-\r
-    private static final String TAG = AuthenticatorActivity.class.getSimpleName();\r
-\r
-    public static final String EXTRA_ACCOUNT = "ACCOUNT";\r
-    public static final String EXTRA_USER_NAME = "USER_NAME";\r
-    public static final String EXTRA_HOST_NAME = "HOST_NAME";\r
-    public static final String EXTRA_ACTION = "ACTION";\r
-    \r
-    private static final String KEY_HOST_URL_TEXT = "HOST_URL_TEXT";\r
-    private static final String KEY_OC_VERSION = "OC_VERSION";\r
-    private static final String KEY_ACCOUNT = "ACCOUNT";\r
-    private static final String KEY_STATUS_TEXT = "STATUS_TEXT";\r
-    private static final String KEY_STATUS_ICON = "STATUS_ICON";\r
-    private static final String KEY_STATUS_CORRECT = "STATUS_CORRECT";\r
-    private static final String KEY_IS_SSL_CONN = "IS_SSL_CONN";\r
-    private static final String KEY_OAUTH2_STATUS_TEXT = "OAUTH2_STATUS_TEXT";\r
-    private static final String KEY_OAUTH2_STATUS_ICON = "OAUTH2_STATUS_ICON";\r
-\r
-    private static final int DIALOG_LOGIN_PROGRESS = 0;\r
-    private static final int DIALOG_SSL_VALIDATOR = 1;\r
-    private static final int DIALOG_CERT_NOT_SAVED = 2;\r
-    private static final int DIALOG_OAUTH2_LOGIN_PROGRESS = 3;\r
-\r
-    public static final byte ACTION_CREATE = 0;\r
-    public static final byte ACTION_UPDATE_TOKEN = 1;\r
-\r
-    \r
-    private String mHostBaseUrl;\r
-    private OwnCloudVersion mDiscoveredVersion;\r
-    \r
-    private int mStatusText, mStatusIcon;\r
-    private boolean mStatusCorrect, mIsSslConn;\r
-    private int mOAuth2StatusText, mOAuth2StatusIcon;    \r
-    \r
-    private final Handler mHandler = new Handler();\r
-    private Thread mOperationThread;\r
-    private OwnCloudServerCheckOperation mOcServerChkOperation;\r
-    private ExistenceCheckOperation mAuthCheckOperation;\r
-    private RemoteOperationResult mLastSslUntrustedServerResult;\r
-\r
-    //private Thread mOAuth2GetCodeThread;\r
-    //private OAuth2GetAuthorizationToken mOAuth2GetCodeRunnable;     \r
-    //private TokenReceiver tokenReceiver;\r
-    //private JSONObject mCodeResponseJson; \r
-    private Uri mNewCapturedUriFromOAuth2Redirection;\r
-    \r
-    private AccountManager mAccountMgr;\r
-    private boolean mJustCreated;\r
-    private byte mAction;\r
-    private Account mAccount;\r
-    \r
-    private ImageView mRefreshButton;\r
-    private ImageView mViewPasswordButton;\r
-    private EditText mHostUrlInput;\r
-    private EditText mUsernameInput;\r
-    private EditText mPasswordInput;\r
-    private CheckBox mOAuth2Check;\r
-    private String mOAuthAccessToken;\r
-    private View mOkButton;\r
-    private TextView mAuthStatusLayout;\r
-    \r
-    private TextView mOAuthAuthEndpointText;\r
-    private TextView mOAuthTokenEndpointText;\r
-    \r
-    \r
-    /**\r
-     * {@inheritDoc}\r
-     * \r
-     * IMPORTANT ENTRY POINT 1: activity is shown to the user\r
-     */\r
-    @Override\r
-    protected void onCreate(Bundle savedInstanceState) {\r
-        super.onCreate(savedInstanceState);\r
-        getWindow().requestFeature(Window.FEATURE_NO_TITLE);\r
-        \r
-        /// set view and get references to view elements\r
-        setContentView(R.layout.account_setup);\r
-        mRefreshButton = (ImageView) findViewById(R.id.refreshButton);\r
-        mViewPasswordButton = (ImageView) findViewById(R.id.viewPasswordButton);\r
-        mHostUrlInput = (EditText) findViewById(R.id.hostUrlInput);\r
-        mUsernameInput = (EditText) findViewById(R.id.account_username);\r
-        mPasswordInput = (EditText) findViewById(R.id.account_password);\r
-        mOAuthAuthEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_1);\r
-        mOAuthTokenEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_2);\r
-        mOAuth2Check = (CheckBox) findViewById(R.id.oauth_onOff_check);\r
-        mOkButton = findViewById(R.id.buttonOK);\r
-        mAuthStatusLayout = (TextView) findViewById(R.id.auth_status_text); \r
-        \r
-\r
-        /// complete label for 'register account' button\r
-        Button b = (Button) findViewById(R.id.account_register);\r
-        if (b != null) {\r
-            b.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name)));\r
-        }\r
-\r
-        /// bind view elements to listeners\r
-        mHostUrlInput.setOnFocusChangeListener(this);\r
-        mPasswordInput.setOnFocusChangeListener(this);\r
-        \r
-        /// initialization\r
-        mAccountMgr = AccountManager.get(this);\r
-        mNewCapturedUriFromOAuth2Redirection = null;    // TODO save?\r
-        mAction = getIntent().getByteExtra(EXTRA_ACTION, ACTION_CREATE); \r
-        mAccount = null;\r
-\r
-        if (savedInstanceState == null) {\r
-            /// connection state and info\r
-            mStatusText = mStatusIcon = 0;\r
-            mStatusCorrect = false;\r
-            mIsSslConn = false;\r
-            \r
-            /// retrieve extras from intent\r
-            String tokenType = getIntent().getExtras().getString(AccountAuthenticator.KEY_AUTH_TOKEN_TYPE);\r
-            boolean oAuthRequired = AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN.equals(tokenType);\r
-            \r
-            mAccount = getIntent().getExtras().getParcelable(EXTRA_ACCOUNT);\r
-            if (mAccount != null) {\r
-                String ocVersion = mAccountMgr.getUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION);\r
-                if (ocVersion != null) {\r
-                    mDiscoveredVersion = new OwnCloudVersion(ocVersion);\r
-                }\r
-                mHostBaseUrl = mAccountMgr.getUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL);\r
-                mHostUrlInput.setText(mHostBaseUrl);\r
-                String userName = mAccount.name.substring(0, mAccount.name.lastIndexOf('@'));\r
-                mUsernameInput.setText(userName);\r
-                oAuthRequired = (mAccountMgr.getUserData(mAccount, AccountAuthenticator.KEY_SUPPORTS_OAUTH2) != null);\r
-            }\r
-            mOAuth2Check.setChecked(oAuthRequired);\r
-            changeViewByOAuth2Check(oAuthRequired);\r
-            \r
-\r
-        } else {\r
-            loadSavedInstanceState(savedInstanceState);\r
-        }\r
-        \r
-        if (mAction == ACTION_UPDATE_TOKEN) {\r
-            /// lock things that should not change\r
-            mHostUrlInput.setEnabled(false);\r
-            mUsernameInput.setEnabled(false);\r
-            mOAuth2Check.setVisibility(View.GONE);\r
-            checkOcServer(); \r
-        }\r
-        \r
-        mPasswordInput.setText("");     // clean password to avoid social hacking (disadvantage: password in removed if the device is turned aside)\r
-        mJustCreated = true;\r
-    }\r
-\r
-\r
-    /**\r
-     * Saves relevant state before {@link #onPause()}\r
-     * \r
-     * Do NOT save {@link #mNewCapturedUriFromOAuth2Redirection}; it keeps a temporal flag, intended to defer the \r
-     * processing of the redirection caught in {@link #onNewIntent(Intent)} until {@link #onResume()} \r
-     * \r
-     * See {@link #loadSavedInstanceState(Bundle)}\r
-     */\r
-    @Override\r
-    protected void onSaveInstanceState(Bundle outState) {\r
-        super.onSaveInstanceState(outState);\r
-        \r
-        /// connection state and info\r
-        outState.putInt(KEY_STATUS_TEXT, mStatusText);\r
-        outState.putInt(KEY_STATUS_ICON, mStatusIcon);\r
-        outState.putBoolean(KEY_STATUS_CORRECT, mStatusCorrect);\r
-        outState.putBoolean(KEY_IS_SSL_CONN, mIsSslConn);\r
-\r
-        /// server data\r
-        if (mDiscoveredVersion != null) \r
-            outState.putString(KEY_OC_VERSION, mDiscoveredVersion.toString());\r
-        outState.putString(KEY_HOST_URL_TEXT, mHostBaseUrl);\r
-        \r
-        /// account data, if updating\r
-        if (mAccount != null)\r
-            outState.putParcelable(KEY_ACCOUNT, mAccount);\r
-        \r
-        // Saving the state of oAuth2 components.\r
-        outState.putInt(KEY_OAUTH2_STATUS_ICON, mOAuth2StatusIcon);\r
-        outState.putInt(KEY_OAUTH2_STATUS_TEXT, mOAuth2StatusText);\r
-        \r
-        /* Leave old OAuth flow\r
-        if (codeResponseJson != null){\r
-            outState.putString(KEY_OAUTH2_CODE_RESULT, codeResponseJson.toString());\r
-        }\r
-        */\r
-    }\r
-\r
-\r
-    /**\r
-     * Loads saved state\r
-     * \r
-     * See {@link #onSaveInstanceState(Bundle)}.\r
-     * \r
-     * @param savedInstanceState    Saved state, as received in {@link #onCreate(Bundle)}.\r
-     */\r
-    private void loadSavedInstanceState(Bundle savedInstanceState) {\r
-        /// connection state and info\r
-        mStatusCorrect = savedInstanceState.getBoolean(KEY_STATUS_CORRECT);\r
-        mIsSslConn = savedInstanceState.getBoolean(KEY_IS_SSL_CONN);\r
-        mStatusText = savedInstanceState.getInt(KEY_STATUS_TEXT);\r
-        mStatusIcon = savedInstanceState.getInt(KEY_STATUS_ICON);\r
-        updateConnStatus();\r
-        \r
-        /// UI settings depending upon connection\r
-        mOkButton.setEnabled(mStatusCorrect);   // TODO really necessary?\r
-        if (!mStatusCorrect)\r
-            mRefreshButton.setVisibility(View.VISIBLE); // seems that setting visibility is necessary\r
-        else\r
-            mRefreshButton.setVisibility(View.INVISIBLE);\r
-        \r
-        /// server data\r
-        String ocVersion = savedInstanceState.getString(KEY_OC_VERSION);\r
-        if (ocVersion != null)\r
-            mDiscoveredVersion = new OwnCloudVersion(ocVersion);\r
-        mHostBaseUrl = savedInstanceState.getString(KEY_HOST_URL_TEXT);\r
-        \r
-        // account data, if updating\r
-        mAccount = savedInstanceState.getParcelable(KEY_ACCOUNT);\r
-        \r
-        // state of oAuth2 components\r
-        mOAuth2StatusIcon = savedInstanceState.getInt(KEY_OAUTH2_STATUS_ICON);\r
-        mOAuth2StatusText = savedInstanceState.getInt(KEY_OAUTH2_STATUS_TEXT);\r
-        \r
-        /* Leave old OAuth flow\r
-        // We store a JSon object with all the data returned from oAuth2 server when we get user_code.\r
-        // Is better than store variable by variable. We use String object to serialize from/to it.\r
-           try {\r
-            if (savedInstanceState.containsKey(KEY_OAUTH2_CODE_RESULT)) {\r
-                codeResponseJson = new JSONObject(savedInstanceState.getString(KEY_OAUTH2_CODE_RESULT));\r
-            }\r
-        } catch (JSONException e) {\r
-            Log.e(TAG, "onCreate->JSONException: " + e.toString());\r
-        }*/\r
-        // END of getting the state of oAuth2 components.\r
-        \r
-    }\r
-\r
-    \r
-    /**\r
-     * The redirection triggered by the OAuth authentication server as response to the GET AUTHORIZATION request\r
-     * is caught here.\r
-     * \r
-     * To make this possible, this activity needs to be qualified with android:launchMode = "singleTask" in the\r
-     * AndroidManifest.xml file.\r
-     */\r
-    @Override\r
-    protected void onNewIntent (Intent intent) {\r
-        Log.d(TAG, "onNewIntent()");\r
-        Uri data = intent.getData();\r
-        if (data != null && data.toString().startsWith(OAuth2Context.MY_REDIRECT_URI)) {\r
-            mNewCapturedUriFromOAuth2Redirection = data;\r
-        }\r
-    }\r
-\r
-    \r
-    /**\r
-     * The redirection triggered by the OAuth authentication server as response to the GET AUTHORIZATION, and \r
-     * deferred in {@link #onNewIntent(Intent)}, is processed here.\r
-     */\r
-    @Override\r
-    protected void onResume() {\r
-        super.onResume();\r
-        // the state of mOAuth2Check is automatically recovered between configuration changes, but not before onCreate() finishes; so keep the next lines here\r
-        changeViewByOAuth2Check(mOAuth2Check.isChecked());  \r
-        if (mAction == ACTION_UPDATE_TOKEN && mJustCreated) {\r
-            if (mOAuth2Check.isChecked())\r
-                Toast.makeText(this, R.string.auth_expired_oauth_token_toast, Toast.LENGTH_LONG).show();\r
-            else\r
-                Toast.makeText(this, R.string.auth_expired_basic_auth_toast, Toast.LENGTH_LONG).show();\r
-        }\r
-           \r
-        \r
-        /* LEAVE OLD OAUTH FLOW ; \r
-        // (old oauth code) Registering token receiver. We must listening to the service that is pooling to the oAuth server for a token.\r
-        if (tokenReceiver == null) {\r
-            IntentFilter tokenFilter = new IntentFilter(OAuth2GetTokenService.TOKEN_RECEIVED_MESSAGE);                \r
-            tokenReceiver = new TokenReceiver();\r
-            this.registerReceiver(tokenReceiver,tokenFilter);\r
-        } */\r
-        // (new oauth code)\r
-        if (mNewCapturedUriFromOAuth2Redirection != null) {\r
-            getOAuth2AccessTokenFromCapturedRedirection();            \r
-        }\r
-        \r
-        mJustCreated = false;\r
-    }\r
-    \r
-    \r
-    @Override protected void onDestroy() {       \r
-        super.onDestroy();\r
-\r
-        /* LEAVE OLD OAUTH FLOW\r
-        // We must stop the service thats it's pooling to oAuth2 server for a token.\r
-        Intent tokenService = new Intent(this, OAuth2GetTokenService.class);\r
-        stopService(tokenService);\r
-        \r
-        // We stop listening the result of the pooling service.\r
-        if (tokenReceiver != null) {\r
-            unregisterReceiver(tokenReceiver);\r
-            tokenReceiver = null;\r
-        }*/\r
-\r
-    }    \r
-    \r
-    \r
-    /**\r
-     * Parses the redirection with the response to the GET AUTHORIZATION request to the \r
-     * oAuth server and requests for the access token (GET ACCESS TOKEN)\r
-     */\r
-    private void getOAuth2AccessTokenFromCapturedRedirection() {\r
-        /// Parse data from OAuth redirection\r
-        String queryParameters = mNewCapturedUriFromOAuth2Redirection.getQuery();\r
-        mNewCapturedUriFromOAuth2Redirection = null;\r
-        \r
-        /// Showing the dialog with instructions for the user.\r
-        showDialog(DIALOG_OAUTH2_LOGIN_PROGRESS);\r
-\r
-        /// GET ACCESS TOKEN to the oAuth server \r
-        RemoteOperation operation = new OAuth2GetAccessToken(queryParameters);\r
-        WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(getString(R.string.oauth_url_endpoint_access)), getApplicationContext());\r
-        operation.execute(client, this, mHandler);\r
-    }\r
-    \r
-\r
-    \r
-    /**\r
-     * Handles the change of focus on the text inputs for the server URL and the password\r
-     */\r
-    public void onFocusChange(View view, boolean hasFocus) {\r
-        if (view.getId() == R.id.hostUrlInput) {\r
-            onUrlInputFocusChanged((TextView) view, hasFocus);\r
-            \r
-        } else if (view.getId() == R.id.account_password) {\r
-            onPasswordFocusChanged((TextView) view, hasFocus);\r
-        }\r
-    }\r
-    \r
-\r
-    /**\r
-     * Handles changes in focus on the text input for the server URL.\r
-     * \r
-     * IMPORTANT ENTRY POINT 2: When (!hasFocus), user wrote the server URL and changed to \r
-     * other field. The operation to check the existence of the server in the entered URL is\r
-     * started. \r
-     * \r
-     * When hasFocus:    user 'comes back' to write again the server URL.\r
-     * \r
-     * @param hostInput     TextView with the URL input field receiving the change of focus.\r
-     * @param hasFocus      'True' if focus is received, 'false' if is lost\r
-     */\r
-    private void onUrlInputFocusChanged(TextView hostInput, boolean hasFocus) {\r
-        if (!hasFocus) {\r
-            checkOcServer();\r
-            \r
-        } else {\r
-            // avoids that the 'connect' button can be clicked if the test was previously passed\r
-            mOkButton.setEnabled(false); \r
-        }\r
-    }\r
-\r
-\r
-    private void checkOcServer() {\r
-        String uri = mHostUrlInput.getText().toString().trim();\r
-        if (uri.length() != 0) {\r
-            mStatusText = R.string.auth_testing_connection;\r
-            mStatusIcon = R.drawable.progress_small;\r
-            updateConnStatus();\r
-            /** TODO cancel previous connection check if the user tries to ammend a wrong URL  \r
-            if(mConnChkOperation != null) {\r
-                mConnChkOperation.cancel();\r
-            } */\r
-            mOcServerChkOperation = new  OwnCloudServerCheckOperation(uri, this);\r
-            WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(uri), this);\r
-            mHostBaseUrl = "";\r
-            mDiscoveredVersion = null;\r
-            mOperationThread = mOcServerChkOperation.execute(client, this, mHandler);\r
-        } else {\r
-            mRefreshButton.setVisibility(View.INVISIBLE);\r
-            mStatusText = 0;\r
-            mStatusIcon = 0;\r
-            updateConnStatus();\r
-        }\r
-    }\r
-\r
-\r
-    /**\r
-     * Handles changes in focus on the text input for the password (basic authorization).\r
-     * \r
-     * When (hasFocus), the button to toggle password visibility is shown.\r
-     * \r
-     * When (!hasFocus), the button is made invisible and the password is hidden.\r
-     * \r
-     * @param passwordInput    TextView with the password input field receiving the change of focus.\r
-     * @param hasFocus          'True' if focus is received, 'false' if is lost\r
-     */\r
-    private void onPasswordFocusChanged(TextView passwordInput, boolean hasFocus) {\r
-        if (hasFocus) {\r
-            mViewPasswordButton.setVisibility(View.VISIBLE);\r
-        } else {\r
-            int input_type = InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD;\r
-            passwordInput.setInputType(input_type);\r
-            mViewPasswordButton.setVisibility(View.INVISIBLE);\r
-        }\r
-    }\r
-\r
-\r
-    \r
-    /**\r
-     * Cancels the authenticator activity\r
-     * \r
-     * IMPORTANT ENTRY POINT 3: Never underestimate the importance of cancellation\r
-     * \r
-     * This method is bound in the layout/acceoun_setup.xml resource file.\r
-     * \r
-     * @param view      Cancel button\r
-     */\r
-    public void onCancelClick(View view) {\r
-        setResult(RESULT_CANCELED);     // TODO review how is this related to AccountAuthenticator\r
-        finish();\r
-    }\r
-    \r
-    \r
-    \r
-    /**\r
-     * Checks the credentials of the user in the root of the ownCloud server\r
-     * before creating a new local account.\r
-     * \r
-     * For basic authorization, a check of existence of the root folder is\r
-     * performed.\r
-     * \r
-     * For OAuth, starts the flow to get an access token; the credentials test \r
-     * is postponed until it is available.\r
-     * \r
-     * IMPORTANT ENTRY POINT 4\r
-     * \r
-     * @param view      OK button\r
-     */\r
-    public void onOkClick(View view) {\r
-        // this check should be unnecessary\r
-        if (mDiscoveredVersion == null || !mDiscoveredVersion.isVersionValid()  || mHostBaseUrl == null || mHostBaseUrl.length() == 0) {\r
-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_wtf_reenter_URL;\r
-            updateConnStatus();\r
-            mOkButton.setEnabled(false);\r
-            Log.wtf(TAG,  "The user was allowed to click 'connect' to an unchecked server!!");\r
-            return;\r
-        }\r
-        \r
-        if (mOAuth2Check.isChecked()) {\r
-            startOauthorization();\r
-            \r
-        } else {\r
-            checkBasicAuthorization();\r
-        }\r
-    }\r
-    \r
-    \r
-    /**\r
-     * Tests the credentials entered by the user performing a check of existence on \r
-     * the root folder of the ownCloud server.\r
-     */\r
-    private void checkBasicAuthorization() {\r
-        /// get the path to the root folder through WebDAV from the version server\r
-        String webdav_path = AccountUtils.getWebdavPath(mDiscoveredVersion, false);\r
-        \r
-        /// get basic credentials entered by user\r
-        String username = mUsernameInput.getText().toString();\r
-        String password = mPasswordInput.getText().toString();\r
-        \r
-        /// be gentle with the user\r
-        showDialog(DIALOG_LOGIN_PROGRESS);\r
-        \r
-        /// test credentials accessing the root folder\r
-        mAuthCheckOperation = new  ExistenceCheckOperation("", this, false);\r
-        WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this);\r
-        client.setBasicCredentials(username, password);\r
-        mOperationThread = mAuthCheckOperation.execute(client, this, mHandler);\r
-    }\r
-\r
-\r
-    /**\r
-     * Starts the OAuth 'grant type' flow to get an access token, with \r
-     * a GET AUTHORIZATION request to the BUILT-IN authorization server. \r
-     */\r
-    private void startOauthorization() {\r
-        // be gentle with the user\r
-        mStatusIcon = R.drawable.progress_small;\r
-        mStatusText = R.string.oauth_login_connection;\r
-        updateAuthStatus();\r
-        \r
-        // GET AUTHORIZATION request\r
-        /*\r
-        mOAuth2GetCodeRunnable = new OAuth2GetAuthorizationToken(, this);\r
-        mOAuth2GetCodeRunnable.setListener(this, mHandler);\r
-        mOAuth2GetCodeThread = new Thread(mOAuth2GetCodeRunnable);\r
-        mOAuth2GetCodeThread.start();\r
-        */\r
-        \r
-        //if (mGrantType.equals(OAuth2Context.OAUTH2_AUTH_CODE_GRANT_TYPE)) {\r
-        Uri uri = Uri.parse(getString(R.string.oauth_url_endpoint_auth));\r
-        Uri.Builder uriBuilder = uri.buildUpon();\r
-        uriBuilder.appendQueryParameter(OAuth2Context.CODE_RESPONSE_TYPE, OAuth2Context.OAUTH2_CODE_RESPONSE_TYPE);\r
-        uriBuilder.appendQueryParameter(OAuth2Context.CODE_REDIRECT_URI, OAuth2Context.MY_REDIRECT_URI);   \r
-        uriBuilder.appendQueryParameter(OAuth2Context.CODE_CLIENT_ID, OAuth2Context.OAUTH2_F_CLIENT_ID);\r
-        uriBuilder.appendQueryParameter(OAuth2Context.CODE_SCOPE, OAuth2Context.OAUTH2_F_SCOPE);\r
-        //uriBuilder.appendQueryParameter(OAuth2Context.CODE_STATE, whateverwewant);\r
-        uri = uriBuilder.build();\r
-        Log.d(TAG, "Starting browser to view " + uri.toString());\r
-        Intent i = new Intent(Intent.ACTION_VIEW, uri);\r
-        startActivity(i);\r
-        //}\r
-    }\r
-\r
-    \r
-    /**\r
-     * Callback method invoked when a RemoteOperation executed by this Activity finishes.\r
-     * \r
-     * Dispatches the operation flow to the right method.\r
-     */\r
-    @Override\r
-    public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) {\r
-\r
-        if (operation instanceof OwnCloudServerCheckOperation) {\r
-            onOcServerCheckFinish((OwnCloudServerCheckOperation) operation, result);\r
-            \r
-        } else if (operation instanceof OAuth2GetAccessToken) {\r
-            onGetOAuthAccessTokenFinish((OAuth2GetAccessToken)operation, result);\r
-                \r
-        } else if (operation instanceof ExistenceCheckOperation)  {\r
-            onAuthorizationCheckFinish((ExistenceCheckOperation)operation, result);\r
-                \r
-        }\r
-    }\r
-    \r
-\r
-    /**\r
-     * Processes the result of the server check performed when the user finishes the enter of the\r
-     * server URL.\r
-     * \r
-     * @param operation     Server check performed.\r
-     * @param result        Result of the check.\r
-     */\r
-    private void onOcServerCheckFinish(OwnCloudServerCheckOperation operation, RemoteOperationResult result) {\r
-        /// update status icon and text\r
-        updateStatusIconAndText(result);\r
-        updateConnStatus();\r
-\r
-        /// save result state\r
-        mStatusCorrect = result.isSuccess();\r
-        mIsSslConn = (result.getCode() == ResultCode.OK_SSL);\r
-        \r
-        /// very special case (TODO: move to a common place for all the remote operations)\r
-        if (result.getCode() == ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED) {\r
-            mLastSslUntrustedServerResult = result;\r
-            showDialog(DIALOG_SSL_VALIDATOR); \r
-        }\r
-        \r
-        /// update the visibility of the 'retry connection' button\r
-        if (!mStatusCorrect)\r
-            mRefreshButton.setVisibility(View.VISIBLE);\r
-        else\r
-            mRefreshButton.setVisibility(View.INVISIBLE);\r
-        \r
-        /// retrieve discovered version and normalize server URL\r
-        mDiscoveredVersion = operation.getDiscoveredVersion();\r
-        mHostBaseUrl = mHostUrlInput.getText().toString().trim();\r
-        if (!mHostBaseUrl.toLowerCase().startsWith("http://") &&\r
-            !mHostBaseUrl.toLowerCase().startsWith("https://")) {\r
-            \r
-            if (mIsSslConn) {\r
-                mHostBaseUrl = "https://" + mHostBaseUrl;\r
-            } else {\r
-                mHostBaseUrl = "http://" + mHostBaseUrl;\r
-            }\r
-            \r
-        }\r
-        if (mHostBaseUrl.endsWith("/"))\r
-            mHostBaseUrl = mHostBaseUrl.substring(0, mHostBaseUrl.length() - 1);\r
-        \r
-        /// allow or not the user try to access the server\r
-        mOkButton.setEnabled(mStatusCorrect);\r
-    }\r
-\r
-\r
-    /**\r
-     * Chooses the right icon and text to show to the user for the received operation result.\r
-     * \r
-     * @param result    Result of a remote operation performed in this activity\r
-     */\r
-    private void updateStatusIconAndText(RemoteOperationResult result) {\r
-        mStatusText = mStatusIcon = 0;\r
-\r
-        switch (result.getCode()) {\r
-        case OK_SSL:\r
-            mStatusIcon = android.R.drawable.ic_secure;\r
-            mStatusText = R.string.auth_secure_connection;\r
-            break;\r
-            \r
-        case OK_NO_SSL:\r
-        case OK:\r
-            if (mHostUrlInput.getText().toString().trim().toLowerCase().startsWith("http://") ) {\r
-                mStatusText = R.string.auth_connection_established;\r
-                mStatusIcon = R.drawable.ic_ok;\r
-            } else {\r
-                mStatusText = R.string.auth_nossl_plain_ok_title;\r
-                mStatusIcon = android.R.drawable.ic_partial_secure;\r
-            }\r
-            break;\r
-            \r
-        case SSL_RECOVERABLE_PEER_UNVERIFIED:\r
-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_ssl_unverified_server_title;\r
-            break;\r
-                \r
-        case BAD_OC_VERSION:\r
-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_bad_oc_version_title;\r
-            break;\r
-        case WRONG_CONNECTION:\r
-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_wrong_connection_title;\r
-            break;\r
-        case TIMEOUT:\r
-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_timeout_title;\r
-            break;\r
-        case INCORRECT_ADDRESS:\r
-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_incorrect_address_title;\r
-            break;\r
-            \r
-        case SSL_ERROR:\r
-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_ssl_general_error_title;\r
-            break;\r
-            \r
-        case UNAUTHORIZED:\r
-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_unauthorized;\r
-            break;\r
-        case HOST_NOT_AVAILABLE:\r
-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_unknown_host_title;\r
-            break;\r
-        case NO_NETWORK_CONNECTION:\r
-            mStatusIcon = R.drawable.no_network;\r
-            mStatusText = R.string.auth_no_net_conn_title;\r
-            break;\r
-        case INSTANCE_NOT_CONFIGURED:\r
-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_not_configured_title;\r
-            break;\r
-        case FILE_NOT_FOUND:\r
-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_incorrect_path_title;\r
-            break;\r
-        case OAUTH2_ERROR:\r
-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_oauth_error;\r
-            break;\r
-        case OAUTH2_ERROR_ACCESS_DENIED:\r
-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_oauth_error_access_denied;\r
-            break;\r
-        case UNHANDLED_HTTP_CODE:\r
-        case UNKNOWN_ERROR:\r
-            mStatusIcon = R.drawable.common_error;\r
-            mStatusText = R.string.auth_unknown_error_title;\r
-            break;\r
-            \r
-        default:\r
-            break;\r
-        }\r
-    }\r
-\r
-\r
-    /**\r
-     * Processes the result of the request for and access token send \r
-     * to an OAuth authorization server.\r
-     * \r
-     * @param operation     Operation performed requesting the access token.\r
-     * @param result        Result of the operation.\r
-     */\r
-    private void onGetOAuthAccessTokenFinish(OAuth2GetAccessToken operation, RemoteOperationResult result) {\r
-        try {\r
-            dismissDialog(DIALOG_OAUTH2_LOGIN_PROGRESS);\r
-        } catch (IllegalArgumentException e) {\r
-            // NOTHING TO DO ; can't find out what situation that leads to the exception in this code, but user logs signal that it happens\r
-        }\r
-\r
-        String webdav_path = AccountUtils.getWebdavPath(mDiscoveredVersion, true);\r
-        if (result.isSuccess() && webdav_path != null) {\r
-            /// be gentle with the user\r
-            showDialog(DIALOG_LOGIN_PROGRESS);\r
-            \r
-            /// time to test the retrieved access token on the ownCloud server\r
-            mOAuthAccessToken = ((OAuth2GetAccessToken)operation).getResultTokenMap().get(OAuth2Context.KEY_ACCESS_TOKEN);\r
-            Log.d(TAG, "Got ACCESS TOKEN: " + mOAuthAccessToken);\r
-            mAuthCheckOperation = new ExistenceCheckOperation("", this, false);\r
-            WebdavClient client = OwnCloudClientUtils.createOwnCloudClient(Uri.parse(mHostBaseUrl + webdav_path), this);\r
-            client.setBearerCredentials(mOAuthAccessToken);\r
-            mAuthCheckOperation.execute(client, this, mHandler);\r
-            \r
-        } else {\r
-            updateStatusIconAndText(result);\r
-            updateAuthStatus();\r
-            Log.d(TAG, "Access failed: " + result.getLogMessage());\r
-        }\r
-    }\r
-\r
-    \r
-    /**\r
-     * Processes the result of the access check performed to try the user credentials.\r
-     * \r
-     * Creates a new account through the AccountManager.\r
-     * \r
-     * @param operation     Access check performed.\r
-     * @param result        Result of the operation.\r
-     */\r
-    private void onAuthorizationCheckFinish(ExistenceCheckOperation operation, RemoteOperationResult result) {\r
-        try {\r
-            dismissDialog(DIALOG_LOGIN_PROGRESS);\r
-        } catch (IllegalArgumentException e) {\r
-            // NOTHING TO DO ; can't find out what situation that leads to the exception in this code, but user logs signal that it happens\r
-        }\r
-        \r
-        if (result.isSuccess()) {\r
-            Log.d(TAG, "Successful access - time to save the account");\r
-\r
-            if (mAction == ACTION_CREATE) {\r
-                createAccount();\r
-                \r
-            } else {\r
-                updateToken();\r
-            }\r
-            \r
-            finish();\r
-            \r
-        } else {\r
-            updateStatusIconAndText(result);\r
-            updateAuthStatus();\r
-            Log.d(TAG, "Access failed: " + result.getLogMessage());\r
-        }\r
-    }\r
-\r
-    \r
-    /**\r
-     * Sets the proper response to get that the Account Authenticator that started this activity saves \r
-     * a new authorization token for mAccount.\r
-     */\r
-    private void updateToken() {\r
-        Bundle response = new Bundle();\r
-        response.putString(AccountManager.KEY_ACCOUNT_NAME, mAccount.name);\r
-        response.putString(AccountManager.KEY_ACCOUNT_TYPE, mAccount.type);\r
-        boolean isOAuth = mOAuth2Check.isChecked();\r
-        if (isOAuth) {\r
-            response.putString(AccountManager.KEY_AUTHTOKEN, mOAuthAccessToken);\r
-            // the next line is necessary; by now, notifications are calling directly to the AuthenticatorActivity to update, without AccountManager intervention\r
-            mAccountMgr.setAuthToken(mAccount, AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN, mOAuthAccessToken);\r
-        } else {\r
-            response.putString(AccountManager.KEY_AUTHTOKEN, mPasswordInput.getText().toString());\r
-            mAccountMgr.setPassword(mAccount, mPasswordInput.getText().toString());\r
-        }\r
-        setAccountAuthenticatorResult(response);\r
-    }\r
-\r
-\r
-    /**\r
-     * Creates a new account through the Account Authenticator that started this activity. \r
-     * \r
-     * This makes the account permanent.\r
-     * \r
-     * TODO Decide how to name the OAuth accounts\r
-     * TODO Minimize the direct interactions with the account manager; seems that not all the operations \r
-     * in the current code are really necessary, provided that right extras are returned to the Account\r
-     * Authenticator through setAccountAuthenticatorResult  \r
-     */\r
-    private void createAccount() {\r
-        /// create and save new ownCloud account\r
-        boolean isOAuth = mOAuth2Check.isChecked();\r
-        \r
-        Uri uri = Uri.parse(mHostBaseUrl);\r
-        String username = mUsernameInput.getText().toString().trim();\r
-        if (isOAuth) {\r
-            username = "OAuth_user" + (new java.util.Random(System.currentTimeMillis())).nextLong();    // TODO change this to something readable\r
-        }            \r
-        String accountName = username + "@" + uri.getHost();\r
-        if (uri.getPort() >= 0) {\r
-            accountName += ":" + uri.getPort();\r
-        }\r
-        mAccount = new Account(accountName, AccountAuthenticator.ACCOUNT_TYPE);\r
-        if (isOAuth) {\r
-            mAccountMgr.addAccountExplicitly(mAccount, "", null);  // with our implementation, the password is never input in the app\r
-        } else {\r
-            mAccountMgr.addAccountExplicitly(mAccount, mPasswordInput.getText().toString(), null);\r
-        }\r
-\r
-        /// add the new account as default in preferences, if there is none already\r
-        Account defaultAccount = AccountUtils.getCurrentOwnCloudAccount(this);\r
-        if (defaultAccount == null) {\r
-            SharedPreferences.Editor editor = PreferenceManager\r
-                    .getDefaultSharedPreferences(this).edit();\r
-            editor.putString("select_oc_account", accountName);\r
-            editor.commit();\r
-        }\r
-\r
-        /// prepare result to return to the Authenticator\r
-        //  TODO check again what the Authenticator makes with it; probably has the same effect as addAccountExplicitly, but it's not well done\r
-        final Intent intent = new Intent();       \r
-        intent.putExtra(AccountManager.KEY_ACCOUNT_TYPE,    AccountAuthenticator.ACCOUNT_TYPE);\r
-        intent.putExtra(AccountManager.KEY_ACCOUNT_NAME,    mAccount.name);\r
-        if (!isOAuth)\r
-            intent.putExtra(AccountManager.KEY_AUTHTOKEN,   AccountAuthenticator.ACCOUNT_TYPE); // TODO check this; not sure it's right; maybe\r
-        intent.putExtra(AccountManager.KEY_USERDATA,        username);\r
-        if (isOAuth) {\r
-            mAccountMgr.setAuthToken(mAccount, AccountAuthenticator.AUTH_TOKEN_TYPE_ACCESS_TOKEN, mOAuthAccessToken);\r
-        }\r
-        /// add user data to the new account; TODO probably can be done in the last parameter addAccountExplicitly, or in KEY_USERDATA\r
-        mAccountMgr.setUserData(mAccount, AccountAuthenticator.KEY_OC_VERSION,    mDiscoveredVersion.toString());\r
-        mAccountMgr.setUserData(mAccount, AccountAuthenticator.KEY_OC_BASE_URL,   mHostBaseUrl);\r
-        if (isOAuth)\r
-            mAccountMgr.setUserData(mAccount, AccountAuthenticator.KEY_SUPPORTS_OAUTH2, "TRUE");  // TODO this flag should be unnecessary\r
-    \r
-        setAccountAuthenticatorResult(intent.getExtras());\r
-        setResult(RESULT_OK, intent);\r
-        \r
-        /// immediately request for the synchronization of the new account\r
-        Bundle bundle = new Bundle();\r
-        bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r
-        ContentResolver.requestSync(mAccount, AccountAuthenticator.AUTHORITY, bundle);\r
-    }\r
-\r
-\r
-    /**\r
-     * {@inheritDoc}\r
-     * \r
-     * Necessary to update the contents of the SSL Dialog\r
-     * \r
-     * TODO move to some common place for all possible untrusted SSL failures\r
-     */\r
-    @Override\r
-    protected void onPrepareDialog(int id, Dialog dialog, Bundle args) {\r
-        switch (id) {\r
-        case DIALOG_LOGIN_PROGRESS:\r
-        case DIALOG_CERT_NOT_SAVED:\r
-        case DIALOG_OAUTH2_LOGIN_PROGRESS:\r
-            break;\r
-        case DIALOG_SSL_VALIDATOR: {\r
-            ((SslValidatorDialog)dialog).updateResult(mLastSslUntrustedServerResult);\r
-            break;\r
-        }\r
-        default:\r
-            Log.e(TAG, "Incorrect dialog called with id = " + id);\r
-        }\r
-    }\r
-\r
-    \r
-    /**\r
-     * {@inheritDoc}\r
-     */\r
-    @Override\r
-    protected Dialog onCreateDialog(int id) {\r
-        Dialog dialog = null;\r
-        switch (id) {\r
-        case DIALOG_LOGIN_PROGRESS: {\r
-            /// simple progress dialog\r
-            ProgressDialog working_dialog = new ProgressDialog(this);\r
-            working_dialog.setMessage(getResources().getString(R.string.auth_trying_to_login));\r
-            working_dialog.setIndeterminate(true);\r
-            working_dialog.setCancelable(true);\r
-            working_dialog\r
-                    .setOnCancelListener(new DialogInterface.OnCancelListener() {\r
-                        @Override\r
-                        public void onCancel(DialogInterface dialog) {\r
-                            /// TODO study if this is enough\r
-                            Log.i(TAG, "Login canceled");\r
-                            if (mOperationThread != null) {\r
-                                mOperationThread.interrupt();\r
-                                finish();\r
-                            }\r
-                        }\r
-                    });\r
-            dialog = working_dialog;\r
-            break;\r
-        }\r
-        case DIALOG_OAUTH2_LOGIN_PROGRESS: {\r
-            /// oAuth2 dialog. We show here to the user the URL and user_code that the user must validate in a web browser. - OLD!\r
-            // TODO optimize this dialog\r
-            ProgressDialog working_dialog = new ProgressDialog(this);\r
-            /* Leave the old OAuth flow\r
-            try {\r
-                if (mCodeResponseJson != null && mCodeResponseJson.has(OAuth2GetCodeRunnable.CODE_VERIFICATION_URL)) {\r
-                    working_dialog.setMessage(String.format(getString(R.string.oauth_code_validation_message), \r
-                            mCodeResponseJson.getString(OAuth2GetCodeRunnable.CODE_VERIFICATION_URL), \r
-                            mCodeResponseJson.getString(OAuth2GetCodeRunnable.CODE_USER_CODE)));\r
-                } else {*/\r
-                    working_dialog.setMessage(String.format("Getting authorization")); \r
-                /*}\r
-            } catch (JSONException e) {\r
-                Log.e(TAG, "onCreateDialog->JSONException: " + e.toString());\r
-            }*/\r
-            working_dialog.setIndeterminate(true);\r
-            working_dialog.setCancelable(true);\r
-            working_dialog\r
-            .setOnCancelListener(new DialogInterface.OnCancelListener() {\r
-                @Override\r
-                public void onCancel(DialogInterface dialog) {\r
-                    Log.i(TAG, "Login canceled");\r
-                    /*if (mOAuth2GetCodeThread != null) {\r
-                        mOAuth2GetCodeThread.interrupt();\r
-                        finish();\r
-                    } */\r
-                    /*if (tokenReceiver != null) {\r
-                        unregisterReceiver(tokenReceiver);\r
-                        tokenReceiver = null;\r
-                        finish();\r
-                    }*/\r
-                    finish();\r
-                }\r
-            });\r
-            dialog = working_dialog;\r
-            break;\r
-        }\r
-        case DIALOG_SSL_VALIDATOR: {\r
-            /// TODO start to use new dialog interface, at least for this (it is a FragmentDialog already)\r
-            dialog = SslValidatorDialog.newInstance(this, mLastSslUntrustedServerResult, this);\r
-            break;\r
-        }\r
-        case DIALOG_CERT_NOT_SAVED: {\r
-            AlertDialog.Builder builder = new AlertDialog.Builder(this);\r
-            builder.setMessage(getResources().getString(R.string.ssl_validator_not_saved));\r
-            builder.setCancelable(false);\r
-            builder.setPositiveButton(R.string.common_ok, new DialogInterface.OnClickListener() {\r
-                    @Override\r
-                    public void onClick(DialogInterface dialog, int which) {\r
-                        dialog.dismiss();\r
-                    };\r
-                });\r
-            dialog = builder.create();\r
-            break;\r
-        }\r
-        default:\r
-            Log.e(TAG, "Incorrect dialog called with id = " + id);\r
-        }\r
-        return dialog;\r
-    }\r
-\r
-    \r
-    /**\r
-     * Starts and activity to open the 'new account' page in the ownCloud web site\r
-     * \r
-     * @param view      'Account register' button\r
-     */\r
-    public void onRegisterClick(View view) {\r
-        Intent register = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.url_account_register)));\r
-        setResult(RESULT_CANCELED);\r
-        startActivity(register);\r
-    }\r
-\r
-    \r
-    /**\r
-     * Updates the content and visibility state of the icon and text associated\r
-     * to the last check on the ownCloud server.\r
-     */\r
-    private void updateConnStatus() {\r
-        ImageView iv = (ImageView) findViewById(R.id.action_indicator);\r
-        TextView tv = (TextView) findViewById(R.id.status_text);\r
-\r
-        if (mStatusIcon == 0 && mStatusText == 0) {\r
-            iv.setVisibility(View.INVISIBLE);\r
-            tv.setVisibility(View.INVISIBLE);\r
-        } else {\r
-            iv.setImageResource(mStatusIcon);\r
-            tv.setText(mStatusText);\r
-            iv.setVisibility(View.VISIBLE);\r
-            tv.setVisibility(View.VISIBLE);\r
-        }\r
-    }\r
-    \r
-    \r
-    /**\r
-     * Updates the content and visibility state of the icon and text associated\r
-     * to the interactions with the OAuth authorization server.\r
-     */\r
-    private void updateAuthStatus() {\r
-        /*ImageView iv = (ImageView) findViewById(R.id.auth_status_icon);\r
-        TextView tv = (TextView) findViewById(R.id.auth_status_text);*/\r
-\r
-        if (mStatusIcon == 0 && mStatusText == 0) {\r
-            mAuthStatusLayout.setVisibility(View.INVISIBLE);\r
-            /*iv.setVisibility(View.INVISIBLE);\r
-            tv.setVisibility(View.INVISIBLE);*/\r
-        } else {\r
-            mAuthStatusLayout.setText(mStatusText);\r
-            mAuthStatusLayout.setCompoundDrawablesWithIntrinsicBounds(mStatusIcon, 0, 0, 0);\r
-            /*iv.setImageResource(mStatusIcon);\r
-            tv.setText(mStatusText);\r
-            /*iv.setVisibility(View.VISIBLE);\r
-            tv.setVisibility(View.VISIBLE);^*/\r
-            mAuthStatusLayout.setVisibility(View.VISIBLE);\r
-        }\r
-    }     \r
-\r
-    \r
-    /**\r
-     * Called when the refresh button in the input field for ownCloud host is clicked.\r
-     * \r
-     * Performs a new check on the URL in the input field.\r
-     * \r
-     * @param view      Refresh 'button'\r
-     */\r
-    public void onRefreshClick(View view) {\r
-        onFocusChange(mRefreshButton, false);\r
-    }\r
-    \r
-    \r
-    /**\r
-     * Called when the eye icon in the password field is clicked.\r
-     * \r
-     * Toggles the visibility of the password in the field. \r
-     * \r
-     * @param view      'View password' 'button'\r
-     */\r
-    public void onViewPasswordClick(View view) {\r
-        int selectionStart = mPasswordInput.getSelectionStart();\r
-        int selectionEnd = mPasswordInput.getSelectionEnd();\r
-        int input_type = mPasswordInput.getInputType();\r
-        if ((input_type & InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) == InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD) {\r
-            input_type = InputType.TYPE_CLASS_TEXT\r
-                    | InputType.TYPE_TEXT_VARIATION_PASSWORD;\r
-        } else {\r
-            input_type = InputType.TYPE_CLASS_TEXT\r
-                    | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD;\r
-        }\r
-        mPasswordInput.setInputType(input_type);\r
-        mPasswordInput.setSelection(selectionStart, selectionEnd);\r
-    }    \r
-    \r
-    \r
-    /**\r
-     * Called when the checkbox for OAuth authorization is clicked.\r
-     * \r
-     * Hides or shows the input fields for user & password. \r
-     * \r
-     * @param view      'View password' 'button'\r
-     */\r
-    public void onCheckClick(View view) {\r
-        CheckBox oAuth2Check = (CheckBox)view;      \r
-        changeViewByOAuth2Check(oAuth2Check.isChecked());\r
-\r
-    }\r
-    \r
-    /**\r
-     * Changes the visibility of input elements depending upon the kind of authorization\r
-     * chosen by the user: basic or OAuth\r
-     * \r
-     * @param checked       'True' when OAuth is selected.\r
-     */\r
-    public void changeViewByOAuth2Check(Boolean checked) {\r
-        \r
-        if (checked) {\r
-            mOAuthAuthEndpointText.setVisibility(View.VISIBLE);\r
-            mOAuthTokenEndpointText.setVisibility(View.VISIBLE);\r
-            mUsernameInput.setVisibility(View.GONE);\r
-            mPasswordInput.setVisibility(View.GONE);\r
-            mViewPasswordButton.setVisibility(View.GONE);\r
-        } else {\r
-            mOAuthAuthEndpointText.setVisibility(View.GONE);\r
-            mOAuthTokenEndpointText.setVisibility(View.GONE);\r
-            mUsernameInput.setVisibility(View.VISIBLE);\r
-            mPasswordInput.setVisibility(View.VISIBLE);\r
-            mViewPasswordButton.setVisibility(View.INVISIBLE);\r
-        }     \r
-\r
-    }    \r
-    \r
-    /* Leave the old OAuth flow\r
-    // Results from the first call to oAuth2 server : getting the user_code and verification_url.\r
-    @Override\r
-    public void onOAuth2GetCodeResult(ResultOAuthType type, JSONObject responseJson) {\r
-        if ((type == ResultOAuthType.OK_SSL)||(type == ResultOAuthType.OK_NO_SSL)) {\r
-            mCodeResponseJson = responseJson;\r
-            if (mCodeResponseJson != null) {\r
-                getOAuth2AccessTokenFromJsonResponse();\r
-            }  // else - nothing to do here - wait for callback !!!\r
-        \r
-        } else if (type == ResultOAuthType.HOST_NOT_AVAILABLE) {\r
-            updateOAuth2IconAndText(R.drawable.common_error, R.string.oauth_connection_url_unavailable);\r
-        }\r
-    }\r
-\r
-    // If the results of getting the user_code and verification_url are OK, we get the received data and we start\r
-    // the polling service to oAuth2 server to get a valid token.\r
-    private void getOAuth2AccessTokenFromJsonResponse() {\r
-        String deviceCode = null;\r
-        String verificationUrl = null;\r
-        String userCode = null;\r
-        int expiresIn = -1;\r
-        int interval = -1;\r
-\r
-        Log.d(TAG, "ResponseOAuth2->" + mCodeResponseJson.toString());\r
-\r
-        try {\r
-            // We get data that we must show to the user or we will use internally.\r
-            verificationUrl = mCodeResponseJson.getString(OAuth2GetAuthorizationToken.CODE_VERIFICATION_URL);\r
-            userCode = mCodeResponseJson.getString(OAuth2GetAuthorizationToken.CODE_USER_CODE);\r
-            expiresIn = mCodeResponseJson.getInt(OAuth2GetAuthorizationToken.CODE_EXPIRES_IN);                \r
-\r
-            // And we get data that we must use to get a token.\r
-            deviceCode = mCodeResponseJson.getString(OAuth2GetAuthorizationToken.CODE_DEVICE_CODE);\r
-            interval = mCodeResponseJson.getInt(OAuth2GetAuthorizationToken.CODE_INTERVAL);\r
-\r
-        } catch (JSONException e) {\r
-            Log.e(TAG, "Exception accesing data in Json object" + e.toString());\r
-        }\r
-\r
-        // Updating status widget to OK.\r
-        updateOAuth2IconAndText(R.drawable.ic_ok, R.string.auth_connection_established);\r
-        \r
-        // Showing the dialog with instructions for the user.\r
-        showDialog(DIALOG_OAUTH2_LOGIN_PROGRESS);\r
-\r
-        // Loggin all the data.\r
-        Log.d(TAG, "verificationUrl->" + verificationUrl);\r
-        Log.d(TAG, "userCode->" + userCode);\r
-        Log.d(TAG, "deviceCode->" + deviceCode);\r
-        Log.d(TAG, "expiresIn->" + expiresIn);\r
-        Log.d(TAG, "interval->" + interval);\r
-\r
-        // Starting the pooling service.\r
-        try {\r
-            Intent tokenService = new Intent(this, OAuth2GetTokenService.class);\r
-            tokenService.putExtra(OAuth2GetTokenService.TOKEN_URI, OAuth2Context.OAUTH2_G_DEVICE_GETTOKEN_URL);\r
-            tokenService.putExtra(OAuth2GetTokenService.TOKEN_DEVICE_CODE, deviceCode);\r
-            tokenService.putExtra(OAuth2GetTokenService.TOKEN_INTERVAL, interval);\r
-\r
-            startService(tokenService);\r
-        }\r
-        catch (Exception e) {\r
-            Log.e(TAG, "tokenService creation problem :", e);\r
-        }\r
-        \r
-    }   \r
-    */\r
-    \r
-    /* Leave the old OAuth flow\r
-    // We get data from the oAuth2 token service with this broadcast receiver.\r
-    private class TokenReceiver extends BroadcastReceiver {\r
-        /**\r
-         * The token is received.\r
-         *  @author\r
-         * {@link BroadcastReceiver} to enable oAuth2 token receiving.\r
-         *-/\r
-        @Override\r
-        public void onReceive(Context context, Intent intent) {\r
-            @SuppressWarnings("unchecked")\r
-            HashMap<String, String> tokenResponse = (HashMap<String, String>)intent.getExtras().get(OAuth2GetTokenService.TOKEN_RECEIVED_DATA);\r
-            Log.d(TAG, "TokenReceiver->" + tokenResponse.get(OAuth2GetTokenService.TOKEN_ACCESS_TOKEN));\r
-            dismissDialog(DIALOG_OAUTH2_LOGIN_PROGRESS);\r
-\r
-        }\r
-    }\r
-    */\r
-\r
-    \r
-    /**\r
-     * Called from SslValidatorDialog when a new server certificate was correctly saved.\r
-     */\r
-    public void onSavedCertificate() {\r
-        mOperationThread = mOcServerChkOperation.retry(this, mHandler);                \r
-    }\r
-\r
-    /**\r
-     * Called from SslValidatorDialog when a new server certificate could not be saved \r
-     * when the user requested it.\r
-     */\r
-    @Override\r
-    public void onFailedSavingCertificate() {\r
-        showDialog(DIALOG_CERT_NOT_SAVED);\r
-    }\r
-\r
-}\r

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index eb218d0..c4cbe97 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -66,7 +66,7 @@ import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;\r
 import com.actionbarsherlock.view.Window;\r
 import com.owncloud.android.AccountUtils;\r
 import com.actionbarsherlock.view.MenuItem;\r
 import com.actionbarsherlock.view.Window;\r
 import com.owncloud.android.AccountUtils;\r

-import com.owncloud.android.authenticator.AccountAuthenticator;\r
+import com.owncloud.android.authentication.AccountAuthenticator;\r

 import com.owncloud.android.datamodel.DataStorageManager;\r
 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.datamodel.OCFile;\r
 import com.owncloud.android.datamodel.DataStorageManager;\r
 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.datamodel.OCFile;\r

diff --git a/src/com/owncloud/android/ui/activity/LandingActivity.java b/src/com/owncloud/android/ui/activity/LandingActivity.java
index e63a0fe..e3937be 100644 (file)
--- a/src/com/owncloud/android/ui/activity/LandingActivity.java
+++ b/src/com/owncloud/android/ui/activity/LandingActivity.java
@@ -18,7 +18,7 @@
 package com.owncloud.android.ui.activity;\r
 \r
 import com.actionbarsherlock.app.SherlockFragmentActivity;\r
 package com.owncloud.android.ui.activity;\r
 \r
 import com.actionbarsherlock.app.SherlockFragmentActivity;\r

-import com.owncloud.android.authenticator.AccountAuthenticator;\r
+import com.owncloud.android.authentication.AccountAuthenticator;\r

 import com.owncloud.android.ui.adapter.LandingScreenAdapter;\r
 \r
 import android.accounts.Account;\r
 import com.owncloud.android.ui.adapter.LandingScreenAdapter;\r
 \r
 import android.accounts.Account;\r

diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index 3668ff3..4be1fbb 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -56,7 +56,7 @@ import android.widget.Toast;
 \r
 import com.actionbarsherlock.app.SherlockFragment;\r
 import com.owncloud.android.DisplayUtils;\r
 \r
 import com.actionbarsherlock.app.SherlockFragment;\r
 import com.owncloud.android.DisplayUtils;\r

-import com.owncloud.android.authenticator.AccountAuthenticator;\r
+import com.owncloud.android.authentication.AccountAuthenticator;\r

 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.datamodel.OCFile;\r
 import com.owncloud.android.files.services.FileDownloader;\r
 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.datamodel.OCFile;\r
 import com.owncloud.android.files.services.FileDownloader;\r