projects / pub / Android / ownCloud.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Adding cancellation to uploads (WIP)
[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / FileDisplayActivity.java
diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 54c99e6..b320297 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -19,21 +19,21 @@
 package com.owncloud.android.ui.activity;\r
 \r
 import java.io.File;\r
 package com.owncloud.android.ui.activity;\r
 \r
 import java.io.File;\r
-import java.util.ArrayList;\r
 \r
 import android.accounts.Account;\r
 \r
 import android.accounts.Account;\r
-import android.accounts.AccountManager;\r
 import android.app.AlertDialog;\r
 import android.app.ProgressDialog;\r
 import android.app.AlertDialog.Builder;\r
 import android.app.Dialog;\r
 import android.content.BroadcastReceiver;\r
 import android.app.AlertDialog;\r
 import android.app.ProgressDialog;\r
 import android.app.AlertDialog.Builder;\r
 import android.app.Dialog;\r
 import android.content.BroadcastReceiver;\r
+import android.content.ComponentName;\r
 import android.content.ContentResolver;\r
 import android.content.Context;\r
 import android.content.DialogInterface;\r
 import android.content.DialogInterface.OnClickListener;\r
 import android.content.Intent;\r
 import android.content.IntentFilter;\r
 import android.content.ContentResolver;\r
 import android.content.Context;\r
 import android.content.DialogInterface;\r
 import android.content.DialogInterface.OnClickListener;\r
 import android.content.Intent;\r
 import android.content.IntentFilter;\r
+import android.content.ServiceConnection;\r
 import android.content.SharedPreferences;\r
 import android.content.pm.PackageInfo;\r
 import android.content.pm.PackageManager.NameNotFoundException;\r
 import android.content.SharedPreferences;\r
 import android.content.pm.PackageInfo;\r
 import android.content.pm.PackageManager.NameNotFoundException;\r
@@ -42,6 +42,7 @@ import android.database.Cursor;
 import android.net.Uri;\r
 import android.os.Bundle;\r
 import android.os.Handler;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r
 import android.os.Handler;\r
+import android.os.IBinder;\r
 import android.preference.PreferenceManager;\r
 import android.provider.MediaStore;\r
 import android.support.v4.app.FragmentTransaction;\r
 import android.preference.PreferenceManager;\r
 import android.provider.MediaStore;\r
 import android.support.v4.app.FragmentTransaction;\r
@@ -61,16 +62,18 @@ import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;\r
 import com.actionbarsherlock.view.Window;\r
 import com.owncloud.android.AccountUtils;\r
 import com.actionbarsherlock.view.MenuItem;\r
 import com.actionbarsherlock.view.Window;\r
 import com.owncloud.android.AccountUtils;\r
-import com.owncloud.android.CrashHandler;\r
 import com.owncloud.android.authenticator.AccountAuthenticator;\r
 import com.owncloud.android.datamodel.DataStorageManager;\r
 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.datamodel.OCFile;\r
 import com.owncloud.android.files.services.FileDownloader;\r
 import com.owncloud.android.authenticator.AccountAuthenticator;\r
 import com.owncloud.android.datamodel.DataStorageManager;\r
 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.datamodel.OCFile;\r
 import com.owncloud.android.files.services.FileDownloader;\r
+import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;\r
 import com.owncloud.android.files.services.FileUploader;\r
 import com.owncloud.android.files.services.FileUploader;\r
+import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;\r
+import com.owncloud.android.network.OwnCloudClientUtils;\r
 import com.owncloud.android.syncadapter.FileSyncService;\r
 import com.owncloud.android.ui.fragment.FileDetailFragment;\r
 import com.owncloud.android.syncadapter.FileSyncService;\r
 import com.owncloud.android.ui.fragment.FileDetailFragment;\r
-import com.owncloud.android.ui.fragment.FileListFragment;\r
+import com.owncloud.android.ui.fragment.OCFileListFragment;\r
 \r
 import com.owncloud.android.R;\r
 import eu.alefzero.webdav.WebdavClient;\r
 \r
 import com.owncloud.android.R;\r
 import eu.alefzero.webdav.WebdavClient;\r
@@ -83,86 +86,176 @@ import eu.alefzero.webdav.WebdavClient;
  */\r
 \r
 public class FileDisplayActivity extends SherlockFragmentActivity implements\r
  */\r
 \r
 public class FileDisplayActivity extends SherlockFragmentActivity implements\r
-    FileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNavigationListener, OnClickListener, android.view.View.OnClickListener  {\r
+    OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNavigationListener {\r
     \r
     private ArrayAdapter<String> mDirectories;\r
     \r
     private ArrayAdapter<String> mDirectories;\r
-    private OCFile mCurrentDir;\r
-    private String[] mDirs = null;\r
+    private OCFile mCurrentDir = null;\r
+    private OCFile mCurrentFile = null;\r
 \r
     private DataStorageManager mStorageManager;\r
     private SyncBroadcastReceiver mSyncBroadcastReceiver;\r
     private UploadFinishReceiver mUploadFinishReceiver;\r
     private DownloadFinishReceiver mDownloadFinishReceiver;\r
 \r
     private DataStorageManager mStorageManager;\r
     private SyncBroadcastReceiver mSyncBroadcastReceiver;\r
     private UploadFinishReceiver mUploadFinishReceiver;\r
     private DownloadFinishReceiver mDownloadFinishReceiver;\r
+    private FileDownloaderBinder mDownloaderBinder = null;\r
+    private FileUploaderBinder mUploaderBinder = null;\r
+    private ServiceConnection mDownloadConnection = null, mUploadConnection = null;\r
     \r
     \r
-    private View mLayoutView = null;\r
-    private FileListFragment mFileList;\r
+    private OCFileListFragment mFileList;\r
     \r
     private boolean mDualPane;\r
     \r
     \r
     private boolean mDualPane;\r
     \r
-    private boolean mForcedLoginToCreateFirstAccount = false;\r
-    \r
-    private static final String KEY_DIR_ARRAY = "DIR_ARRAY";\r
-    private static final String KEY_CURRENT_DIR = "DIR";\r
-    \r
     private static final int DIALOG_SETUP_ACCOUNT = 0;\r
     private static final int DIALOG_CREATE_DIR = 1;\r
     private static final int DIALOG_ABOUT_APP = 2;\r
     public static final int DIALOG_SHORT_WAIT = 3;\r
     private static final int DIALOG_SETUP_ACCOUNT = 0;\r
     private static final int DIALOG_CREATE_DIR = 1;\r
     private static final int DIALOG_ABOUT_APP = 2;\r
     public static final int DIALOG_SHORT_WAIT = 3;\r
+    private static final int DIALOG_CHOOSE_UPLOAD_SOURCE = 4;\r
     \r
     \r
-    private static final int ACTION_SELECT_FILE = 1;\r
+    private static final int ACTION_SELECT_CONTENT_FROM_APPS = 1;\r
+    private static final int ACTION_SELECT_MULTIPLE_FILES = 2;\r
     \r
     private static final String TAG = "FileDisplayActivity";\r
     \r
     \r
     private static final String TAG = "FileDisplayActivity";\r
     \r
-    \r
     @Override\r
     public void onCreate(Bundle savedInstanceState) {\r
     @Override\r
     public void onCreate(Bundle savedInstanceState) {\r
-        Log.i(getClass().toString(), "onCreate() start");\r
+        Log.d(getClass().toString(), "onCreate() start");\r
         super.onCreate(savedInstanceState);\r
 \r
         super.onCreate(savedInstanceState);\r
 \r
-        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
-\r
-        Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext()));\r
-\r
+        /// Load of parameters from received intent\r
+        mCurrentDir = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE); // no check necessary, mCurrenDir == null if the parameter is not in the intent\r
+        Account account = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT);\r
+        if (account != null)\r
+            AccountUtils.setCurrentOwnCloudAccount(this, account.name);\r
+        \r
+        /// Load of saved instance state: keep this always before initDataFromCurrentAccount()\r
         if(savedInstanceState != null) {\r
         if(savedInstanceState != null) {\r
-            mDirs = savedInstanceState.getStringArray(KEY_DIR_ARRAY);\r
-            mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r
-            mDirectories.add(OCFile.PATH_SEPARATOR);\r
-            if (mDirs != null)\r
-                for (String s : mDirs)\r
-                    mDirectories.insert(s, 0);\r
+            // TODO - test if savedInstanceState should take precedence over file in the intent ALWAYS (now), NEVER, or SOME TIMES\r
             mCurrentDir = savedInstanceState.getParcelable(FileDetailFragment.EXTRA_FILE);\r
         }\r
         \r
             mCurrentDir = savedInstanceState.getParcelable(FileDetailFragment.EXTRA_FILE);\r
         }\r
         \r
-        mLayoutView = getLayoutInflater().inflate(R.layout.files, null);  // always inflate this at onCreate() ; just once!\r
-        \r
-        if (AccountUtils.accountsAreSetup(this)) {\r
+        if (!AccountUtils.accountsAreSetup(this)) {\r
+            /// no account available: FORCE ACCOUNT CREATION\r
+            mStorageManager = null;\r
+            createFirstAccount();\r
             \r
             \r
-            initDelayedTilAccountAvailabe();\r
+        } else {    /// at least an account is available\r
             \r
             \r
-            // PIN CODE request ;  best location is to decide, let's try this first\r
-            //if (savedInstanceState == null) {\r
-            if (getIntent().getAction() != null && getIntent().getAction().equals(Intent.ACTION_MAIN) && savedInstanceState == null) {\r
-                requestPinCode();\r
-            }\r
+            initDataFromCurrentAccount();   // it checks mCurrentDir and mCurrentFile with the current account\r
+            \r
+        }\r
+        \r
+        mUploadConnection = new ListServiceConnection(); \r
+        mDownloadConnection = new ListServiceConnection();\r
+        bindService(new Intent(this, FileUploader.class), mUploadConnection, Context.BIND_AUTO_CREATE);\r
+        bindService(new Intent(this, FileDownloader.class), mDownloadConnection, Context.BIND_AUTO_CREATE);\r
+\r
+        // PIN CODE request ;  best location is to decide, let's try this first\r
+        if (getIntent().getAction() != null && getIntent().getAction().equals(Intent.ACTION_MAIN) && savedInstanceState == null) {\r
+            requestPinCode();\r
+        }\r
+\r
+        // file observer\r
+        /*Intent observer_intent = new Intent(this, FileObserverService.class);\r
+        observer_intent.putExtra(FileObserverService.KEY_FILE_CMD, FileObserverService.CMD_INIT_OBSERVED_LIST);\r
+        startService(observer_intent);\r
+        */\r
             \r
             \r
+        /// USER INTERFACE\r
+        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
             \r
             \r
-        } else {\r
+        // Drop-down navigation \r
+        mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r
+        OCFile currFile = mCurrentDir;\r
+        while(currFile != null && currFile.getFileName() != OCFile.PATH_SEPARATOR) {\r
+            mDirectories.add(currFile.getFileName());\r
+            currFile = mStorageManager.getFileById(currFile.getParentId());\r
+        }\r
+        mDirectories.add(OCFile.PATH_SEPARATOR);\r
+\r
+        // Inflate and set the layout view\r
+        setContentView(R.layout.files);    \r
+        mFileList = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
+        mDualPane = (findViewById(R.id.file_details_container) != null);\r
+        if (mDualPane) {\r
+            initFileDetailsInDualPane();\r
+        }\r
             \r
             \r
-            setContentView(R.layout.no_account_available);\r
-            getSupportActionBar().setNavigationMode(ActionBar.DISPLAY_SHOW_TITLE);\r
-            findViewById(R.id.setup_account).setOnClickListener(this);\r
+        // Action bar setup\r
+        ActionBar actionBar = getSupportActionBar();\r
+        actionBar.setHomeButtonEnabled(true);   // mandatory since Android ICS, according to the official documentation\r
+        actionBar.setDisplayHomeAsUpEnabled(mCurrentDir != null && mCurrentDir.getParentId() != 0);\r
+        actionBar.setDisplayShowTitleEnabled(false);\r
+        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);\r
+        actionBar.setListNavigationCallbacks(mDirectories, this);\r
+        setSupportProgressBarIndeterminateVisibility(false);        // always AFTER setContentView(...) ; to workaround bug in its implementation\r
+            \r
+        Log.d(getClass().toString(), "onCreate() end");\r
+    }\r
 \r
 \r
-            setSupportProgressBarIndeterminateVisibility(false);\r
 \r
 \r
-            Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT);\r
-            intent.putExtra(android.provider.Settings.EXTRA_AUTHORITIES, new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });\r
-            startActivity(intent);  // although the code is here, the activity won't be created until this.onStart() and this.onResume() are finished;\r
-            mForcedLoginToCreateFirstAccount = true;\r
+    /**\r
+     * Launches the account creation activity. To use when no ownCloud account is available\r
+     */\r
+    private void createFirstAccount() {\r
+        Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT);\r
+        intent.putExtra(android.provider.Settings.EXTRA_AUTHORITIES, new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });\r
+        startActivity(intent);  // the new activity won't be created until this.onStart() and this.onResume() are finished;\r
+    }\r
+\r
+\r
+    /**\r
+     *  Load of state dependent of the existence of an ownCloud account\r
+     */\r
+    private void initDataFromCurrentAccount() {\r
+        /// Storage manager initialization - access to local database\r
+        mStorageManager = new FileDataStorageManager(\r
+                AccountUtils.getCurrentOwnCloudAccount(this),\r
+                getContentResolver());\r
+\r
+        /// Check if mCurrentDir is a directory\r
+        if(mCurrentDir != null && !mCurrentDir.isDirectory()) {\r
+            mCurrentFile = mCurrentDir;\r
+            mCurrentDir = mStorageManager.getFileById(mCurrentDir.getParentId());\r
+        }\r
+        \r
+        /// Check if mCurrentDir and mCurrentFile are in the current account, and update them\r
+        if (mCurrentDir != null) {\r
+            mCurrentDir = mStorageManager.getFileByPath(mCurrentDir.getRemotePath());   // mCurrentDir == null if it is not in the current account\r
+        }\r
+        if (mCurrentFile != null) {\r
+            mCurrentFile = mStorageManager.getFileByPath(mCurrentFile.getRemotePath());   // mCurrentFile == null if it is not in the current account\r
         }\r
         \r
         }\r
         \r
-        Log.i(getClass().toString(), "onCreate() end");\r
+        /// Default to root if mCurrentDir was not found\r
+        if (mCurrentDir == null) {\r
+            mCurrentDir = mStorageManager.getFileByPath("/"); // will be NULL if the database was never synchronized\r
+        }\r
+    }\r
+        \r
+    \r
+    private void initFileDetailsInDualPane() {\r
+        if (mDualPane && getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG) == null) {\r
+            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
+            if (mCurrentFile != null) {\r
+                transaction.replace(R.id.file_details_container, new FileDetailFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); // empty FileDetailFragment\r
+                mCurrentFile = null;\r
+            } else {\r
+                transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG); // empty FileDetailFragment\r
+            }\r
+            transaction.commit();\r
+        }\r
+    }\r
+    \r
+    \r
+    @Override\r
+    public void onDestroy() {\r
+        super.onDestroy();\r
+        if (mDownloadConnection != null)\r
+            unbindService(mDownloadConnection);\r
+        if (mUploadConnection != null)\r
+            unbindService(mUploadConnection);\r
     }\r
 \r
     }\r
 \r
+    \r
     @Override\r
     public boolean onCreateOptionsMenu(Menu menu) {\r
         MenuInflater inflater = getSherlock().getMenuInflater();\r
     @Override\r
     public boolean onCreateOptionsMenu(Menu menu) {\r
         MenuInflater inflater = getSherlock().getMenuInflater();\r
@@ -179,21 +272,16 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 break;\r
             }\r
             case R.id.startSync: {\r
                 break;\r
             }\r
             case R.id.startSync: {\r
-                ContentResolver.cancelSync(null, "org.owncloud");   // cancel the current synchronizations of any ownCloud account\r
+                ContentResolver.cancelSync(null, AccountAuthenticator.AUTH_TOKEN_TYPE);   // cancel the current synchronizations of any ownCloud account\r
                 Bundle bundle = new Bundle();\r
                 bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r
                 ContentResolver.requestSync(\r
                         AccountUtils.getCurrentOwnCloudAccount(this),\r
                 Bundle bundle = new Bundle();\r
                 bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r
                 ContentResolver.requestSync(\r
                         AccountUtils.getCurrentOwnCloudAccount(this),\r
-                        "org.owncloud", bundle);\r
+                        AccountAuthenticator.AUTH_TOKEN_TYPE, bundle);\r
                 break;\r
             }\r
             case R.id.action_upload: {\r
                 break;\r
             }\r
             case R.id.action_upload: {\r
-                Intent action = new Intent(Intent.ACTION_GET_CONTENT);\r
-                action = action.setType("*/*")\r
-                        .addCategory(Intent.CATEGORY_OPENABLE);\r
-                startActivityForResult(\r
-                        Intent.createChooser(action, getString(R.string.upload_chooser_title)),\r
-                        ACTION_SELECT_FILE);\r
+                showDialog(DIALOG_CHOOSE_UPLOAD_SOURCE);\r
                 break;\r
             }\r
             case R.id.action_settings: {\r
                 break;\r
             }\r
             case R.id.action_settings: {\r
@@ -223,6 +311,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         while (i-- != 0) {\r
             onBackPressed();\r
         }\r
         while (i-- != 0) {\r
             onBackPressed();\r
         }\r
+        // the next operation triggers a new call to this method, but it's necessary to \r
+        // ensure that the name exposed in the action bar is the current directory when the \r
+        // user selected it in the navigation list\r
+        if (itemPosition != 0)\r
+            getSupportActionBar().setSelectedNavigationItem(0);\r
         return true;\r
     }\r
 \r
         return true;\r
     }\r
 \r
@@ -230,61 +323,93 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
      * Called, when the user selected something for uploading\r
      */\r
     public void onActivityResult(int requestCode, int resultCode, Intent data) {\r
      * Called, when the user selected something for uploading\r
      */\r
     public void onActivityResult(int requestCode, int resultCode, Intent data) {\r
-        if (requestCode == ACTION_SELECT_FILE) {\r
-            if (resultCode == RESULT_OK) {\r
-                String filepath = null;\r
-                try {\r
-                    Uri selectedImageUri = data.getData();\r
-    \r
-                    String filemanagerstring = selectedImageUri.getPath();\r
-                    String selectedImagePath = getPath(selectedImageUri);\r
-    \r
-                    if (selectedImagePath != null)\r
-                        filepath = selectedImagePath;\r
-                    else\r
-                        filepath = filemanagerstring;\r
-                    \r
-                } catch (Exception e) {\r
-                    Log.e("FileDisplay", "Unexpected exception when trying to read the result of Intent.ACTION_GET_CONTENT", e);\r
-                    e.printStackTrace();\r
-                    \r
-                } finally {\r
-                    if (filepath == null) {\r
-                        Log.e("FileDisplay", "Couldnt resolve path to file");\r
-                        Toast t = Toast.makeText(this, getString(R.string.filedisplay_unexpected_bad_get_content), Toast.LENGTH_LONG);\r
-                        t.show();\r
-                        return;\r
-                    }\r
-                }\r
-    \r
-                Intent i = new Intent(this, FileUploader.class);\r
-                i.putExtra(FileUploader.KEY_ACCOUNT,\r
-                        AccountUtils.getCurrentOwnCloudAccount(this));\r
-                String remotepath = new String();\r
-                for (int j = mDirectories.getCount() - 2; j >= 0; --j) {\r
-                    remotepath += OCFile.PATH_SEPARATOR + mDirectories.getItem(j);\r
-                }\r
-                if (!remotepath.endsWith(OCFile.PATH_SEPARATOR))\r
-                    remotepath += OCFile.PATH_SEPARATOR;\r
-                remotepath += new File(filepath).getName();\r
-    \r
-                i.putExtra(FileUploader.KEY_LOCAL_FILE, filepath);\r
-                i.putExtra(FileUploader.KEY_REMOTE_FILE, remotepath);\r
-                i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_SINGLE_FILE);\r
-                startService(i);\r
+        \r
+        if (requestCode == ACTION_SELECT_CONTENT_FROM_APPS && resultCode == RESULT_OK) {\r
+            requestSimpleUpload(data);\r
+            \r
+        } else if (requestCode == ACTION_SELECT_MULTIPLE_FILES && resultCode == RESULT_OK) {\r
+            requestMultipleUpload(data);\r
+            \r
+        }\r
+    }\r
+\r
+    private void requestMultipleUpload(Intent data) {\r
+        String[] filePaths = data.getStringArrayExtra(UploadFilesActivity.EXTRA_CHOSEN_FILES);\r
+        if (filePaths != null) {\r
+            String[] remotePaths = new String[filePaths.length];\r
+            String remotePathBase = "";\r
+            for (int j = mDirectories.getCount() - 2; j >= 0; --j) {\r
+                remotePathBase += OCFile.PATH_SEPARATOR + mDirectories.getItem(j);\r
+            }\r
+            if (!remotePathBase.endsWith(OCFile.PATH_SEPARATOR))\r
+                remotePathBase += OCFile.PATH_SEPARATOR;\r
+            for (int j = 0; j< remotePaths.length; j++) {\r
+                remotePaths[j] = remotePathBase + (new File(filePaths[j])).getName();\r
             }\r
             }\r
+\r
+            Intent i = new Intent(this, FileUploader.class);\r
+            i.putExtra(FileUploader.KEY_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r
+            i.putExtra(FileUploader.KEY_LOCAL_FILE, filePaths);\r
+            i.putExtra(FileUploader.KEY_REMOTE_FILE, remotePaths);\r
+            i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_MULTIPLE_FILES);\r
+            startService(i);\r
             \r
             \r
-        }/* dvelasco: WIP - not working as expected ... yet :)\r
-             else if (requestCode == ACTION_CREATE_FIRST_ACCOUNT) {\r
-            if (resultCode != RESULT_OK) {\r
-                finish();   // the user cancelled the AuthenticatorActivity\r
+        } else {\r
+            Log.d("FileDisplay", "User clicked on 'Update' with no selection");\r
+            Toast t = Toast.makeText(this, getString(R.string.filedisplay_no_file_selected), Toast.LENGTH_LONG);\r
+            t.show();\r
+            return;\r
+        }\r
+    }\r
+\r
+\r
+    private void requestSimpleUpload(Intent data) {\r
+        String filepath = null;\r
+        try {\r
+            Uri selectedImageUri = data.getData();\r
+\r
+            String filemanagerstring = selectedImageUri.getPath();\r
+            String selectedImagePath = getPath(selectedImageUri);\r
+\r
+            if (selectedImagePath != null)\r
+                filepath = selectedImagePath;\r
+            else\r
+                filepath = filemanagerstring;\r
+            \r
+        } catch (Exception e) {\r
+            Log.e("FileDisplay", "Unexpected exception when trying to read the result of Intent.ACTION_GET_CONTENT", e);\r
+            e.printStackTrace();\r
+            \r
+        } finally {\r
+            if (filepath == null) {\r
+                Log.e("FileDisplay", "Couldnt resolve path to file");\r
+                Toast t = Toast.makeText(this, getString(R.string.filedisplay_unexpected_bad_get_content), Toast.LENGTH_LONG);\r
+                t.show();\r
+                return;\r
             }\r
             }\r
-        }*/\r
+        }\r
+\r
+        Intent i = new Intent(this, FileUploader.class);\r
+        i.putExtra(FileUploader.KEY_ACCOUNT,\r
+                AccountUtils.getCurrentOwnCloudAccount(this));\r
+        String remotepath = new String();\r
+        for (int j = mDirectories.getCount() - 2; j >= 0; --j) {\r
+            remotepath += OCFile.PATH_SEPARATOR + mDirectories.getItem(j);\r
+        }\r
+        if (!remotepath.endsWith(OCFile.PATH_SEPARATOR))\r
+            remotepath += OCFile.PATH_SEPARATOR;\r
+        remotepath += new File(filepath).getName();\r
+\r
+        i.putExtra(FileUploader.KEY_LOCAL_FILE, filepath);\r
+        i.putExtra(FileUploader.KEY_REMOTE_FILE, remotepath);\r
+        i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_SINGLE_FILE);\r
+        startService(i);\r
     }\r
 \r
     }\r
 \r
+\r
     @Override\r
     public void onBackPressed() {\r
     @Override\r
     public void onBackPressed() {\r
-        if (mDirectories == null || mDirectories.getCount() <= 1) {\r
+        if (mDirectories.getCount() <= 1) {\r
             finish();\r
             return;\r
         }\r
             finish();\r
             return;\r
         }\r
@@ -292,6 +417,17 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         mFileList.onNavigateUp();\r
         mCurrentDir = mFileList.getCurrentFile();\r
         \r
         mFileList.onNavigateUp();\r
         mCurrentDir = mFileList.getCurrentFile();\r
         \r
+        if (mDualPane) {\r
+            // Resets the FileDetailsFragment on Tablets so that it always displays\r
+            FileDetailFragment fileDetails = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
+            if (fileDetails != null && !fileDetails.isEmpty()) {\r
+                FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
+                transaction.remove(fileDetails);\r
+                transaction.add(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG);\r
+                transaction.commit();\r
+            }\r
+        }\r
+        \r
         if(mCurrentDir.getParentId() == 0){\r
             ActionBar actionBar = getSupportActionBar(); \r
             actionBar.setDisplayHomeAsUpEnabled(false);\r
         if(mCurrentDir.getParentId() == 0){\r
             ActionBar actionBar = getSupportActionBar(); \r
             actionBar.setDisplayHomeAsUpEnabled(false);\r
@@ -300,34 +436,35 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 \r
     @Override\r
     protected void onSaveInstanceState(Bundle outState) {\r
 \r
     @Override\r
     protected void onSaveInstanceState(Bundle outState) {\r
-        // responsability of restore is prefered in onCreate() before than in onRestoreInstanceState when there are Fragments involved\r
-        Log.i(getClass().toString(), "onSaveInstanceState() start");\r
+        // responsibility of restore is preferred in onCreate() before than in onRestoreInstanceState when there are Fragments involved\r
+        Log.d(getClass().toString(), "onSaveInstanceState() start");\r
         super.onSaveInstanceState(outState);\r
         super.onSaveInstanceState(outState);\r
-        if(mDirectories != null && mDirectories.getCount() != 0){\r
-            mDirs = new String[mDirectories.getCount()-1];\r
-            for (int j = mDirectories.getCount() - 2, i = 0; j >= 0; --j, ++i) {\r
-                mDirs[i] = mDirectories.getItem(j);\r
+        outState.putParcelable(FileDetailFragment.EXTRA_FILE, mCurrentDir);\r
+        if (mDualPane) {\r
+            FileDetailFragment fragment = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
+            OCFile file = fragment.getDisplayedFile();\r
+            if (file != null) {\r
+                outState.putParcelable(FileDetailFragment.EXTRA_FILE, file);\r
             }\r
         }\r
             }\r
         }\r
-        outState.putStringArray(KEY_DIR_ARRAY, mDirs);\r
-        outState.putParcelable(FileDetailFragment.EXTRA_FILE, mCurrentDir);\r
-        Log.i(getClass().toString(), "onSaveInstanceState() end");\r
+        Log.d(getClass().toString(), "onSaveInstanceState() end");\r
     }\r
 \r
     @Override\r
     protected void onResume() {\r
     }\r
 \r
     @Override\r
     protected void onResume() {\r
-        Log.i(getClass().toString(), "onResume() start");\r
+        Log.d(getClass().toString(), "onResume() start");\r
         super.onResume();\r
 \r
         if (AccountUtils.accountsAreSetup(this)) {\r
         super.onResume();\r
 \r
         if (AccountUtils.accountsAreSetup(this)) {\r
-         // at least an account exist: normal operation\r
             \r
             \r
-            // set the layout only if it couldn't be set in onCreate\r
-            if (mForcedLoginToCreateFirstAccount) {\r
-                initDelayedTilAccountAvailabe();\r
-                mForcedLoginToCreateFirstAccount = false;\r
+            if (mStorageManager == null) {\r
+                // this is necessary for handling the come back to FileDisplayActivity when the first ownCloud account is created \r
+                initDataFromCurrentAccount();\r
+                if (mDualPane) {\r
+                    initFileDetailsInDualPane();\r
+                }\r
             }\r
             }\r
-\r
+            \r
             // Listen for sync messages\r
             IntentFilter syncIntentFilter = new IntentFilter(FileSyncService.SYNC_MESSAGE);\r
             mSyncBroadcastReceiver = new SyncBroadcastReceiver();\r
             // Listen for sync messages\r
             IntentFilter syncIntentFilter = new IntentFilter(FileSyncService.SYNC_MESSAGE);\r
             mSyncBroadcastReceiver = new SyncBroadcastReceiver();\r
@@ -343,77 +480,22 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             mDownloadFinishReceiver = new DownloadFinishReceiver();\r
             registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);\r
         \r
             mDownloadFinishReceiver = new DownloadFinishReceiver();\r
             registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);\r
         \r
-            // Storage manager initialization\r
-            mStorageManager = new FileDataStorageManager(\r
-                    AccountUtils.getCurrentOwnCloudAccount(this),\r
-                    getContentResolver());\r
-        \r
-            // File list fragments   \r
-            mFileList = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
-            \r
+            // List current directory\r
+            mFileList.listDirectory(mCurrentDir);   // we should find the way to avoid the need of this\r
             \r
             \r
-            // Figure out what directory to list. \r
-            // Priority: Intent (here), savedInstanceState (onCreate), root dir (dir is null)\r
-            if(getIntent().hasExtra(FileDetailFragment.EXTRA_FILE)){\r
-                mCurrentDir = (OCFile) getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE);\r
-                if(mCurrentDir != null && !mCurrentDir.isDirectory()){\r
-                    mCurrentDir = mStorageManager.getFileById(mCurrentDir.getParentId());\r
-                }\r
-            \r
-                // Clear intent extra, so rotating the screen will not return us to this directory\r
-                getIntent().removeExtra(FileDetailFragment.EXTRA_FILE);\r
-            }\r
+        } else {\r
             \r
             \r
-            if (mCurrentDir == null)\r
-                mCurrentDir = mStorageManager.getFileByPath("/");\r
-                \r
-            // Drop-Down navigation and file list restore\r
-            mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r
-        \r
-        \r
-            // Given the case we have a file to display:\r
-            if(mCurrentDir != null){\r
-                ArrayList<OCFile> files = new ArrayList<OCFile>();\r
-                OCFile currFile = mCurrentDir;\r
-                while(currFile != null){\r
-                    files.add(currFile);\r
-                    currFile = mStorageManager.getFileById(currFile.getParentId());\r
-                }\r
+            mStorageManager = null;     // an invalid object will be there if all the ownCloud accounts are removed\r
+            showDialog(DIALOG_SETUP_ACCOUNT);\r
             \r
             \r
-                // Insert in mDirs\r
-                mDirs = new String[files.size()];\r
-                for(int i = files.size() - 1; i >= 0; i--){\r
-                    mDirs[i] = files.get(i).getFileName();\r
-                }\r
-            }\r
-        \r
-            if (mDirs != null) {\r
-                for (String s : mDirs)\r
-                    mDirectories.add(s);\r
-            } else {\r
-                mDirectories.add(OCFile.PATH_SEPARATOR);\r
-            }\r
-               \r
-            // Actionbar setup\r
-            ActionBar action_bar = getSupportActionBar();\r
-            action_bar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);\r
-            action_bar.setDisplayShowTitleEnabled(false);\r
-            action_bar.setListNavigationCallbacks(mDirectories, this);\r
-            if(mCurrentDir != null && mCurrentDir.getParentId() != 0){\r
-                action_bar.setDisplayHomeAsUpEnabled(true);\r
-            } else {\r
-                action_bar.setDisplayHomeAsUpEnabled(false);\r
-            }\r
-        \r
-            // List dir here\r
-            mFileList.listDirectory(mCurrentDir);\r
         }\r
         }\r
-        Log.i(getClass().toString(), "onResume() end");\r
+        Log.d(getClass().toString(), "onResume() end");\r
     }\r
 \r
     }\r
 \r
+    \r
     @Override\r
     protected void onPause() {\r
     @Override\r
     protected void onPause() {\r
-        Log.i(getClass().toString(), "onPause() start");\r
+        Log.d(getClass().toString(), "onPause() start");\r
         super.onPause();\r
         if (mSyncBroadcastReceiver != null) {\r
             unregisterReceiver(mSyncBroadcastReceiver);\r
         super.onPause();\r
         if (mSyncBroadcastReceiver != null) {\r
             unregisterReceiver(mSyncBroadcastReceiver);\r
@@ -427,9 +509,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             unregisterReceiver(mDownloadFinishReceiver);\r
             mDownloadFinishReceiver = null;\r
         }\r
             unregisterReceiver(mDownloadFinishReceiver);\r
             mDownloadFinishReceiver = null;\r
         }\r
+        if (!AccountUtils.accountsAreSetup(this)) {\r
+            dismissDialog(DIALOG_SETUP_ACCOUNT);\r
+        }\r
         \r
         \r
-        getIntent().putExtra(FileDetailFragment.EXTRA_FILE, mCurrentDir);\r
-        Log.i(getClass().toString(), "onPause() end");\r
+        Log.d(getClass().toString(), "onPause() end");\r
     }\r
 \r
     @Override\r
     }\r
 \r
     @Override\r
@@ -437,15 +521,27 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         Dialog dialog = null;\r
         AlertDialog.Builder builder;\r
         switch (id) {\r
         Dialog dialog = null;\r
         AlertDialog.Builder builder;\r
         switch (id) {\r
-        case DIALOG_SETUP_ACCOUNT:\r
+        case DIALOG_SETUP_ACCOUNT: {\r
             builder = new AlertDialog.Builder(this);\r
             builder.setTitle(R.string.main_tit_accsetup);\r
             builder.setMessage(R.string.main_wrn_accsetup);\r
             builder.setCancelable(false);\r
             builder = new AlertDialog.Builder(this);\r
             builder.setTitle(R.string.main_tit_accsetup);\r
             builder.setMessage(R.string.main_wrn_accsetup);\r
             builder.setCancelable(false);\r
-            builder.setPositiveButton(android.R.string.ok, this);\r
-            builder.setNegativeButton(android.R.string.cancel, this);\r
+            builder.setPositiveButton(android.R.string.ok, new OnClickListener() {\r
+                public void onClick(DialogInterface dialog, int which) {\r
+                    createFirstAccount();\r
+                    dialog.dismiss();\r
+                }\r
+            });\r
+            builder.setNegativeButton(R.string.common_exit, new OnClickListener() {\r
+                public void onClick(DialogInterface dialog, int which) {\r
+                    dialog.dismiss();\r
+                    finish();\r
+                }\r
+            });\r
+            //builder.setNegativeButton(android.R.string.cancel, this);\r
             dialog = builder.create();\r
             break;\r
             dialog = builder.create();\r
             break;\r
+        }\r
         case DIALOG_ABOUT_APP: {\r
             builder = new AlertDialog.Builder(this);\r
             builder.setTitle(getString(R.string.about_title));\r
         case DIALOG_ABOUT_APP: {\r
             builder = new AlertDialog.Builder(this);\r
             builder.setTitle(getString(R.string.about_title));\r
@@ -465,7 +561,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         case DIALOG_CREATE_DIR: {\r
             builder = new Builder(this);\r
             final EditText dirNameInput = new EditText(getBaseContext());\r
         case DIALOG_CREATE_DIR: {\r
             builder = new Builder(this);\r
             final EditText dirNameInput = new EditText(getBaseContext());\r
-            final Account a = AccountUtils.getCurrentOwnCloudAccount(this);\r
             builder.setView(dirNameInput);\r
             builder.setTitle(R.string.uploader_info_dirname);\r
             int typed_color = getResources().getColor(R.color.setup_text_typed);\r
             builder.setView(dirNameInput);\r
             builder.setTitle(R.string.uploader_info_dirname);\r
             int typed_color = getResources().getColor(R.color.setup_text_typed);\r
@@ -493,7 +588,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                             \r
                             // Create directory\r
                             path += directoryName + OCFile.PATH_SEPARATOR;\r
                             \r
                             // Create directory\r
                             path += directoryName + OCFile.PATH_SEPARATOR;\r
-                            Thread thread = new Thread(new DirectoryCreator(path, a, new Handler()));\r
+                            Thread thread = new Thread(new DirectoryCreator(path,  AccountUtils.getCurrentOwnCloudAccount(FileDisplayActivity.this), new Handler()));\r
                             thread.start();\r
                             \r
                             dialog.dismiss();\r
                             thread.start();\r
                             \r
                             dialog.dismiss();\r
@@ -519,6 +614,33 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             dialog = working_dialog;\r
             break;\r
         }\r
             dialog = working_dialog;\r
             break;\r
         }\r
+        case DIALOG_CHOOSE_UPLOAD_SOURCE: {\r
+            final String [] items = {   getString(R.string.actionbar_upload_files), \r
+                                        getString(R.string.actionbar_upload_from_apps) }; \r
+            builder = new AlertDialog.Builder(this);\r
+            builder.setTitle(R.string.actionbar_upload);\r
+            builder.setItems(items, new DialogInterface.OnClickListener() {\r
+                public void onClick(DialogInterface dialog, int item) {\r
+                    if (item == 0) {\r
+                        //if (!mDualPane) { \r
+                            Intent action = new Intent(FileDisplayActivity.this, UploadFilesActivity.class);\r
+                            startActivityForResult(action, ACTION_SELECT_MULTIPLE_FILES);\r
+                        //} else {\r
+                            // TODO create and handle new fragment LocalFileListFragment\r
+                        //}\r
+                    } else if (item == 1) {\r
+                        Intent action = new Intent(Intent.ACTION_GET_CONTENT);\r
+                        action = action.setType("*/*")\r
+                                .addCategory(Intent.CATEGORY_OPENABLE);\r
+                        startActivityForResult(\r
+                                Intent.createChooser(action, getString(R.string.upload_chooser_title)),\r
+                                ACTION_SELECT_CONTENT_FROM_APPS);\r
+                    }\r
+                }\r
+            });\r
+            dialog = builder.create();\r
+            break;\r
+        }\r
         default:\r
             dialog = null;\r
         }\r
         default:\r
             dialog = null;\r
         }\r
@@ -528,27 +650,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 \r
     \r
     /**\r
 \r
     \r
     /**\r
-     * Responds to the "There are no ownCloud Accounts setup" dialog\r
-     * TODO: Dialog is 100% useless -> Remove\r
-     */\r
-    @Override\r
-    public void onClick(DialogInterface dialog, int which) {\r
-        // In any case - we won't need it anymore\r
-        dialog.dismiss();\r
-        switch (which) {\r
-        case DialogInterface.BUTTON_POSITIVE:\r
-            Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS");\r
-            intent.putExtra("authorities",\r
-                    new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });\r
-            startActivity(intent);\r
-            break;\r
-        case DialogInterface.BUTTON_NEGATIVE:\r
-            finish();\r
-        }\r
-    \r
-    }\r
-\r
-    /**\r
      * Translates a content URI of an image to a physical path\r
      * on the disk\r
      * @param uri The URI to resolve\r
      * Translates a content URI of an image to a physical path\r
      * on the disk\r
      * @param uri The URI to resolve\r
@@ -591,26 +692,17 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     private class DirectoryCreator implements Runnable {\r
         private String mTargetPath;\r
         private Account mAccount;\r
     private class DirectoryCreator implements Runnable {\r
         private String mTargetPath;\r
         private Account mAccount;\r
-        private AccountManager mAm;\r
         private Handler mHandler; \r
     \r
         public DirectoryCreator(String targetPath, Account account, Handler handler) {\r
             mTargetPath = targetPath;\r
             mAccount = account;\r
         private Handler mHandler; \r
     \r
         public DirectoryCreator(String targetPath, Account account, Handler handler) {\r
             mTargetPath = targetPath;\r
             mAccount = account;\r
-            mAm = (AccountManager) getSystemService(ACCOUNT_SERVICE);\r
             mHandler = handler;\r
         }\r
     \r
         @Override\r
         public void run() {\r
             mHandler = handler;\r
         }\r
     \r
         @Override\r
         public void run() {\r
-            WebdavClient wdc = new WebdavClient(mAccount, getApplicationContext());\r
-            \r
-            String username = mAccount.name.substring(0,\r
-                    mAccount.name.lastIndexOf('@'));\r
-            String password = mAm.getPassword(mAccount);\r
-    \r
-            wdc.setCredentials(username, password);\r
-            wdc.allowSelfsignedCertificates();\r
+            WebdavClient wdc = OwnCloudClientUtils.createOwnCloudClient(mAccount, getApplicationContext());\r
             boolean created = wdc.createDirectory(mTargetPath);\r
             if (created) {\r
                 mHandler.post(new Runnable() {\r
             boolean created = wdc.createDirectory(mTargetPath);\r
             if (created) {\r
                 mHandler.post(new Runnable() {\r
@@ -703,7 +795,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                         || fillBlankRoot ) {\r
                     if (!fillBlankRoot) \r
                         mCurrentDir = getStorageManager().getFileByPath(synchFolderRemotePath);\r
                         || fillBlankRoot ) {\r
                     if (!fillBlankRoot) \r
                         mCurrentDir = getStorageManager().getFileByPath(synchFolderRemotePath);\r
-                    FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager()\r
+                    OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager()\r
                             .findFragmentById(R.id.fileList);\r
                     if (fileListFragment != null) {\r
                         fileListFragment.listDirectory(mCurrentDir);  \r
                             .findFragmentById(R.id.fileList);\r
                     if (fileListFragment != null) {\r
                         fileListFragment.listDirectory(mCurrentDir);  \r
@@ -735,7 +827,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                             parentDir.equals(mCurrentDir)\r
                     )\r
                 ) {\r
                             parentDir.equals(mCurrentDir)\r
                     )\r
                 ) {\r
-                FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
+                OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
                 if (fileListFragment != null) { \r
                     fileListFragment.listDirectory();\r
                 }\r
                 if (fileListFragment != null) { \r
                     fileListFragment.listDirectory();\r
                 }\r
@@ -756,25 +848,13 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 \r
             if (accountName.equals(AccountUtils.getCurrentOwnCloudAccount(context).name) &&\r
                      mCurrentDir != null && mCurrentDir.getFileId() == mStorageManager.getFileByPath(downloadedRemotePath).getParentId()) {\r
 \r
             if (accountName.equals(AccountUtils.getCurrentOwnCloudAccount(context).name) &&\r
                      mCurrentDir != null && mCurrentDir.getFileId() == mStorageManager.getFileByPath(downloadedRemotePath).getParentId()) {\r
-                FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
+                OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
                 if (fileListFragment != null) { \r
                     fileListFragment.listDirectory();\r
                 }\r
             }\r
         }\r
     }\r
                 if (fileListFragment != null) { \r
                     fileListFragment.listDirectory();\r
                 }\r
             }\r
         }\r
     }\r
-\r
-    \r
-    @Override\r
-    public void onClick(View v) {\r
-        if (v.getId() == R.id.setup_account) {\r
-            Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT);\r
-            intent.putExtra(android.provider.Settings.EXTRA_AUTHORITIES, new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });\r
-            startActivity(intent); \r
-            mForcedLoginToCreateFirstAccount = true;\r
-        }\r
-    }\r
-\r
     \r
     \r
     \r
     \r
     \r
     \r
@@ -800,10 +880,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         if (mDualPane) {\r
             // Resets the FileDetailsFragment on Tablets so that it always displays\r
             FileDetailFragment fileDetails = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
         if (mDualPane) {\r
             // Resets the FileDetailsFragment on Tablets so that it always displays\r
             FileDetailFragment fileDetails = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
-            if (fileDetails != null) {\r
+            if (fileDetails != null && !fileDetails.isEmpty()) {\r
                 FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
                 transaction.remove(fileDetails);\r
                 FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
                 transaction.remove(fileDetails);\r
-                transaction.add(R.id.file_details_container, new FileDetailFragment(null, null));\r
+                transaction.add(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG);\r
                 transaction.commit();\r
             }\r
         }\r
                 transaction.commit();\r
             }\r
         }\r
@@ -827,7 +907,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         } else {    // small or medium screen device -> new Activity\r
             Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);\r
             showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);\r
         } else {    // small or medium screen device -> new Activity\r
             Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);\r
             showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);\r
-            showDetailsIntent.putExtra(FileDownloader.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r
             startActivity(showDetailsIntent);\r
         }\r
     }\r
             startActivity(showDetailsIntent);\r
         }\r
     }\r
@@ -837,37 +917,79 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
      * {@inheritDoc}\r
      */\r
     @Override\r
      * {@inheritDoc}\r
      */\r
     @Override\r
+    public OCFile getInitialDirectory() {\r
+        return mCurrentDir;\r
+    }\r
+    \r
+    \r
+    /**\r
+     * {@inheritDoc}\r
+     */\r
+    @Override\r
     public void onFileStateChanged() {\r
     public void onFileStateChanged() {\r
-        FileListFragment fileListFragment = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
+        OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
         if (fileListFragment != null) { \r
             fileListFragment.listDirectory();\r
         }\r
     }\r
         if (fileListFragment != null) { \r
             fileListFragment.listDirectory();\r
         }\r
     }\r
+\r
     \r
     \r
+    /**\r
+     * {@inheritDoc}\r
+     */\r
+    @Override\r
+    public FileDownloaderBinder getFileDownloaderBinder() {\r
+        return mDownloaderBinder;\r
+    }\r
+\r
     \r
     /**\r
     \r
     /**\r
-     *  Operations in this method should be preferably performed in onCreate to have a lighter onResume method. \r
-     * \r
-     *  But we need to delay them to onResume for the first start of the application, when no account exists and the login activity must be shown; and \r
-     *  put instead the ugly view that shows the 'Setup' button to restart the login activity.   \r
-     *  \r
-     *  In other way, if the users cancels or presses BACK in the login page that first time (users can be cruel sometimes) would show a blank view (the \r
-     *  FragmentList view empty).\r
-     *  \r
-     *  This is temporal, until we found out how to get a result in this activity after launching the ADD_ACCOUNT Intent with startActivityForResult (not trivial)\r
+     * {@inheritDoc}\r
      */\r
      */\r
-    private void initDelayedTilAccountAvailabe() {\r
-        setContentView(mLayoutView);    \r
-        mDualPane = (findViewById(R.id.file_details_container) != null);\r
-        if (mDualPane && getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG) == null) {\r
-            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
-            transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null)); // empty FileDetailFragment\r
-            transaction.commit();\r
-        }\r
-        setSupportProgressBarIndeterminateVisibility(false);\r
+    @Override\r
+    public FileUploaderBinder getFileUploaderBinder() {\r
+        return mUploaderBinder;\r
     }\r
     \r
     }\r
     \r
+    \r
+    /** Defines callbacks for service binding, passed to bindService() */\r
+    private class ListServiceConnection implements ServiceConnection {\r
 \r
 \r
+        @Override\r
+        public void onServiceConnected(ComponentName component, IBinder service) {\r
+            if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) {\r
+                Log.d(TAG, "Download service connected");\r
+                mDownloaderBinder = (FileDownloaderBinder) service;\r
+            } else if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) {\r
+                Log.d(TAG, "Upload service connected");\r
+                mUploaderBinder = (FileUploaderBinder) service;\r
+            } else {\r
+                return;\r
+            }\r
+            // a new chance to get the mDownloadBinder through getFileDownloadBinder() - THIS IS A MESS\r
+            mFileList.listDirectory();\r
+            if (mDualPane) {\r
+                FileDetailFragment fragment = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
+                if (fragment != null)\r
+                    fragment.updateFileDetails();\r
+            }\r
+            \r
+        }\r
+\r
+        @Override\r
+        public void onServiceDisconnected(ComponentName component) {\r
+            if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) {\r
+                Log.d(TAG, "Download service disconnected");\r
+                mDownloaderBinder = null;\r
+            } else if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) {\r
+                Log.d(TAG, "Upload service disconnected");\r
+                mUploaderBinder = null;\r
+            }\r
+        }\r
+    };    \r
+\r
+    \r
+    \r
     /**\r
      * Launch an intent to request the PIN code to the user before letting him use the app\r
      */\r
     /**\r
      * Launch an intent to request the PIN code to the user before letting him use the app\r
      */\r
@@ -882,5 +1004,5 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         }\r
     }\r
 \r
         }\r
     }\r
 \r
-    \r
+\r
 }\r
 }\r
ownCloud Android App