Merge remote-tracking branch 'origin/enable_cookies' into enable_cookies

Conflicts:
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
	src/com/owncloud/android/authentication/AuthenticatorAsyncTask.java

diff --cc src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 6d092a2,0c73540..e2c3c03
--- 1/src/com/owncloud/android/authentication/AuthenticatorActivity.java
--- 2/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -1441,10 -1424,20 +1451,23 @@@ public class AuthenticatorActivity exte
  \r
  \r
      /**\r
-      * Sets the proper response to get that the Account Authenticator that started this activity \r
+      * Updates the authentication token.\r
+      *\r
+      * Sets the proper response so that the AccountAuthenticator that started this activity\r
       * saves a new authorization token for mAccount.\r
+      *\r
+      * Kills the session kept by OwnCloudClientManager so that a new one will created with\r
+      * the new credentials when needed.\r
       */\r
-     private void updateToken() {\r
+     private void updateAccountAuthentication() throws AccountNotFoundException {\r
 -\r
 -        OwnCloudClientManagerFactory.getDefaultSingleton().removeClientFor(\r
 -            new OwnCloudAccount(mAccount, this)\r
 -        );\r
++        try {\r
++            OwnCloudClientManagerFactory.getDefaultSingleton().removeClientFor(\r
++                    new OwnCloudAccount(mAccount, this)\r
++            );\r
++        } catch (Exception e) {\r
++            Log_OC.e(TAG, "Exception", e);\r
++        }\r
+ \r
          Bundle response = new Bundle();\r
          response.putString(AccountManager.KEY_ACCOUNT_NAME, mAccount.name);\r
          response.putString(AccountManager.KEY_ACCOUNT_TYPE, mAccount.type);\r

diff --cc src/com/owncloud/android/authentication/AuthenticatorAsyncTask.java
index bf2355c,43822bf..6e21534
--- 1/src/com/owncloud/android/authentication/AuthenticatorAsyncTask.java
--- 2/src/com/owncloud/android/authentication/AuthenticatorAsyncTask.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorAsyncTask.java
@@@ -49,8 -33,7 +49,8 @@@ public class AuthenticatorAsyncTask  ex
  
      public AuthenticatorAsyncTask(Activity activity) {
          mContext = activity.getApplicationContext();
-         mListener = new WeakReference<>((OnAuthenticatorTaskListener)activity);
+         mListener = new WeakReference<OnAuthenticatorTaskListener>((OnAuthenticatorTaskListener)activity);
 +        mActivity = activity;
      }
  
      @Override