Merge pull request #195 from owncloud/fixed_crash_due_to_uploads_to_accounts_not_alre...

Fixed crash due to uploads to accounts not already existing

diff --combined src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 3c34be6,32ab860..5118552
--- 1/src/com/owncloud/android/authentication/AuthenticatorActivity.java
--- 2/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@@ -18,7 -18,6 +18,6 @@@
  \r
  package com.owncloud.android.authentication;\r
  \r
- import com.owncloud.android.AccountUtils;\r
  import com.owncloud.android.Log_OC;\r
  import com.owncloud.android.ui.dialog.SslValidatorDialog;\r
  import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;\r
@@@ -935,33 -934,7 +934,33 @@@ implements  OnRemoteOperationListener, 
  \r
              finish();\r
  \r
 -        } else {\r
 +        } else if (result.isServerFail() || result.isException()) {\r
 +            /// if server fail or exception in authorization, the UI is updated as when a server check failed\r
 +            mServerIsChecked = true;\r
 +            mServerIsValid = false;\r
 +            mIsSslConn = false;\r
 +            mOcServerChkOperation = null;\r
 +            mDiscoveredVersion = null;\r
 +            mHostBaseUrl = normalizeUrl(mHostUrlInput.getText().toString());\r
 +\r
 +            // update status icon and text\r
 +            updateServerStatusIconAndText(result);\r
 +            showServerStatus();\r
 +            mAuthStatusIcon = 0;\r
 +            mAuthStatusText = 0;\r
 +            showAuthStatus();\r
 +            \r
 +            // update input controls state\r
 +            showRefreshButton();\r
 +            mOkButton.setEnabled(false);\r
 +\r
 +            // very special case (TODO: move to a common place for all the remote operations) (dangerous here?)\r
 +            if (result.getCode() == ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED) {\r
 +                mLastSslUntrustedServerResult = result;\r
 +                showDialog(DIALOG_SSL_VALIDATOR); \r
 +            }\r
 +\r
 +        } else {    // authorization fail due to client side - probably wrong credentials\r
              updateAuthStatusIconAndText(result);\r
              showAuthStatus();\r
              Log_OC.d(TAG, "Access failed: " + result.getLogMessage());\r

diff --combined src/com/owncloud/android/operations/RemoteOperationResult.java
index 059c290,6f4f291..1fc0179
--- 1/src/com/owncloud/android/operations/RemoteOperationResult.java
--- 2/src/com/owncloud/android/operations/RemoteOperationResult.java
+++ b/src/com/owncloud/android/operations/RemoteOperationResult.java
@@@ -32,7 -32,11 +32,11 @@@ import org.apache.commons.httpclient.Ht
  import org.apache.commons.httpclient.HttpStatus;
  import org.apache.jackrabbit.webdav.DavException;
  
+ import android.accounts.Account;
+ import android.accounts.AccountsException;
+ 
  import com.owncloud.android.Log_OC;
+ import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;
  import com.owncloud.android.network.CertificateCombinedException;
  
  /**
@@@ -47,6 -51,7 +51,7 @@@ public class RemoteOperationResult impl
  
      /** Generated - should be refreshed every time the class changes!! */
      private static final long serialVersionUID = -7805531062432602444L;
+ 
      
      private static final String TAG = "RemoteOperationResult";
      
@@@ -77,7 -82,9 +82,9 @@@
          LOCAL_STORAGE_NOT_MOVED, 
          LOCAL_STORAGE_NOT_COPIED, 
          OAUTH2_ERROR_ACCESS_DENIED,
-         QUOTA_EXCEEDED
+         QUOTA_EXCEEDED, 
+         ACCOUNT_NOT_FOUND, 
+         ACCOUNT_EXCEPTION
      }
  
      private boolean mSuccess = false;
@@@ -142,6 -149,12 +149,12 @@@
          } else if (e instanceof UnknownHostException) {
              mCode = ResultCode.HOST_NOT_AVAILABLE;
  
+         } else if (e instanceof AccountNotFoundException) {
+             mCode = ResultCode.ACCOUNT_NOT_FOUND;
+             
+         } else if (e instanceof AccountsException) {
+             mCode = ResultCode.ACCOUNT_EXCEPTION;
+             
          } else if (e instanceof SSLException || e instanceof RuntimeException) {
              CertificateCombinedException se = getCertificateCombinedException(e);
              if (se != null) {
@@@ -242,6 -255,13 +255,13 @@@
              } else if (mException instanceof IOException) {
                  return "Unrecovered transport exception";
  
+             } else if (mException instanceof AccountNotFoundException) {
+                 Account failedAccount = ((AccountNotFoundException)mException).getFailedAccount();
+                 return mException.getMessage() + " (" + (failedAccount != null ? failedAccount.name : "NULL") + ")";
+                 
+             } else if (mException instanceof AccountsException) {
+                 return "Exception while using account";
+                 
              } else {
                  return "Unexpected exception";
              }
@@@ -267,12 -287,4 +287,12 @@@
  
      }
  
 +    public boolean isServerFail() {
 +        return (mHttpCode >= HttpStatus.SC_INTERNAL_SERVER_ERROR);
 +    }
 +
 +    public boolean isException() {
 +        return (mException != null);
 +    }
 +
  }