Improved implementation of redirection for first account

src/com/owncloud/android/ui/activity/FileActivity.java

@@ -0,0 +1,215 @@
+/* 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 version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   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.ui.activity;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.AccountManagerCallback;
+import android.accounts.AccountManagerFuture;
+import android.accounts.OperationCanceledException;
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.owncloud.android.AccountUtils;
+import com.owncloud.android.Log_OC;
+import com.owncloud.android.authentication.AccountAuthenticator;
+import com.owncloud.android.datamodel.OCFile;
+
+/**
+ * Activity with common behaviour for activities handling {@link OCFile}s in ownCloud {@link Account}s .
+ * 
+ * @author David A. Velasco
+ */
+public abstract class FileActivity extends SherlockFragmentActivity {
+
+    public static final String EXTRA_FILE = "com.owncloud.android.ui.activity.FILE";
+    public static final String EXTRA_ACCOUNT = "com.owncloud.android.ui.activity.ACCOUNT";
+    
+    public static final String TAG = FileActivity.class.getSimpleName(); 
+    
+    
+    /** OwnCloud {@link Account} where the main {@link OCFile} handled by the activity is located. */
+    private Account mAccount;
+    
+    /** Main {@link OCFile} handled by the activity.*/
+    private OCFile mFile;
+    
+    /** Flag to signal that the activity will is finishing to enforce the creation of an ownCloud {@link Account} */
+    private boolean mRedirectingToSetupAccount = false;
+
+    
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        
+        /// Load of saved instance state: keep this always before initDataFromCurrentAccount()
+        if(savedInstanceState != null) {
+            mFile = savedInstanceState.getParcelable(FileActivity.EXTRA_FILE);
+            mAccount = savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT);
+        } else {
+            mAccount = getIntent().getParcelableExtra(FileActivity.EXTRA_ACCOUNT);
+            mFile = getIntent().getParcelableExtra(FileActivity.EXTRA_FILE);
+        }
+        
+        if (mAccount != null && AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), mAccount.name)) {
+            onAccountChanged();
+        }
+    }
+
+    
+    @Override
+    public void onStart() {
+        Log_OC.e(TAG, "onStart en FileActivity");
+        super.onStart();
+        /// Validate account, and try to fix if wrong
+        if (mAccount == null || !AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), mAccount.name)) {
+            if (!AccountUtils.accountsAreSetup(getApplicationContext())) {
+                /// no account available: force account creation
+                mAccount = null;
+                createFirstAccount();
+                mRedirectingToSetupAccount = true;
+                
+            } else {
+                /// get 'last current account' as default account
+                mAccount = AccountUtils.getCurrentOwnCloudAccount(getApplicationContext());
+                onAccountChanged();
+            }
+        }
+    }
+    
+        
+    /**
+     * Launches the account creation activity. To use when no ownCloud account is available
+     */
+    private void createFirstAccountOldStyle() {
+        Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT);
+        intent.putExtra(android.provider.Settings.EXTRA_AUTHORITIES, new String[] { AccountAuthenticator.AUTHORITY });
+        startActivity(intent); 
+        
+        finish();
+    }
+
+    
+    private void createFirstAccount() {
+        AccountManager am = AccountManager.get(getApplicationContext());
+        am.addAccount(AccountAuthenticator.ACCOUNT_TYPE, 
+                        AccountAuthenticator.AUTH_TOKEN_TYPE_PASSWORD,
+                        null, 
+                        null, 
+                        this, 
+                        new AccountCreationCallback(),                        
+                        null);
+    }
+
+    
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putParcelable(FileActivity.EXTRA_FILE, mFile);
+        outState.putParcelable(FileActivity.EXTRA_ACCOUNT, mAccount);
+    }
+    
+    
+    /**
+     * Getter for the main {@link OCFile} handled by the activity.
+     * 
+     * @return  Main {@link OCFile} handled by the activity.
+     */
+    public OCFile getFile() {
+        return mFile;
+    }
+
+    
+    /**
+     * Setter for the main {@link OCFile} handled by the activity.
+     * 
+     * @param file  Main {@link OCFile} to be handled by the activity.
+     */
+    public void setFile(OCFile file) {
+        mFile = file;
+    }
+
+    
+    /**
+     * Getter for the ownCloud {@link Account} where the main {@link OCFile} handled by the activity is located.
+     * 
+     * @return  OwnCloud {@link Account} where the main {@link OCFile} handled by the activity is located.
+     */
+    public Account getAccount() {
+        return mAccount;
+    }
+
+    
+    /**
+     * @return  'True' when the Activity is finishing to enforce the setup of a new account.
+     */
+    protected boolean isRedirectingToSetupAccount() {
+        return mRedirectingToSetupAccount;
+    }
+    
+    
+    /**
+     * Helper class handling a callback from the {@link AccountManager} after the creation of
+     * a new ownCloud {@link Account} finished, successfully or not.
+     * 
+     * At this moment, only called after the creation of the first account.
+     * 
+     * @author David A. Velasco
+     */
+    public class AccountCreationCallback implements AccountManagerCallback<Bundle> {
+
+        @Override
+        public void run(AccountManagerFuture<Bundle> future) {
+            FileActivity.this.mRedirectingToSetupAccount = false;
+            if (future != null) {
+                try {
+                    Bundle result;
+                    result = future.getResult();
+                    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.onAccountChanged();
+                    }
+                } catch (OperationCanceledException e) {
+                    Log_OC.e(TAG, "Account creation canceled");
+                    
+                } catch (Exception e) {
+                    Log_OC.e(TAG, "Account creation finished in exception: ", e);
+                }
+                    
+            } else {
+                Log_OC.e(TAG, "Account creation callback with null bundle");
+            }
+            if (mAccount == null) {
+                finish();
+            }
+        }
+        
+    }
+
+
+    /**
+     *  Called when the ownCloud {@link Account} associated to the Activity was just updated.
+     * 
+     *  Child classes must grant that state depending on the {@link Account} is updated.
+     */
+    protected abstract void onAccountChanged();
+}

src/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -29,7 +29,6 @@ import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
@@ -53,12 +52,10 @@ import android.widget.Toast;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
-import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;
-import com.owncloud.android.AccountUtils;
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountAuthenticator;
@@ -98,14 +95,16 @@ import com.owncloud.android.ui.preview.PreviewVideoActivity;
  * @author David A. Velasco
  */
 
-public class FileDisplayActivity extends SherlockFragmentActivity implements
+public class FileDisplayActivity extends FileActivity implements
     OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNavigationListener, OnSslValidatorListener, OnRemoteOperationListener, EditNameDialogListener {
     
     private ArrayAdapter<String> mDirectories;
-    private OCFile mCurrentDir = null;
-    private OCFile mCurrentFile = null;
+    //private OCFile mCurrentDir = null;
+    private OCFile mChosenFile = null;
 
-    private DataStorageManager mStorageManager;
+    /** Access point to the cached database for the current ownCloud {@link Account} */
+    private DataStorageManager mStorageManager = null;
+    
     private SyncBroadcastReceiver mSyncBroadcastReceiver;
     private UploadFinishReceiver mUploadFinishReceiver;
     private DownloadFinishReceiver mDownloadFinishReceiver;
@@ -119,16 +118,15 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     private boolean mDualPane;
     private boolean mBackFromCreatingFirstAccount;
     
-    private static final int DIALOG_SETUP_ACCOUNT = 0;
-    public static final int DIALOG_SHORT_WAIT = 1;
-    private static final int DIALOG_CHOOSE_UPLOAD_SOURCE = 2;
-    private static final int DIALOG_SSL_VALIDATOR = 3;
-    private static final int DIALOG_CERT_NOT_SAVED = 4;
+    public static final int DIALOG_SHORT_WAIT = 0;
+    private static final int DIALOG_CHOOSE_UPLOAD_SOURCE = 1;
+    private static final int DIALOG_SSL_VALIDATOR = 2;
+    private static final int DIALOG_CERT_NOT_SAVED = 3;
     
     private static final int ACTION_SELECT_CONTENT_FROM_APPS = 1;
     private static final int ACTION_SELECT_MULTIPLE_FILES = 2;
     
-    private static final String TAG = "FileDisplayActivity";
+    private static final String TAG = FileDisplayActivity.class.getSimpleName();
 
     private OCFile mWaitingToPreview;
     private Handler mHandler;
@@ -138,39 +136,21 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        Log_OC.d(getClass().toString(), "onCreate() start");
+        Log_OC.d(TAG, "onCreate() start");
         super.onCreate(savedInstanceState);
+        
         mStarted = false;
-
         mHandler = new Handler();
 
-        /// Load of parameters from received intent
-        Account account = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT);
-        if (account != null && AccountUtils.setCurrentOwnCloudAccount(this, account.name)) {
-            mCurrentDir = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE); 
-        }
-        
         /// Load of saved instance state: keep this always before initDataFromCurrentAccount()
         if(savedInstanceState != null) {
-            // TODO - test if savedInstanceState should take precedence over file in the intent ALWAYS (now), NEVER. SOME TIMES
-            mCurrentDir = savedInstanceState.getParcelable(FileDetailFragment.EXTRA_FILE);
             mWaitingToPreview = (OCFile) savedInstanceState.getParcelable(FileDetailActivity.KEY_WAITING_TO_PREVIEW);
 
         } else {
             mWaitingToPreview = null;
         }
         
-        if (!AccountUtils.accountsAreSetup(this)) {
-            /// no account available: FORCE ACCOUNT CREATION
-            mStorageManager = null;
-            createFirstAccount();
-            
-        } else {    /// at least an account is available
-            
-            initDataFromCurrentAccount();   // it checks mCurrentDir and mCurrentFile with the current account
-            
-        }
-        
+        /// bindings to transference services
         mUploadConnection = new ListServiceConnection(); 
         mDownloadConnection = new ListServiceConnection();
         bindService(new Intent(this, FileUploader.class), mUploadConnection, Context.BIND_AUTO_CREATE);
@@ -185,14 +165,13 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         Intent observer_intent = new Intent(this, FileObserverService.class);
         observer_intent.putExtra(FileObserverService.KEY_FILE_CMD, FileObserverService.CMD_INIT_OBSERVED_LIST);
         startService(observer_intent);
-        
             
         /// USER INTERFACE
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
             
         // Drop-down navigation 
         mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);
-        OCFile currFile = mCurrentDir;
+        OCFile currFile = getFile();
         while(mStorageManager != null && currFile != null && currFile.getFileName() != OCFile.PATH_SEPARATOR) {
             mDirectories.add(currFile.getFileName());
             currFile = mStorageManager.getFileById(currFile.getParentId());
@@ -210,16 +189,15 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         // Action bar setup
         ActionBar actionBar = getSupportActionBar();
         actionBar.setHomeButtonEnabled(true);   // mandatory since Android ICS, according to the official documentation
-        actionBar.setDisplayHomeAsUpEnabled(mCurrentDir != null && mCurrentDir.getParentId() != 0);
+        actionBar.setDisplayHomeAsUpEnabled(getFile() != null && getFile().getParentId() != 0);
         actionBar.setDisplayShowTitleEnabled(false);
         actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
         actionBar.setListNavigationCallbacks(mDirectories, this);
         setSupportProgressBarIndeterminateVisibility(false);        // always AFTER setContentView(...) ; to workaround bug in its implementation
         
-        
         mBackFromCreatingFirstAccount = false;
         
-        Log_OC.d(getClass().toString(), "onCreate() end");
+        Log_OC.d(TAG, "onCreate() end");
     }
 
     
@@ -234,65 +212,23 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     }
     
     
-    /**
-     * Launches the account creation activity. To use when no ownCloud account is available
-     */
-    private void createFirstAccount() {
-        Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT);
-        intent.putExtra(android.provider.Settings.EXTRA_AUTHORITIES, new String[] { AccountAuthenticator.AUTHORITY });
-        startActivity(intent);  // the new activity won't be created until this.onStart() and this.onResume() are finished;
-    }
-
-    
-    /**
-     *  Load of state dependent of the existence of an ownCloud account
-     */
-    private void initDataFromCurrentAccount() {
-        /// Storage manager initialization - access to local database
-        mStorageManager = new FileDataStorageManager(
-                AccountUtils.getCurrentOwnCloudAccount(this),
-                getContentResolver());
-
-        /// Check if mCurrentDir is a directory
-        if(mCurrentDir != null && !mCurrentDir.isDirectory()) {
-            mCurrentFile = mCurrentDir;
-            mCurrentDir = mStorageManager.getFileById(mCurrentDir.getParentId());
-        }
-        
-        /// Check if mCurrentDir and mCurrentFile are in the current account, and update them
-        if (mCurrentDir != null) {
-            mCurrentDir = mStorageManager.getFileByPath(mCurrentDir.getRemotePath());   // mCurrentDir == null if it is not in the current account
-        }
-        if (mCurrentFile != null) {
-            if (mCurrentFile.fileExists()) {
-                mCurrentFile = mStorageManager.getFileByPath(mCurrentFile.getRemotePath());   // mCurrentFile == null if it is not in the current account
-            }   // else : keep mCurrentFile with the received value; this is currently the case of an upload in progress, when the user presses the status notification in a landscape tablet
-        }
-        
-        /// Default to root if mCurrentDir was not found
-        if (mCurrentDir == null) {
-            mCurrentDir = mStorageManager.getFileByPath("/"); // will be NULL if the database was never synchronized
-        }
-    }
-        
-    
     private void initFileDetailsInDualPane() {
         if (mDualPane && getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG) == null) {
             FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-            if (mCurrentFile != null) {
-                if (PreviewMediaFragment.canBePreviewed(mCurrentFile)) {
-                    if (mCurrentFile.isDown()) {
+            if (mChosenFile != null) {
+                if (PreviewMediaFragment.canBePreviewed(mChosenFile)) {
+                    if (mChosenFile.isDown()) {
                         int startPlaybackPosition = getIntent().getIntExtra(PreviewVideoActivity.EXTRA_START_POSITION, 0);
                         boolean autoplay = getIntent().getBooleanExtra(PreviewVideoActivity.EXTRA_AUTOPLAY, true);
-                        transaction.replace(R.id.file_details_container, new PreviewMediaFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this), startPlaybackPosition, autoplay), FileDetailFragment.FTAG);
+                        transaction.replace(R.id.file_details_container, new PreviewMediaFragment(mChosenFile, getAccount(), startPlaybackPosition, autoplay), FileDetailFragment.FTAG);
                     } else {
-                        transaction.replace(R.id.file_details_container, new FileDetailFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);
-                        mWaitingToPreview = mCurrentFile;
+                        transaction.replace(R.id.file_details_container, new FileDetailFragment(mChosenFile, getAccount()), FileDetailFragment.FTAG);
+                        mWaitingToPreview = mChosenFile;
                     }
                 } else {
-                    transaction.replace(R.id.file_details_container, new FileDetailFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);
+                    transaction.replace(R.id.file_details_container, new FileDetailFragment(mChosenFile, getAccount()), FileDetailFragment.FTAG);
                 }
-                mCurrentFile = null;
+                mChosenFile = null;
                 
             } else {
                 transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG); // empty FileDetailFragment
@@ -334,8 +270,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         } else {
             finish();
             Intent intent = new Intent(this, FileDisplayActivity.class);
-            intent.putExtra(FileDetailFragment.EXTRA_FILE, mCurrentDir);
-            intent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));
+            intent.putExtra(FileDetailFragment.EXTRA_FILE, getFile());
+            intent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, getAccount());
             startActivity(intent);
         }
     }
@@ -382,7 +318,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 break;
             }
             case android.R.id.home: {
-                if(mCurrentDir != null && mCurrentDir.getParentId() != 0){
+                if(getFile() != null && getFile().getParentId() != 0){
                     onBackPressed(); 
                 }
                 break;
@@ -398,7 +334,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         Bundle bundle = new Bundle();
         bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
         ContentResolver.requestSync(
-                AccountUtils.getCurrentOwnCloudAccount(this),
+                getAccount(),
                 AccountAuthenticator.AUTHORITY, bundle);
     }
 
@@ -447,7 +383,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             }
 
             Intent i = new Intent(this, FileUploader.class);
-            i.putExtra(FileUploader.KEY_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));
+            i.putExtra(FileUploader.KEY_ACCOUNT, getAccount());
             i.putExtra(FileUploader.KEY_LOCAL_FILE, filePaths);
             i.putExtra(FileUploader.KEY_REMOTE_FILE, remotePaths);
             i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_MULTIPLE_FILES);
@@ -492,7 +428,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 
         Intent i = new Intent(this, FileUploader.class);
         i.putExtra(FileUploader.KEY_ACCOUNT,
-                AccountUtils.getCurrentOwnCloudAccount(this));
+                getAccount());
         String remotepath = new String();
         for (int j = mDirectories.getCount() - 2; j >= 0; --j) {
             remotepath += OCFile.PATH_SEPARATOR + mDirectories.getItem(j);
@@ -518,7 +454,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         }
         popDirname();
         mFileList.onNavigateUp();
-        mCurrentDir = mFileList.getCurrentFile();
+        setFile(mFileList.getCurrentFile());
         
         if (mDualPane) {
             // Resets the FileDetailsFragment on Tablets so that it always displays
@@ -530,7 +466,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             }
         }
         
-        if(mCurrentDir.getParentId() == 0){
+        if(getFile().getParentId() == 0){
             ActionBar actionBar = getSupportActionBar(); 
             actionBar.setDisplayHomeAsUpEnabled(false);
         } 
@@ -539,70 +475,52 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         // responsibility of restore is preferred in onCreate() before than in onRestoreInstanceState when there are Fragments involved
-        Log_OC.d(getClass().toString(), "onSaveInstanceState() start");
+        Log_OC.d(TAG, "onSaveInstanceState() start");
         super.onSaveInstanceState(outState);
-        outState.putParcelable(FileDetailFragment.EXTRA_FILE, mCurrentDir);
         if (mDualPane) {
             FileFragment fragment = (FileFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
             if (fragment != null) {
                 OCFile file = fragment.getFile();
                 if (file != null) {
-                    outState.putParcelable(FileDetailFragment.EXTRA_FILE, file);
+                    outState.putParcelable(FileActivity.EXTRA_FILE, file);
                 }
             }
         }
         outState.putParcelable(FileDetailActivity.KEY_WAITING_TO_PREVIEW, mWaitingToPreview);
-        Log_OC.d(getClass().toString(), "onSaveInstanceState() end");
+        Log_OC.d(TAG, "onSaveInstanceState() end");
     }
     
     @Override
     protected void onResume() {
-        Log_OC.d(getClass().toString(), "onResume() start");
+        Log_OC.d(TAG, "onResume() start");
         super.onResume();
 
-        if (AccountUtils.accountsAreSetup(this)) {
-            
-            if (mStorageManager == null) {
-                // this is necessary for handling the come back to FileDisplayActivity when the first ownCloud account is created 
-                initDataFromCurrentAccount();
-                if (mDualPane) {
-                    initFileDetailsInDualPane();
-                }
-                mBackFromCreatingFirstAccount = true;
-            }
-            
-            // Listen for sync messages
-            IntentFilter syncIntentFilter = new IntentFilter(FileSyncService.SYNC_MESSAGE);
-            mSyncBroadcastReceiver = new SyncBroadcastReceiver();
-            registerReceiver(mSyncBroadcastReceiver, syncIntentFilter);
-            
-            // Listen for upload messages
-            IntentFilter uploadIntentFilter = new IntentFilter(FileUploader.UPLOAD_FINISH_MESSAGE);
-            mUploadFinishReceiver = new UploadFinishReceiver();
-            registerReceiver(mUploadFinishReceiver, uploadIntentFilter);
-            
-            // Listen for download messages
-            IntentFilter downloadIntentFilter = new IntentFilter(FileDownloader.DOWNLOAD_ADDED_MESSAGE);
-            downloadIntentFilter.addAction(FileDownloader.DOWNLOAD_FINISH_MESSAGE);
-            mDownloadFinishReceiver = new DownloadFinishReceiver();
-            registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);
+        // Listen for sync messages
+        IntentFilter syncIntentFilter = new IntentFilter(FileSyncService.SYNC_MESSAGE);
+        mSyncBroadcastReceiver = new SyncBroadcastReceiver();
+        registerReceiver(mSyncBroadcastReceiver, syncIntentFilter);
         
-            // List current directory
-            mFileList.listDirectory(mCurrentDir);   // TODO we should find the way to avoid the need of this (maybe it's not necessary yet; to check)
-            
-        } else {
-            
-            mStorageManager = null;     // an invalid object will be there if all the ownCloud accounts are removed
-            showDialog(DIALOG_SETUP_ACCOUNT);
-            
-        }
-        Log_OC.d(getClass().toString(), "onResume() end");
+        // Listen for upload messages
+        IntentFilter uploadIntentFilter = new IntentFilter(FileUploader.UPLOAD_FINISH_MESSAGE);
+        mUploadFinishReceiver = new UploadFinishReceiver();
+        registerReceiver(mUploadFinishReceiver, uploadIntentFilter);
+        
+        // Listen for download messages
+        IntentFilter downloadIntentFilter = new IntentFilter(FileDownloader.DOWNLOAD_ADDED_MESSAGE);
+        downloadIntentFilter.addAction(FileDownloader.DOWNLOAD_FINISH_MESSAGE);
+        mDownloadFinishReceiver = new DownloadFinishReceiver();
+        registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);
+    
+        // List current directory
+        mFileList.listDirectory(getFile());   // TODO we should find the way to avoid the need of this (maybe it's not necessary yet; to check)
+    
+        Log_OC.d(TAG, "onResume() end");
     }
 
     
     @Override
     protected void onPause() {
-        Log_OC.d(getClass().toString(), "onPause() start");
+        Log_OC.d(TAG, "onPause() start");
         super.onPause();
         if (mSyncBroadcastReceiver != null) {
             unregisterReceiver(mSyncBroadcastReceiver);
@@ -616,11 +534,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             unregisterReceiver(mDownloadFinishReceiver);
             mDownloadFinishReceiver = null;
         }
-        if (!AccountUtils.accountsAreSetup(this)) {
-            dismissDialog(DIALOG_SETUP_ACCOUNT);
-        }
         
-        Log_OC.d(getClass().toString(), "onPause() end");
+        Log_OC.d(TAG, "onPause() end");
     }
 
     
@@ -637,28 +552,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         Dialog dialog = null;
         AlertDialog.Builder builder;
         switch (id) {
-        case DIALOG_SETUP_ACCOUNT: {
-            builder = new AlertDialog.Builder(this);
-            builder.setTitle(R.string.main_tit_accsetup);
-            builder.setMessage(R.string.main_wrn_accsetup);
-            builder.setCancelable(false);
-            builder.setPositiveButton(android.R.string.ok, new OnClickListener() {
-                public void onClick(DialogInterface dialog, int which) {
-                    createFirstAccount();
-                    dialog.dismiss();
-                }
-            });
-            String message = String.format(getString(R.string.common_exit), getString(R.string.app_name));
-            builder.setNegativeButton(message, new OnClickListener() {
-                public void onClick(DialogInterface dialog, int which) {
-                    dialog.dismiss();
-                    finish();
-                }
-            });
-            //builder.setNegativeButton(android.R.string.cancel, this);
-            dialog = builder.create();
-            break;
-        }
         case DIALOG_SHORT_WAIT: {
             ProgressDialog working_dialog = new ProgressDialog(this);
             working_dialog.setMessage(getResources().getString(
@@ -691,8 +584,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                     if (item == 0) {
                         // if (!mDualPane) {
                         Intent action = new Intent(FileDisplayActivity.this, UploadFilesActivity.class);
-                        action.putExtra(UploadFilesActivity.EXTRA_ACCOUNT,
-                                AccountUtils.getCurrentOwnCloudAccount(FileDisplayActivity.this));
+                        action.putExtra(UploadFilesActivity.EXTRA_ACCOUNT, FileDisplayActivity.this.getAccount());
                         startActivityForResult(action, ACTION_SELECT_MULTIPLE_FILES);
                         // } else {
                         // TODO create and handle new fragment
@@ -704,9 +596,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                         startActivityForResult(Intent.createChooser(action, getString(R.string.upload_chooser_title)),
                                 ACTION_SELECT_CONTENT_FROM_APPS);
                     } else if (item == 2 && InstantUploadActivity.IS_ENABLED) {
-                        Account account = AccountUtils.getCurrentOwnCloudAccount(FileDisplayActivity.this);
                         Intent action = new Intent(FileDisplayActivity.this, InstantUploadActivity.class);
-                        action.putExtra(FileUploader.KEY_ACCOUNT, account);
+                        action.putExtra(FileUploader.KEY_ACCOUNT, FileDisplayActivity.this.getAccount());
                         startActivity(action);
                     }
                 }
@@ -767,7 +658,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             throw new IllegalArgumentException("Only directories may be pushed!");
         }
         mDirectories.insert(directory.getFileName(), 0);
-        mCurrentDir = directory;
+        setFile(directory);
     }
 
     /**
@@ -818,26 +709,28 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 
             Log_OC.d("FileDisplay", "sync of account " + accountName + " is in_progress: " + inProgress);
 
-            if (accountName.equals(AccountUtils.getCurrentOwnCloudAccount(context).name)) {  
+            if (getAccount() != null && accountName.equals(getAccount().name)) {  
             
                 String synchFolderRemotePath = intent.getStringExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH); 
                  
                 boolean fillBlankRoot = false;
-                if (mCurrentDir == null) {
-                    mCurrentDir = mStorageManager.getFileByPath("/");
-                    fillBlankRoot = (mCurrentDir != null);
+                OCFile currentDir = getFile();
+                if (currentDir == null) {
+                    currentDir = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR);
+                    fillBlankRoot = (currentDir != null);
                 }
 
-                if ((synchFolderRemotePath != null && mCurrentDir != null && (mCurrentDir.getRemotePath().equals(synchFolderRemotePath)))
+                if ((synchFolderRemotePath != null && currentDir != null && (currentDir.getRemotePath().equals(synchFolderRemotePath)))
                         || fillBlankRoot ) {
                     if (!fillBlankRoot) 
-                        mCurrentDir = getStorageManager().getFileByPath(synchFolderRemotePath);
+                        currentDir = getStorageManager().getFileByPath(synchFolderRemotePath);
                     OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager()
                             .findFragmentById(R.id.fileList);
                     if (fileListFragment != null) {
-                        fileListFragment.listDirectory(mCurrentDir);
+                        fileListFragment.listDirectory(currentDir);
                     }
                 }
+                setFile(currentDir);
                 
                 setSupportProgressBarIndeterminateVisibility(inProgress);
                 if (mBackFromCreatingFirstAccount) {
@@ -872,8 +765,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         public void onReceive(Context context, Intent intent) {
             String uploadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH);
             String accountName = intent.getStringExtra(FileUploader.ACCOUNT_NAME);
-            boolean sameAccount = accountName.equals(AccountUtils.getCurrentOwnCloudAccount(context).name);
-            boolean isDescendant = (mCurrentDir != null) && (uploadedRemotePath != null) && (uploadedRemotePath.startsWith(mCurrentDir.getRemotePath()));
+            boolean sameAccount = getAccount() != null && accountName.equals(getAccount().name);
+            boolean isDescendant = (getFile() != null) && (uploadedRemotePath != null) && (uploadedRemotePath.startsWith(getFile().getRemotePath()));
             if (sameAccount && isDescendant) {
                 OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);
                 if (fileListFragment != null) { 
@@ -909,12 +802,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         }
 
         private boolean isDescendant(String downloadedRemotePath) {
-            return (mCurrentDir != null && downloadedRemotePath != null && downloadedRemotePath.startsWith(mCurrentDir.getRemotePath()));
+            return (getFile() != null && downloadedRemotePath != null && downloadedRemotePath.startsWith(getFile().getRemotePath()));
         }
 
         private boolean isSameAccount(Context context, Intent intent) {
             String accountName = intent.getStringExtra(FileDownloader.ACCOUNT_NAME);
-            return (accountName != null && accountName.equals(AccountUtils.getCurrentOwnCloudAccount(context).name));
+            return (accountName != null && getAccount() != null && accountName.equals(getAccount().name));
         }
     }
     
@@ -946,7 +839,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 if (success && waitedPreview) {
                     mWaitingToPreview = mStorageManager.getFileById(mWaitingToPreview.getFileId());   // update the file from database, for the local storage path
                     FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-                    transaction.replace(R.id.file_details_container, new PreviewMediaFragment(mWaitingToPreview, AccountUtils.getCurrentOwnCloudAccount(this), 0, true), FileDetailFragment.FTAG);
+                    transaction.replace(R.id.file_details_container, new PreviewMediaFragment(mWaitingToPreview, getAccount(), 0, true), FileDetailFragment.FTAG);
                     transaction.commit();
                     mWaitingToPreview = null;
                     
@@ -1028,20 +921,20 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     private void startPreviewImage(OCFile file) {
         Intent showDetailsIntent = new Intent(this, PreviewImageActivity.class);
         showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);
-        showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));
+        showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, getAccount());
         startActivity(showDetailsIntent);
     }
     
     private void startMediaPreview(OCFile file, int startPlaybackPosition, boolean autoplay, boolean onOrientationChange) {
         if (mDualPane && !onOrientationChange) {
             FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-            transaction.replace(R.id.file_details_container, new PreviewMediaFragment(file, AccountUtils.getCurrentOwnCloudAccount(this), startPlaybackPosition, autoplay), FileDetailFragment.FTAG);
+            transaction.replace(R.id.file_details_container, new PreviewMediaFragment(file, getAccount(), startPlaybackPosition, autoplay), FileDetailFragment.FTAG);
             transaction.commit();
             
         } else {
             Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);
             showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);
-            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, getAccount());
             showDetailsIntent.putExtra(PreviewVideoActivity.EXTRA_START_POSITION, startPlaybackPosition);
             showDetailsIntent.putExtra(PreviewVideoActivity.EXTRA_AUTOPLAY, autoplay);
             startActivity(showDetailsIntent);
@@ -1051,7 +944,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     private void startDownloadForPreview(OCFile file, boolean onOrientationChange) {
         if (mDualPane && !onOrientationChange) {
             FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-            transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);
+            transaction.replace(R.id.file_details_container, new FileDetailFragment(file, getAccount()), FileDetailFragment.FTAG);
             transaction.commit();
             mWaitingToPreview = file;
             requestForDownload();
@@ -1059,7 +952,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         } else {
             Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);
             showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);
-            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, getAccount());
             startActivity(showDetailsIntent);
         }
     }
@@ -1068,12 +961,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     private void startDetails(OCFile file, boolean onOrientationChange) {
         if (mDualPane && !file.isImage() && !onOrientationChange) {
             FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-            transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);
+            transaction.replace(R.id.file_details_container, new FileDetailFragment(file, getAccount()), FileDetailFragment.FTAG);
             transaction.commit();
         } else {
             Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);
             showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);
-            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, getAccount());
             startActivity(showDetailsIntent);
         }
     }
@@ -1084,7 +977,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
      */
     @Override
     public OCFile getInitialDirectory() {
-        return mCurrentDir;
+        return getFile();
     }
     
     
@@ -1235,7 +1128,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                     transaction.commit();
                 }
             }
-            if (mStorageManager.getFileById(removedFile.getParentId()).equals(mCurrentDir)) {
+            if (mStorageManager.getFileById(removedFile.getParentId()).equals(getFile())) {
                 mFileList.listDirectory();
             }
                 
@@ -1287,10 +1180,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             if (mDualPane) {
                 FileFragment details = (FileFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
                 if (details != null && details instanceof FileDetailFragment && renamedFile.equals(details.getFile()) ) {
-                    ((FileDetailFragment) details).updateFileDetails(renamedFile, AccountUtils.getCurrentOwnCloudAccount(this));
+                    ((FileDetailFragment) details).updateFileDetails(renamedFile, getAccount());
                 }
             }
-            if (mStorageManager.getFileById(renamedFile.getParentId()).equals(mCurrentDir)) {
+            if (mStorageManager.getFileById(renamedFile.getParentId()).equals(getFile())) {
                 mFileList.listDirectory();
             }
             
@@ -1318,7 +1211,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             if (result.getCode() == ResultCode.SYNC_CONFLICT) {
                 Intent i = new Intent(this, ConflictsResolveActivity.class);
                 i.putExtra(ConflictsResolveActivity.EXTRA_FILE, syncedFile);
-                i.putExtra(ConflictsResolveActivity.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));
+                i.putExtra(ConflictsResolveActivity.EXTRA_ACCOUNT, getAccount());
                 startActivity(i);
                 
             } else {
@@ -1352,7 +1245,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             FileFragment details = (FileFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
             if (details != null && details instanceof FileDetailFragment && file.equals(details.getFile()) ) {
                 if (downloading || uploading) {
-                    ((FileDetailFragment)details).updateFileDetails(file, AccountUtils.getCurrentOwnCloudAccount(this));
+                    ((FileDetailFragment)details).updateFileDetails(file, getAccount());
                 } else {
                     ((FileDetailFragment)details).updateFileDetails(false, true);
                 }
@@ -1365,39 +1258,38 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     public void showFragmentWithDetails(OCFile file) {
         if (mDualPane) {
             FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-            transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); 
+            transaction.replace(R.id.file_details_container, new FileDetailFragment(file, getAccount()), FileDetailFragment.FTAG); 
             transaction.commit();
             
         } else {
             Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);
             showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);
-            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, getAccount());
             showDetailsIntent.putExtra(FileDetailActivity.EXTRA_MODE, FileDetailActivity.MODE_DETAILS);
             startActivity(showDetailsIntent);
         }
     }
 
     public void onDismiss(EditNameDialog dialog) {
-        //dialog.dismiss();
         if (dialog.getResult()) {
             String newDirectoryName = dialog.getNewFilename().trim();
             Log_OC.d(TAG, "'create directory' dialog dismissed with new name " + newDirectoryName);
             if (newDirectoryName.length() > 0) {
                 String path;
-                if (mCurrentDir == null) {
+                if (getFile() == null) {
                     // this is just a patch; we should ensure that mCurrentDir never is null
                     if (!mStorageManager.fileExists(OCFile.PATH_SEPARATOR)) {
                         OCFile file = new OCFile(OCFile.PATH_SEPARATOR);
                         mStorageManager.saveFile(file);
                     }
-                    mCurrentDir = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR);
+                    setFile(mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR));
                 }
-                path = FileDisplayActivity.this.mCurrentDir.getRemotePath();
+                path = FileDisplayActivity.this.getFile().getRemotePath();
                 
                 // Create directory
                 path += newDirectoryName + OCFile.PATH_SEPARATOR;
-                RemoteOperation operation = new CreateFolderOperation(path, mCurrentDir.getFileId(), mStorageManager);
-                operation.execute(  AccountUtils.getCurrentOwnCloudAccount(FileDisplayActivity.this), 
+                RemoteOperation operation = new CreateFolderOperation(path, getFile().getFileId(), mStorageManager);
+                operation.execute(  getAccount(), 
                                     FileDisplayActivity.this, 
                                     FileDisplayActivity.this, 
                                     mHandler,
@@ -1410,7 +1302,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     
     
     private void requestForDownload() {
-        Account account = AccountUtils.getCurrentOwnCloudAccount(this);
+        Account account = getAccount();
         if (!mDownloaderBinder.isDownloading(account, mWaitingToPreview)) {
             Intent i = new Intent(this, FileDownloader.class);
             i.putExtra(FileDownloader.EXTRA_ACCOUNT, account);
@@ -1419,5 +1311,43 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         }
     }
 
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void onAccountChanged() {
+        if (getAccount() != null) {
+            mStorageManager = new FileDataStorageManager(getAccount(), getContentResolver());
+            
+            /// Check if the 'main' @OCFile handled by the Activity is a directory
+            OCFile currentDir = getFile();
+            if(currentDir != null && !currentDir.isDirectory()) {
+                mChosenFile = getFile();
+                currentDir = mStorageManager.getFileById(currentDir.getParentId());
+            }
+            
+            /// Check if currentDir and mChosenFile are in the current account, and update them
+            if (currentDir != null) {
+                currentDir = mStorageManager.getFileByPath(currentDir.getRemotePath());   // currentDir = null if not in the current Account
+            }
+            if (mChosenFile != null) {
+                if (mChosenFile.fileExists()) {
+                    mChosenFile = mStorageManager.getFileByPath(mChosenFile.getRemotePath());   // mChosenFile = null if not in the current Account
+                }   // else : keep mChosenFile with the received value; this is currently the case of an upload in progress, when the user presses the status notification in a landscape tablet
+            }
+            
+            /// Default to root if mCurrentDir was not found
+            if (currentDir == null) {
+                currentDir = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR);  // never returns null
+            }
+            
+            setFile(currentDir);
+            
+        } else {
+            Log_OC.wtf(TAG, "onAccountChanged was called with NULL account associated!");
+        }
+    }
+
     
 }