From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 17 Jan 2013 15:03:59 +0000 (+0100)
Subject: Redirect app to login screen when any operation started from a foreground component... 
X-Git-Tag: oc-android-1.4.3~29^2~21
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e9f13d77ce3d9a7a94c2338b560659bfe2b1ad0f?hp=-c

Redirect app to login screen when any operation started from a foreground component fails due to bad credentials
---

e9f13d77ce3d9a7a94c2338b560659bfe2b1ad0f
diff --git a/src/com/owncloud/android/operations/RemoteOperation.java b/src/com/owncloud/android/operations/RemoteOperation.java
index 6917cb14..79e53a9f 100644
--- a/src/com/owncloud/android/operations/RemoteOperation.java
+++ b/src/com/owncloud/android/operations/RemoteOperation.java
@@ -19,9 +19,15 @@ package com.owncloud.android.operations;
 
 import java.io.IOException;
 
+import org.apache.commons.httpclient.Credentials;
+
+import com.owncloud.android.authenticator.AccountAuthenticator;
+import com.owncloud.android.network.BearerCredentials;
 import com.owncloud.android.network.OwnCloudClientUtils;
+import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 
 import android.accounts.Account;
+import android.accounts.AccountManager;
 import android.accounts.AccountsException;
 import android.app.Activity;
 import android.content.Context;
@@ -203,34 +209,52 @@ public abstract class RemoteOperation implements Runnable {
 	 * Asynchronous execution of the operation 
 	 * started by {@link RemoteOperation#execute(WebdavClient, OnRemoteOperationListener, Handler)}, 
 	 * and result posting.
+	 * 
+	 * TODO refactor && clean the code; now it's a mess
 	 */
     @Override
     public final void run() {
         RemoteOperationResult result = null;
-        try{
-            if (mClient == null) {
-                if (mAccount != null && mContext != null) {
-                    if (mCallerActivity != null) {
-                        mClient = OwnCloudClientUtils.createOwnCloudClient(mAccount, mContext, mCallerActivity);
+        boolean repeat = false;
+        do {
+            try{
+                if (mClient == null) {
+                    if (mAccount != null && mContext != null) {
+                        if (mCallerActivity != null) {
+                            mClient = OwnCloudClientUtils.createOwnCloudClient(mAccount, mContext, mCallerActivity);
+                        } else {
+                            mClient = OwnCloudClientUtils.createOwnCloudClient(mAccount, mContext);
+                        }
                     } else {
-                        mClient = OwnCloudClientUtils.createOwnCloudClient(mAccount, mContext);
+                        throw new IllegalStateException("Trying to run a remote operation asynchronously with no client instance or account");
                     }
-                } else {
-                    throw new IllegalStateException("Trying to run a remote operation asynchronously with no client instance or account");
                 }
-            }
             
-        } catch (IOException e) {
-            Log.e(TAG, "Error while trying to access to " + mAccount.name, new AccountsException("I/O exception while trying to authorize the account", e));
-            result = new RemoteOperationResult(e);
+            } catch (IOException e) {
+                Log.e(TAG, "Error while trying to access to " + mAccount.name, new AccountsException("I/O exception while trying to authorize the account", e));
+                result = new RemoteOperationResult(e);
             
-        } catch (AccountsException e) {
-            Log.e(TAG, "Error while trying to access to " + mAccount.name, e);
-            result = new RemoteOperationResult(e);
-        }
+            } catch (AccountsException e) {
+                Log.e(TAG, "Error while trying to access to " + mAccount.name, e);
+                result = new RemoteOperationResult(e);
+            }
     	
-        if (result == null)
-            result = run(mClient);
+            if (result == null)
+                result = run(mClient);
+        
+            repeat = false;
+            if (mCallerActivity != null && mAccount != null && mContext != null && !result.isSuccess() && result.getCode() == ResultCode.UNAUTHORIZED) {
+                AccountManager am = AccountManager.get(mContext);
+                Credentials cred = mClient.getCredentials();
+                if (cred instanceof BearerCredentials) {
+                    am.invalidateAuthToken(AccountAuthenticator.ACCOUNT_TYPE, ((BearerCredentials)cred).getAccessToken());
+                } else {
+                    am.clearPassword(mAccount);
+                }
+                mClient = null;
+                repeat = true;
+            }
+        } while (repeat);
         
         final RemoteOperationResult resultToSend = result;
         if (mListenerHandler != null && mListener != null) {
diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index f6c25e2c..5595583e 100644
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -933,28 +933,14 @@ public class FileDetailFragment extends SherlockFragment implements
      */
     @Override
     public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) {
-        if (!result.isSuccess() && result.getCode() == ResultCode.UNAUTHORIZED) {
-            AccountManager am = AccountManager.get(getSherlockActivity());
-            //am.invalidateAuthToken(AccountAuthenticator.ACCOUNT_TYPE, OwnCloudClientUtils.getAuthorizationTokenType(operation.getClient().getCredentials()));
-            Credentials cred = operation.getClient().getCredentials();
-            if (cred instanceof BearerCredentials) {
-                am.invalidateAuthToken(AccountAuthenticator.ACCOUNT_TYPE, ((BearerCredentials)cred).getAccessToken());
-            } else {
-                am.clearPassword(mAccount);
-            }
-            operation.execute(mAccount, getSherlockActivity(), this, mHandler, getSherlockActivity());  // need a new client instance, so avoid retry()
-                // TODO si el usuario no se autoriza de nuevo, esto genera un bucle infinito; o un error en la creación del objecto cliente
-            
-        } else {
-            if (operation instanceof RemoveFileOperation) {
-                onRemoveFileOperationFinish((RemoveFileOperation)operation, result);
+        if (operation instanceof RemoveFileOperation) {
+            onRemoveFileOperationFinish((RemoveFileOperation)operation, result);
                 
-            } else if (operation instanceof RenameFileOperation) {
-                onRenameFileOperationFinish((RenameFileOperation)operation, result);
+        } else if (operation instanceof RenameFileOperation) {
+            onRenameFileOperationFinish((RenameFileOperation)operation, result);
                 
-            } else if (operation instanceof SynchronizeFileOperation) {
-                onSynchronizeFileOperationFinish((SynchronizeFileOperation)operation, result);
-            }
+        } else if (operation instanceof SynchronizeFileOperation) {
+            onSynchronizeFileOperationFinish((SynchronizeFileOperation)operation, result);
         }
     }
     
diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 751de9ee..786d98a2 100644
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -27,7 +27,6 @@ import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
-import com.owncloud.android.network.OwnCloudClientUtils;
 import com.owncloud.android.operations.OnRemoteOperationListener;
 import com.owncloud.android.operations.RemoteOperation;
 import com.owncloud.android.operations.RemoveFileOperation;
@@ -41,7 +40,6 @@ import com.owncloud.android.ui.dialog.EditNameDialog;
 import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;
 import com.owncloud.android.ui.fragment.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;
 
-import eu.alefzero.webdav.WebdavClient;
 import eu.alefzero.webdav.WebdavUtils;
 
 import android.accounts.Account;