X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/a957efbd3df9bc957b078f3a12b47ca3258cb699..d38a69abc1ba78df70fee65fc2434fc80b6be93b:/src/com/owncloud/android/ui/activity/FileActivity.java

diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java
index cfada45c..59b44433 100644
--- a/src/com/owncloud/android/ui/activity/FileActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileActivity.java
@@ -29,13 +29,13 @@ import android.os.Bundle;
 import android.webkit.MimeTypeMap;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
-import com.owncloud.android.Log_OC;
+import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
-import com.owncloud.android.authentication.AccountAuthenticator;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.oc_framework.network.webdav.WebdavUtils;
+import com.owncloud.android.utils.Log_OC;
 
-import eu.alefzero.webdav.WebdavUtils;
 
 /**
  * Activity with common behaviour for activities handling {@link OCFile}s in ownCloud {@link Account}s .
@@ -60,9 +60,15 @@ public abstract class FileActivity extends SherlockFragmentActivity {
     /** Flag to signal that the activity will is finishing to enforce the creation of an ownCloud {@link Account} */
     private boolean mRedirectingToSetupAccount = false;
     
+    /** Flag to signal when the value of mAccount was set */ 
+    private boolean mAccountWasSet;
+    
+    /** Flag to signal when the value of mAccount was restored from a saved state */ 
+    private boolean mAccountWasRestored;
 
+    
     /**
-     * Loads the cownCloud {@link Account} and main {@link OCFile} to be handled by the instance of 
+     * Loads the ownCloud {@link Account} and main {@link OCFile} to be handled by the instance of 
      * the {@link FileActivity}.
      * 
      * Grants that a valid ownCloud {@link Account} is associated to the instance, or that the user 
@@ -72,18 +78,16 @@ public abstract class FileActivity extends SherlockFragmentActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        Account account;
         if(savedInstanceState != null) {
+            account = savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT);
             mFile = savedInstanceState.getParcelable(FileActivity.EXTRA_FILE);
-            mAccount = savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT);
         } else {
-            mAccount = getIntent().getParcelableExtra(FileActivity.EXTRA_ACCOUNT);
+            account = getIntent().getParcelableExtra(FileActivity.EXTRA_ACCOUNT);
             mFile = getIntent().getParcelableExtra(FileActivity.EXTRA_FILE);
         }
 
-        grantValidAccount();
-        if (mAccount != null) {
-            onAccountSet(savedInstanceState != null);
-        }
+        setAccount(account, savedInstanceState != null);
     }
 
     
@@ -95,44 +99,82 @@ public abstract class FileActivity extends SherlockFragmentActivity {
     @Override
     protected void onRestart() {
         super.onRestart();
+        boolean validAccount = (mAccount != null && AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), mAccount.name));
+        if (!validAccount) {
+            swapToDefaultAccount();
+        }
         
-        Account oldAccount = mAccount;
-        grantValidAccount();
-        if (mAccount != null && !mAccount.equals(oldAccount)) {
-            onAccountSet(false);
+    }
+
+    
+    @Override 
+    protected void onStart() {
+        super.onStart();
+        if (mAccountWasSet) {
+            onAccountSet(mAccountWasRestored);
         }
     }
     
-        
+    
     /**
-     *  Validates the ownCloud {@link Account} associated to the Activity any time it is restarted.
+     *  Sets and validates the ownCloud {@link Account} associated to the Activity. 
      * 
      *  If not valid, tries to swap it for other valid and existing ownCloud {@link Account}.
+     *  
+     *  POSTCONDITION: updates {@link #mAccountWasSet} and {@link #mAccountWasRestored}. 
      * 
-     *  If no valid ownCloud {@link Account} exists, mAccount is set to NULL and the user is requested 
-     *  to create a new ownCloud {@link Account}.
+     *  @param account          New {@link Account} to set.
+     *  @param savedAccount     When 'true', account was retrieved from a saved instance state.
      */
-    private void grantValidAccount() {
-        boolean validAccount = (mAccount != null && AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), mAccount.name));
-        if (!validAccount) {
-            // get most recently used account as default account
-            mAccount = AccountUtils.getCurrentOwnCloudAccount(getApplicationContext());
-            if (mAccount == null) {
-                /// no account available: force account creation
-                createFirstAccount();
-                mRedirectingToSetupAccount = true;
-            }
+    private void setAccount(Account account, boolean savedAccount) {
+        Account oldAccount = mAccount;
+        boolean validAccount = (account != null && AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), account.name));
+        if (validAccount) {
+            mAccount = account;
+            mAccountWasSet = true;
+            mAccountWasRestored = (savedAccount || mAccount.equals(oldAccount));
+            
+        } else {
+            swapToDefaultAccount();
         }
     }
+
     
-    
+    /**
+     *  Tries to swap the current ownCloud {@link Account} for other valid and existing. 
+     * 
+     *  If no valid ownCloud {@link Account} exists, the the user is requested 
+     *  to create a new ownCloud {@link Account}.
+     *  
+     *  POSTCONDITION: updates {@link #mAccountWasSet} and {@link #mAccountWasRestored}.
+     *   
+     *  @return     'True' if the checked {@link Account} was valid.
+     */
+    private void swapToDefaultAccount() {
+        // default to the most recently used account
+        Account newAccount  = AccountUtils.getCurrentOwnCloudAccount(getApplicationContext());
+        if (newAccount == null) {
+            /// no account available: force account creation
+            createFirstAccount();
+            mRedirectingToSetupAccount = true;
+            mAccountWasSet = false;
+            mAccountWasRestored = false;
+            
+        } else {
+            mAccountWasSet = true;
+            mAccountWasRestored = (newAccount.equals(mAccount));
+            mAccount = newAccount;
+        }
+    }
+
+
     /**
      * Launches the account creation activity. To use when no ownCloud account is available
      */
     private void createFirstAccount() {
         AccountManager am = AccountManager.get(getApplicationContext());
-        am.addAccount(AccountAuthenticator.ACCOUNT_TYPE, 
-                        AccountAuthenticator.AUTH_TOKEN_TYPE_PASSWORD,
+        am.addAccount(MainApp.getAccountType(), 
+                        null,
                         null, 
                         null, 
                         this, 
@@ -203,6 +245,7 @@ public abstract class FileActivity extends SherlockFragmentActivity {
         @Override
         public void run(AccountManagerFuture<Bundle> future) {
             FileActivity.this.mRedirectingToSetupAccount = false;
+            boolean accountWasSet = false;
             if (future != null) {
                 try {
                     Bundle result;
@@ -210,11 +253,11 @@ public abstract class FileActivity extends SherlockFragmentActivity {
                     String name = result.getString(AccountManager.KEY_ACCOUNT_NAME);
                     String type = result.getString(AccountManager.KEY_ACCOUNT_TYPE);
                     if (AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), name)) {
-                        FileActivity.this.mAccount = new Account(name, type);
-                        FileActivity.this.onAccountSet(false);
+                        setAccount(new Account(name, type), false);
+                        accountWasSet = true;
                     }
                 } catch (OperationCanceledException e) {
-                    Log_OC.e(TAG, "Account creation canceled");
+                    Log_OC.d(TAG, "Account creation canceled");
                     
                 } catch (Exception e) {
                     Log_OC.e(TAG, "Account creation finished in exception: ", e);
@@ -223,8 +266,8 @@ public abstract class FileActivity extends SherlockFragmentActivity {
             } else {
                 Log_OC.e(TAG, "Account creation callback with null bundle");
             }
-            if (mAccount == null) {
-                finish();
+            if (!accountWasSet) {
+                moveTaskToBack(true);
             }
         }