Fixed bug when turning tablet with no file in the right fragment

[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 46ed65e..d87aabd 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -3,9 +3,8 @@
  *   Copyright (C) 2012-2013 ownCloud Inc.
  *
  *   This program is free software: you can redistribute it and/or modify
  *   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 as published by
- *   the Free Software Foundation, either version 2 of the License, or
- *   (at your option) any later version.
+ *   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
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -23,9 +22,9 @@ import java.io.File;
 
 import android.accounts.Account;
 import android.app.AlertDialog;
 
 import android.accounts.Account;
 import android.app.AlertDialog;

+import android.app.ProgressDialog;

 import android.app.AlertDialog.Builder;
 import android.app.Dialog;
 import android.app.AlertDialog.Builder;
 import android.app.Dialog;

-import android.app.ProgressDialog;

 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.ContentResolver;


@@ -36,19 +35,16 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;

-import android.content.SharedPreferences.Editor;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.Configuration;

 import android.content.res.Resources.NotFoundException;
 import android.database.Cursor;
 import android.content.res.Resources.NotFoundException;
 import android.database.Cursor;

-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;

 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
 import android.provider.MediaStore;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
 import android.provider.MediaStore;

+import android.support.v4.app.Fragment;

 import android.support.v4.app.FragmentTransaction;
 import android.util.Log;
 import android.view.View;
 import android.support.v4.app.FragmentTransaction;
 import android.util.Log;
 import android.view.View;


@@ -66,6 +62,7 @@ import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;
 import com.owncloud.android.AccountUtils;
 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.authenticator.AccountAuthenticator;
 import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.R;
 import com.owncloud.android.authenticator.AccountAuthenticator;
 import com.owncloud.android.datamodel.DataStorageManager;


@@ -80,16 +77,22 @@ import com.owncloud.android.network.OwnCloudClientUtils;
 import com.owncloud.android.operations.OnRemoteOperationListener;
 import com.owncloud.android.operations.RemoteOperation;
 import com.owncloud.android.operations.RemoteOperationResult;
 import com.owncloud.android.operations.OnRemoteOperationListener;
 import com.owncloud.android.operations.RemoteOperation;
 import com.owncloud.android.operations.RemoteOperationResult;

-import com.owncloud.android.operations.RemoteOperationResult.ResultCode;

 import com.owncloud.android.operations.RemoveFileOperation;
 import com.owncloud.android.operations.RenameFileOperation;
 import com.owncloud.android.operations.SynchronizeFileOperation;
 import com.owncloud.android.operations.RemoveFileOperation;
 import com.owncloud.android.operations.RenameFileOperation;
 import com.owncloud.android.operations.SynchronizeFileOperation;

+import com.owncloud.android.operations.RemoteOperationResult.ResultCode;

 import com.owncloud.android.syncadapter.FileSyncService;
 import com.owncloud.android.syncadapter.FileSyncService;

-import com.owncloud.android.ui.dialog.ChangelogDialog;
+import com.owncloud.android.ui.dialog.EditNameDialog;

 import com.owncloud.android.ui.dialog.SslValidatorDialog;
 import com.owncloud.android.ui.dialog.SslValidatorDialog;

+import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;

 import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;
 import com.owncloud.android.ui.fragment.FileDetailFragment;
 import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;
 import com.owncloud.android.ui.fragment.FileDetailFragment;

+import com.owncloud.android.ui.fragment.FileFragment;

 import com.owncloud.android.ui.fragment.OCFileListFragment;
 import com.owncloud.android.ui.fragment.OCFileListFragment;

+import com.owncloud.android.ui.preview.PreviewImageActivity;
+import com.owncloud.android.ui.preview.PreviewImageFragment;
+import com.owncloud.android.ui.preview.PreviewMediaFragment;
+import com.owncloud.android.ui.preview.PreviewVideoActivity;

 
 import eu.alefzero.webdav.WebdavClient;
 
 
 import eu.alefzero.webdav.WebdavClient;
 


@@ -97,12 +100,12 @@ import eu.alefzero.webdav.WebdavClient;
  * Displays, what files the user has available in his ownCloud.
  * 
  * @author Bartek Przybylski
  * Displays, what files the user has available in his ownCloud.
  * 
  * @author Bartek Przybylski

- * 
+ * @author David A. Velasco

  */
 
  */
 

-public class FileDisplayActivity extends SherlockFragmentActivity implements OCFileListFragment.ContainerActivity,
-        FileDetailFragment.ContainerActivity, OnNavigationListener, OnSslValidatorListener, OnRemoteOperationListener {
-
+public class FileDisplayActivity extends SherlockFragmentActivity implements
+    OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNavigationListener, OnSslValidatorListener, OnRemoteOperationListener, EditNameDialogListener {
+    

     private ArrayAdapter<String> mDirectories;
     private OCFile mCurrentDir = null;
     private OCFile mCurrentFile = null;
     private ArrayAdapter<String> mDirectories;
     private OCFile mCurrentDir = null;
     private OCFile mCurrentFile = null;


@@ -119,10 +122,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
     private OCFileListFragment mFileList;
     
     private boolean mDualPane;
     private OCFileListFragment mFileList;
     
     private boolean mDualPane;

+    private boolean mBackFromCreatingFirstAccount;

     
     private static final int DIALOG_SETUP_ACCOUNT = 0;
     private static final int DIALOG_CREATE_DIR = 1;
     
     private static final int DIALOG_SETUP_ACCOUNT = 0;
     private static final int DIALOG_CREATE_DIR = 1;

-    private static final int DIALOG_ABOUT_APP = 2;

     public static final int DIALOG_SHORT_WAIT = 3;
     private static final int DIALOG_CHOOSE_UPLOAD_SOURCE = 4;
     private static final int DIALOG_SSL_VALIDATOR = 5;
     public static final int DIALOG_SHORT_WAIT = 3;
     private static final int DIALOG_CHOOSE_UPLOAD_SOURCE = 4;
     private static final int DIALOG_SSL_VALIDATOR = 5;


@@ -132,40 +135,46 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
     
     private static final int ACTION_SELECT_CONTENT_FROM_APPS = 1;
     private static final int ACTION_SELECT_MULTIPLE_FILES = 2;
     
     private static final int ACTION_SELECT_CONTENT_FROM_APPS = 1;
     private static final int ACTION_SELECT_MULTIPLE_FILES = 2;

-    private static final int ACTION_SELECT_FAILED_INSTANT_UPLOAD = 2;
-
+    

     private static final String TAG = "FileDisplayActivity";
 
     private static final String TAG = "FileDisplayActivity";
 

-    private static int[] mMenuIdentifiersToPatch = {R.id.about_app};
+    private OCFile mWaitingToPreview;
+    private Handler mHandler;

     
     

+    private Configuration mNewConfigurationChangeToApplyOnStart;
+    private boolean mStarted;
+

     @Override
     public void onCreate(Bundle savedInstanceState) {
     @Override
     public void onCreate(Bundle savedInstanceState) {

-        Log.d(getClass().toString(), "onCreate() start");
+        Log_OC.d(getClass().toString(), "onCreate() start");

         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);

+        mStarted = false;

 
         /// Load of parameters from received intent
 
         /// Load of parameters from received intent

-        mCurrentDir = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE); // no check necessary, mCurrenDir == null if the parameter is not in the intent

         Account account = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT);
         Account account = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT);

-        if (account != null)
-            AccountUtils.setCurrentOwnCloudAccount(this, account.name);
+        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) {
         
         /// 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, or SOME TIMES
+            // TODO - test if savedInstanceState should take precedence over file in the intent ALWAYS (now), NEVER. SOME TIMES

             mCurrentDir = savedInstanceState.getParcelable(FileDetailFragment.EXTRA_FILE);
             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();
         }
         
         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
-
+            
+        } else {    /// at least an account is available
+            
+            initDataFromCurrentAccount();   // it checks mCurrentDir and mCurrentFile with the current account
+            

         }
         
         mUploadConnection = new ListServiceConnection(); 
         }
         
         mUploadConnection = new ListServiceConnection(); 


@@ -190,7 +199,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
         // Drop-down navigation 
         mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);
         OCFile currFile = mCurrentDir;
         // Drop-down navigation 
         mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);
         OCFile currFile = mCurrentDir;

-        while (currFile != null && currFile.getFileName() != OCFile.PATH_SEPARATOR) {
+        while(mStorageManager != null && currFile != null && currFile.getFileName() != OCFile.PATH_SEPARATOR) {

             mDirectories.add(currFile.getFileName());
             currFile = mStorageManager.getFileById(currFile.getParentId());
         }
             mDirectories.add(currFile.getFileName());
             currFile = mStorageManager.getFileById(currFile.getParentId());
         }


@@ -200,7 +209,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
         setContentView(R.layout.files);    
         mFileList = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);
         mDualPane = (findViewById(R.id.file_details_container) != null);
         setContentView(R.layout.files);    
         mFileList = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);
         mDualPane = (findViewById(R.id.file_details_container) != null);

-        if (mDualPane) {
+        if (mDualPane && savedInstanceState == null) {

             initFileDetailsInDualPane();
         }
             
             initFileDetailsInDualPane();
         }
             


@@ -214,39 +223,23 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
         setSupportProgressBarIndeterminateVisibility(false);        // always AFTER setContentView(...) ; to workaround bug in its implementation
         
         
         setSupportProgressBarIndeterminateVisibility(false);        // always AFTER setContentView(...) ; to workaround bug in its implementation
         
         

-        // show changelog, if needed
-        showChangeLog();
+        mBackFromCreatingFirstAccount = false;

         
         

-        Log.d(getClass().toString(), "onCreate() end");
+        Log_OC.d(getClass().toString(), "onCreate() end");

     }
 
     
     }
 
     

-    /**
-     * Shows a dialog with the change log of the current version after each app update
-     * 
-     *  TODO make it permanent; by now, only to advice the workaround app for 4.1.x
-     */
-    private void showChangeLog() {
-        if (android.os.Build.VERSION.SDK_INT == android.os.Build.VERSION_CODES.JELLY_BEAN) {
-            final String KEY_VERSION = "version";
-            SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-            int currentVersionNumber = 0;
-            int savedVersionNumber = sharedPref.getInt(KEY_VERSION, 0);
-            try {
-                PackageInfo pi          = getPackageManager().getPackageInfo(getPackageName(), 0);
-                currentVersionNumber    = pi.versionCode;
-            } catch (Exception e) {}
-     
-            if (currentVersionNumber > savedVersionNumber) {
-                ChangelogDialog.newInstance(true).show(getSupportFragmentManager(), DIALOG_CHANGELOG_TAG);
-                Editor editor   = sharedPref.edit();
-                editor.putInt(KEY_VERSION, currentVersionNumber);
-                editor.commit();
-            }
+    @Override
+    public void onConfigurationChanged (Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        if (mStarted) {
+            checkConfigurationChange(newConfig);
+        } else {
+            mNewConfigurationChangeToApplyOnStart = newConfig;

         }
     }
     
         }
     }
     

-
+    

     /**
      * Launches the account creation activity. To use when no ownCloud account is available
      */
     /**
      * Launches the account creation activity. To use when no ownCloud account is available
      */


@@ -256,7 +249,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
         startActivity(intent);  // the new activity won't be created until this.onStart() and this.onResume() are finished;
     }
 
         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
      */
     /**
      *  Load of state dependent of the existence of an ownCloud account
      */


@@ -293,13 +286,22 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
         if (mDualPane && getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG) == null) {
             FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
             if (mCurrentFile != null) {
         if (mDualPane && getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG) == null) {
             FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
             if (mCurrentFile != null) {

-                transaction.replace(R.id.file_details_container,
-                        new FileDetailFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)),
-                        FileDetailFragment.FTAG); // empty FileDetailFragment
+                if (PreviewMediaFragment.canBePreviewed(mCurrentFile)) {
+                    if (mCurrentFile.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);
+                    } else {
+                        transaction.replace(R.id.file_details_container, new FileDetailFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);
+                        mWaitingToPreview = mCurrentFile;
+                    }
+                } else {
+                    transaction.replace(R.id.file_details_container, new FileDetailFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);
+                }

                 mCurrentFile = null;
                 mCurrentFile = null;

+                

             } else {
             } else {

-                transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null),
-                        FileDetailFragment.FTAG); // empty FileDetailFragment
+                transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG); // empty FileDetailFragment

             }
             transaction.commit();
         }
             }
             transaction.commit();
         }


@@ -307,6 +309,45 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
     
     
     @Override
     
     
     @Override

+    public void onStart() {
+        super.onStart();
+        if (mNewConfigurationChangeToApplyOnStart != null) {
+            checkConfigurationChange(mNewConfigurationChangeToApplyOnStart);
+            mNewConfigurationChangeToApplyOnStart = null;
+        }
+        mStarted = true;
+    }
+    
+    @Override
+    public void onStop() {
+        super.onStop();
+        mStarted = false;
+    }
+    
+    
+    private void checkConfigurationChange(Configuration newConfig) {
+        FileFragment fragment = (FileFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
+        if (fragment != null 
+                && fragment.getFile() != null 
+                && (newConfig.screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_LARGE
+                && newConfig.orientation != Configuration.ORIENTATION_LANDSCAPE) {
+            
+            onFileClick(fragment.getFile(), true);
+            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+            transaction.remove((Fragment)fragment);
+            transaction.commit();
+        
+        } else {
+            finish();
+            Intent intent = new Intent(this, FileDisplayActivity.class);
+            intent.putExtra(FileDetailFragment.EXTRA_FILE, mCurrentDir);
+            intent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));
+            startActivity(intent);
+        }
+    }
+
+
+    @Override

     public void onDestroy() {
         super.onDestroy();
         if (mDownloadConnection != null)
     public void onDestroy() {
         super.onDestroy();
         if (mDownloadConnection != null)


@@ -319,66 +360,41 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater inflater = getSherlock().getMenuInflater();
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater inflater = getSherlock().getMenuInflater();

-            inflater.inflate(R.menu.menu, menu);
-            
-            patchHiddenAccents(menu);
+            inflater.inflate(R.menu.main_menu, menu);

             
             return true;
     }
 
             
             return true;
     }
 

-    /**
-     * Workaround for this: <a href="http://code.google.com/p/android/issues/detail?id=3974">http://code.google.com/p/android/issues/detail?id=3974</a> 
-     * 
-     * @param menu      Menu to patch
-     */
-    private void patchHiddenAccents(Menu menu) {
-        for (int i = 0; i < mMenuIdentifiersToPatch.length ; i++) {
-            MenuItem aboutItem = menu.findItem(mMenuIdentifiersToPatch[i]);
-            if (aboutItem != null && aboutItem.getIcon() instanceof BitmapDrawable) {
-                // Clip off the bottom three (density independent) pixels of transparent padding
-                Bitmap original = ((BitmapDrawable) aboutItem.getIcon()).getBitmap();
-                float scale = getResources().getDisplayMetrics().density;
-                int clippedHeight = (int) (original.getHeight() - (3 * scale));
-                Bitmap scaled = Bitmap.createBitmap(original, 0, 0, original.getWidth(), clippedHeight);
-                aboutItem.setIcon(new BitmapDrawable(getResources(), scaled));
-            }
-        }
-    }
-
-

     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         boolean retval = true;
         switch (item.getItemId()) {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         boolean retval = true;
         switch (item.getItemId()) {

-        case R.id.createDirectoryItem: {
-            showDialog(DIALOG_CREATE_DIR);
-            break;
-        }
-        case R.id.startSync: {
-            startSynchronization();
-            break;
-        }
-        case R.id.action_upload: {
-            showDialog(DIALOG_CHOOSE_UPLOAD_SOURCE);
-            break;
-        }
-        case R.id.action_settings: {
-            Intent settingsIntent = new Intent(this, Preferences.class);
-            startActivity(settingsIntent);
-            break;
-        }
-        case R.id.about_app: {
-            showDialog(DIALOG_ABOUT_APP);
-            break;
-        }
-        case android.R.id.home: {
-            if (mCurrentDir != null && mCurrentDir.getParentId() != 0) {
-                onBackPressed();
+            case R.id.action_create_dir: {
+                EditNameDialog dialog = EditNameDialog.newInstance(getString(R.string.uploader_info_dirname), "", -1, -1, this);
+                dialog.show(getSupportFragmentManager(), "createdirdialog");
+                break;

             }
             }

-            break;
-        }
-        default:
-            retval = super.onOptionsItemSelected(item);
+            case R.id.action_sync_account: {
+                startSynchronization();
+                break;
+            }
+            case R.id.action_upload: {
+                showDialog(DIALOG_CHOOSE_UPLOAD_SOURCE);
+                break;
+            }
+            case R.id.action_settings: {
+                Intent settingsIntent = new Intent(this, Preferences.class);
+                startActivity(settingsIntent);
+                break;
+            }
+            case android.R.id.home: {
+                if(mCurrentDir != null && mCurrentDir.getParentId() != 0){
+                    onBackPressed(); 
+                }
+                break;
+            }
+            default:
+                retval = super.onOptionsItemSelected(item);

         }
         return retval;
     }
         }
         return retval;
     }


@@ -411,13 +427,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
      * Called, when the user selected something for uploading
      */
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
      * Called, when the user selected something for uploading
      */
     public void onActivityResult(int requestCode, int resultCode, Intent data) {

-
-        if (requestCode == ACTION_SELECT_CONTENT_FROM_APPS
-                && (resultCode == RESULT_OK || resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) {
+        super.onActivityResult(requestCode, resultCode, data);
+        
+        if (requestCode == ACTION_SELECT_CONTENT_FROM_APPS && (resultCode == RESULT_OK || resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) {

             requestSimpleUpload(data, resultCode);
             requestSimpleUpload(data, resultCode);

-
-        } else if (requestCode == ACTION_SELECT_MULTIPLE_FILES
-                && (resultCode == RESULT_OK || resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) {
+            
+        } else if (requestCode == ACTION_SELECT_MULTIPLE_FILES && (resultCode == RESULT_OK || resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) {

             requestMultipleUpload(data, resultCode);
             
         }
             requestMultipleUpload(data, resultCode);
             
         }


@@ -433,7 +448,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
             }
             if (!remotePathBase.endsWith(OCFile.PATH_SEPARATOR))
                 remotePathBase += OCFile.PATH_SEPARATOR;
             }
             if (!remotePathBase.endsWith(OCFile.PATH_SEPARATOR))
                 remotePathBase += OCFile.PATH_SEPARATOR;

-            for (int j = 0; j < remotePaths.length; j++) {
+            for (int j = 0; j< remotePaths.length; j++) {

                 remotePaths[j] = remotePathBase + (new File(filePaths[j])).getName();
             }
 
                 remotePaths[j] = remotePathBase + (new File(filePaths[j])).getName();
             }
 


@@ -447,7 +462,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
             startService(i);
             
         } else {
             startService(i);
             
         } else {

-            Log.d("FileDisplay", "User clicked on 'Update' with no selection");
+            Log_OC.d("FileDisplay", "User clicked on 'Update' with no selection");

             Toast t = Toast.makeText(this, getString(R.string.filedisplay_no_file_selected), Toast.LENGTH_LONG);
             t.show();
             return;
             Toast t = Toast.makeText(this, getString(R.string.filedisplay_no_file_selected), Toast.LENGTH_LONG);
             t.show();
             return;


@@ -469,12 +484,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
                 filepath = filemanagerstring;
             
         } catch (Exception e) {
                 filepath = filemanagerstring;
             
         } catch (Exception e) {

-            Log.e("FileDisplay", "Unexpected exception when trying to read the result of Intent.ACTION_GET_CONTENT", e);
+            Log_OC.e("FileDisplay", "Unexpected exception when trying to read the result of Intent.ACTION_GET_CONTENT", e);

             e.printStackTrace();
             
         } finally {
             if (filepath == null) {
             e.printStackTrace();
             
         } finally {
             if (filepath == null) {

-                Log.e("FileDisplay", "Couldnt resolve path to file");
+                Log_OC.e("FileDisplay", "Couldnt resolve path to file");

                 Toast t = Toast.makeText(this, getString(R.string.filedisplay_unexpected_bad_get_content), Toast.LENGTH_LONG);
                 t.show();
                 return;
                 Toast t = Toast.makeText(this, getString(R.string.filedisplay_unexpected_bad_get_content), Toast.LENGTH_LONG);
                 t.show();
                 return;


@@ -482,7 +497,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
         }
 
         Intent i = new Intent(this, FileUploader.class);
         }
 
         Intent i = new Intent(this, FileUploader.class);

-        i.putExtra(FileUploader.KEY_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));
+        i.putExtra(FileUploader.KEY_ACCOUNT,
+                AccountUtils.getCurrentOwnCloudAccount(this));

         String remotepath = new String();
         for (int j = mDirectories.getCount() - 2; j >= 0; --j) {
             remotepath += OCFile.PATH_SEPARATOR + mDirectories.getItem(j);
         String remotepath = new String();
         for (int j = mDirectories.getCount() - 2; j >= 0; --j) {
             remotepath += OCFile.PATH_SEPARATOR + mDirectories.getItem(j);


@@ -511,46 +527,44 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
         mCurrentDir = mFileList.getCurrentFile();
         
         if (mDualPane) {
         mCurrentDir = mFileList.getCurrentFile();
         
         if (mDualPane) {

-            // Resets the FileDetailsFragment on Tablets so that it always
-            // displays
-            FileDetailFragment fileDetails = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(
-                    FileDetailFragment.FTAG);
-            if (fileDetails != null && !fileDetails.isEmpty()) {
+            // Resets the FileDetailsFragment on Tablets so that it always displays
+            Fragment fileFragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
+            if (fileFragment != null && (fileFragment instanceof PreviewMediaFragment || !((FileDetailFragment) fileFragment).isEmpty())) {

                 FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
                 FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();

-                transaction.remove(fileDetails);
-                transaction.add(R.id.file_details_container, new FileDetailFragment(null, null),
-                        FileDetailFragment.FTAG);
+                transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG); // empty FileDetailFragment                

                 transaction.commit();
             }
         }
                 transaction.commit();
             }
         }

-
-        if (mCurrentDir.getParentId() == 0) {
-            ActionBar actionBar = getSupportActionBar();
+        
+        if(mCurrentDir.getParentId() == 0){
+            ActionBar actionBar = getSupportActionBar(); 

             actionBar.setDisplayHomeAsUpEnabled(false);
             actionBar.setDisplayHomeAsUpEnabled(false);

-        }
+        } 

     }
 
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         // responsibility of restore is preferred in onCreate() before than in onRestoreInstanceState when there are Fragments involved
     }
 
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         // responsibility of restore is preferred in onCreate() before than in onRestoreInstanceState when there are Fragments involved

-        Log.d(getClass().toString(), "onSaveInstanceState() start");
+        Log_OC.d(getClass().toString(), "onSaveInstanceState() start");

         super.onSaveInstanceState(outState);
         outState.putParcelable(FileDetailFragment.EXTRA_FILE, mCurrentDir);
         if (mDualPane) {
         super.onSaveInstanceState(outState);
         outState.putParcelable(FileDetailFragment.EXTRA_FILE, mCurrentDir);
         if (mDualPane) {

-            FileDetailFragment fragment = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
+            FileFragment fragment = (FileFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);

             if (fragment != null) {
             if (fragment != null) {

-                OCFile file = fragment.getDisplayedFile();
+                OCFile file = fragment.getFile();

                 if (file != null) {
                     outState.putParcelable(FileDetailFragment.EXTRA_FILE, file);
                 }
             }
         }
                 if (file != null) {
                     outState.putParcelable(FileDetailFragment.EXTRA_FILE, file);
                 }
             }
         }

-        Log.d(getClass().toString(), "onSaveInstanceState() end");
+        outState.putParcelable(FileDetailActivity.KEY_WAITING_TO_PREVIEW, mWaitingToPreview);
+        Log_OC.d(getClass().toString(), "onSaveInstanceState() end");

     }
 
     }
 

+    

     @Override
     protected void onResume() {
     @Override
     protected void onResume() {

-        Log.d(getClass().toString(), "onResume() start");
+        Log_OC.d(getClass().toString(), "onResume() start");

         super.onResume();
 
         if (AccountUtils.accountsAreSetup(this)) {
         super.onResume();
 
         if (AccountUtils.accountsAreSetup(this)) {


@@ -561,6 +575,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
                 if (mDualPane) {
                     initFileDetailsInDualPane();
                 }
                 if (mDualPane) {
                     initFileDetailsInDualPane();
                 }

+                mBackFromCreatingFirstAccount = true;

             }
             
             // Listen for sync messages
             }
             
             // Listen for sync messages


@@ -574,7 +589,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
             registerReceiver(mUploadFinishReceiver, uploadIntentFilter);
             
             // Listen for download messages
             registerReceiver(mUploadFinishReceiver, uploadIntentFilter);
             
             // Listen for download messages

-            IntentFilter downloadIntentFilter = new IntentFilter(FileDownloader.DOWNLOAD_FINISH_MESSAGE);
+            IntentFilter downloadIntentFilter = new IntentFilter(FileDownloader.DOWNLOAD_ADDED_MESSAGE);
+            downloadIntentFilter.addAction(FileDownloader.DOWNLOAD_FINISH_MESSAGE);

             mDownloadFinishReceiver = new DownloadFinishReceiver();
             registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);
         
             mDownloadFinishReceiver = new DownloadFinishReceiver();
             registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);
         


@@ -587,13 +603,13 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
             showDialog(DIALOG_SETUP_ACCOUNT);
             
         }
             showDialog(DIALOG_SETUP_ACCOUNT);
             
         }

-        Log.d(getClass().toString(), "onResume() end");
+        Log_OC.d(getClass().toString(), "onResume() end");

     }
 
     
     @Override
     protected void onPause() {
     }
 
     
     @Override
     protected void onPause() {

-        Log.d(getClass().toString(), "onPause() start");
+        Log_OC.d(getClass().toString(), "onPause() start");

         super.onPause();
         if (mSyncBroadcastReceiver != null) {
             unregisterReceiver(mSyncBroadcastReceiver);
         super.onPause();
         if (mSyncBroadcastReceiver != null) {
             unregisterReceiver(mSyncBroadcastReceiver);


@@ -611,7 +627,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
             dismissDialog(DIALOG_SETUP_ACCOUNT);
         }
         
             dismissDialog(DIALOG_SETUP_ACCOUNT);
         }
         

-        Log.d(getClass().toString(), "onPause() end");
+        Log_OC.d(getClass().toString(), "onPause() end");

     }
 
     
     }
 
     


@@ -650,22 +666,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
             dialog = builder.create();
             break;
         }
             dialog = builder.create();
             break;
         }

-        case DIALOG_ABOUT_APP: {
-            builder = new AlertDialog.Builder(this);
-            builder.setTitle(getString(R.string.about_title));
-            PackageInfo pkg;
-            try {
-                pkg = getPackageManager().getPackageInfo(getPackageName(), 0);
-                builder.setMessage(String.format(getString(R.string.about_message), getString(R.string.app_name), pkg.versionName));
-                builder.setIcon(android.R.drawable.ic_menu_info_details);
-                dialog = builder.create();
-            } catch (NameNotFoundException e) {
-                builder = null;
-                dialog = null;
-                Log.e(TAG, "Error while showing about dialog", e);
-            }
-            break;
-        }

         case DIALOG_CREATE_DIR: {
             builder = new Builder(this);
             final EditText dirNameInput = new EditText(getBaseContext());
         case DIALOG_CREATE_DIR: {
             builder = new Builder(this);
             final EditText dirNameInput = new EditText(getBaseContext());


@@ -673,57 +673,71 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
             builder.setTitle(R.string.uploader_info_dirname);
             int typed_color = getResources().getColor(R.color.setup_text_typed);
             dirNameInput.setTextColor(typed_color);
             builder.setTitle(R.string.uploader_info_dirname);
             int typed_color = getResources().getColor(R.color.setup_text_typed);
             dirNameInput.setTextColor(typed_color);

-            builder.setPositiveButton(android.R.string.ok, new OnClickListener() {
-                public void onClick(DialogInterface dialog, int which) {
-                    String directoryName = dirNameInput.getText().toString();
-                    if (directoryName.trim().length() == 0) {
-                        dialog.cancel();
-                        return;
-                    }
-
-                    // Figure out the path where the dir needs to be created
-                    String path;
-                    if (mCurrentDir == 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);
+            builder.setPositiveButton(android.R.string.ok,
+                    new OnClickListener() {
+                        public void onClick(DialogInterface dialog, int which) {
+                            String directoryName = dirNameInput.getText().toString();
+                            if (directoryName.trim().length() == 0) {
+                                dialog.cancel();
+                                return;
+                            }
+    
+                            // Figure out the path where the dir needs to be created
+                            String path;
+                            if (mCurrentDir == 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);
+                            }
+                            path = FileDisplayActivity.this.mCurrentDir.getRemotePath();
+                            
+                            // Create directory
+                            path += directoryName + OCFile.PATH_SEPARATOR;
+                            Thread thread = new Thread(new DirectoryCreator(path,  AccountUtils.getCurrentOwnCloudAccount(FileDisplayActivity.this), new Handler()));
+                            thread.start();
+                            
+                            dialog.dismiss();
+                            
+                            showDialog(DIALOG_SHORT_WAIT);

                         }
                         }

-                        mCurrentDir = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR);
-                    }
-                    path = FileDisplayActivity.this.mCurrentDir.getRemotePath();
-
-                    // Create directory
-                    path += directoryName + OCFile.PATH_SEPARATOR;
-                    Thread thread = new Thread(new DirectoryCreator(path, AccountUtils
-                            .getCurrentOwnCloudAccount(FileDisplayActivity.this), new Handler()));
-                    thread.start();
-
-                    dialog.dismiss();
-
-                    showDialog(DIALOG_SHORT_WAIT);
-                }
-            });
-            builder.setNegativeButton(R.string.common_cancel, new OnClickListener() {
-                public void onClick(DialogInterface dialog, int which) {
-                    dialog.cancel();
-                }
-            });
+                    });
+            builder.setNegativeButton(R.string.common_cancel,
+                    new OnClickListener() {
+                        public void onClick(DialogInterface dialog, int which) {
+                            dialog.cancel();
+                        }
+                    });

             dialog = builder.create();
             break;
         }
         case DIALOG_SHORT_WAIT: {
             ProgressDialog working_dialog = new ProgressDialog(this);
             dialog = builder.create();
             break;
         }
         case DIALOG_SHORT_WAIT: {
             ProgressDialog working_dialog = new ProgressDialog(this);

-            working_dialog.setMessage(getResources().getString(R.string.wait_a_moment));
+            working_dialog.setMessage(getResources().getString(
+                    R.string.wait_a_moment));

             working_dialog.setIndeterminate(true);
             working_dialog.setCancelable(false);
             dialog = working_dialog;
             break;
         }
         case DIALOG_CHOOSE_UPLOAD_SOURCE: {
             working_dialog.setIndeterminate(true);
             working_dialog.setCancelable(false);
             dialog = working_dialog;
             break;
         }
         case DIALOG_CHOOSE_UPLOAD_SOURCE: {

-            final String[] items = { getString(R.string.actionbar_upload_files),
-                    getString(R.string.actionbar_upload_from_apps), getString(R.string.actionbar_failed_instant_upload) };
+            
+            String[] items = null;
+            
+            String[] allTheItems = { getString(R.string.actionbar_upload_files),
+                                     getString(R.string.actionbar_upload_from_apps),
+                                     getString(R.string.actionbar_failed_instant_upload) };
+            
+            String[] commonItems = { getString(R.string.actionbar_upload_files),
+                                     getString(R.string.actionbar_upload_from_apps) };
+            
+            if (InstantUploadActivity.IS_ENABLED)
+                items = allTheItems;
+            else 
+                items = commonItems;
+            

             builder = new AlertDialog.Builder(this);
             builder.setTitle(R.string.actionbar_upload);
             builder.setItems(items, new DialogInterface.OnClickListener() {
             builder = new AlertDialog.Builder(this);
             builder.setTitle(R.string.actionbar_upload);
             builder.setItems(items, new DialogInterface.OnClickListener() {


@@ -743,7 +757,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
                         action = action.setType("*/*").addCategory(Intent.CATEGORY_OPENABLE);
                         startActivityForResult(Intent.createChooser(action, getString(R.string.upload_chooser_title)),
                                 ACTION_SELECT_CONTENT_FROM_APPS);
                         action = action.setType("*/*").addCategory(Intent.CATEGORY_OPENABLE);
                         startActivityForResult(Intent.createChooser(action, getString(R.string.upload_chooser_title)),
                                 ACTION_SELECT_CONTENT_FROM_APPS);

-                    } else if (item == 2) {
+                    } 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);
                         Account account = AccountUtils.getCurrentOwnCloudAccount(FileDisplayActivity.this);
                         Intent action = new Intent(FileDisplayActivity.this, InstantUploadActivity.class);
                         action.putExtra(FileUploader.KEY_ACCOUNT, account);


@@ -763,11 +777,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
             builder.setMessage(getResources().getString(R.string.ssl_validator_not_saved));
             builder.setCancelable(false);
             builder.setPositiveButton(R.string.common_ok, new DialogInterface.OnClickListener() {
             builder.setMessage(getResources().getString(R.string.ssl_validator_not_saved));
             builder.setCancelable(false);
             builder.setPositiveButton(R.string.common_ok, new DialogInterface.OnClickListener() {

-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    dialog.dismiss();
-                };
-            });
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        dialog.dismiss();
+                    };
+                });

             dialog = builder.create();
             break;
         }
             dialog = builder.create();
             break;
         }


@@ -789,10 +803,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
         String[] projection = { MediaStore.Images.Media.DATA };
         Cursor cursor = managedQuery(uri, projection, null, null, null);
         if (cursor != null) {
         String[] projection = { MediaStore.Images.Media.DATA };
         Cursor cursor = managedQuery(uri, projection, null, null, null);
         if (cursor != null) {

-            int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
+            int column_index = cursor
+                    .getColumnIndexOrThrow(MediaStore.Images.Media.DATA);

             cursor.moveToFirst();
             return cursor.getString(column_index);
             cursor.moveToFirst();
             return cursor.getString(column_index);

-        }
+        } 

         return null;
     }
     
         return null;
     }
     


@@ -856,12 +871,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
                     public void run() {
                         dismissDialog(DIALOG_SHORT_WAIT);
                         try {
                     public void run() {
                         dismissDialog(DIALOG_SHORT_WAIT);
                         try {

-                            Toast msg = Toast.makeText(FileDisplayActivity.this, R.string.create_dir_fail_msg,
-                                    Toast.LENGTH_LONG);
+                            Toast msg = Toast.makeText(FileDisplayActivity.this, R.string.create_dir_fail_msg, Toast.LENGTH_LONG); 

                             msg.show();
                         
                         } catch (NotFoundException e) {
                             msg.show();
                         
                         } catch (NotFoundException e) {

-                            Log.e(TAG, "Error while trying to show fail message ", e);
+                            Log_OC.e(TAG, "Error while trying to show fail message ", e);

                         }
                     }
                 });
                         }
                     }
                 });


@@ -879,16 +893,19 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
     
         public View getView(int position, View convertView, ViewGroup parent) {
             View v = super.getView(position, convertView, parent);
     
         public View getView(int position, View convertView, ViewGroup parent) {
             View v = super.getView(position, convertView, parent);

-
-            ((TextView) v).setTextColor(getResources().getColorStateList(android.R.color.white));
+    
+            ((TextView) v).setTextColor(getResources().getColorStateList(
+                    android.R.color.white));

             return v;
         }
             return v;
         }

-
-        public View getDropDownView(int position, View convertView, ViewGroup parent) {
+    
+        public View getDropDownView(int position, View convertView,
+                ViewGroup parent) {

             View v = super.getDropDownView(position, convertView, parent);
             View v = super.getDropDownView(position, convertView, parent);

-
-            ((TextView) v).setTextColor(getResources().getColorStateList(android.R.color.white));
-
+    
+            ((TextView) v).setTextColor(getResources().getColorStateList(
+                    android.R.color.white));
+    

             return v;
         }
     
             return v;
         }
     


@@ -904,21 +921,21 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
             boolean inProgress = intent.getBooleanExtra(FileSyncService.IN_PROGRESS, false);
             String accountName = intent.getStringExtra(FileSyncService.ACCOUNT_NAME);
 
             boolean inProgress = intent.getBooleanExtra(FileSyncService.IN_PROGRESS, false);
             String accountName = intent.getStringExtra(FileSyncService.ACCOUNT_NAME);
 

-            Log.d("FileDisplay", "sync of account " + accountName + " is in_progress: " + inProgress);
-
-            if (accountName.equals(AccountUtils.getCurrentOwnCloudAccount(context).name)) {
-
-                String synchFolderRemotePath = intent.getStringExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH);
+            Log_OC.d("FileDisplay", "sync of account " + accountName + " is in_progress: " + inProgress);

 
 

+            if (accountName.equals(AccountUtils.getCurrentOwnCloudAccount(context).name)) {  
+            
+                String synchFolderRemotePath = intent.getStringExtra(FileSyncService.SYNC_FOLDER_REMOTE_PATH); 
+                 

                 boolean fillBlankRoot = false;
                 if (mCurrentDir == null) {
                     mCurrentDir = mStorageManager.getFileByPath("/");
                     fillBlankRoot = (mCurrentDir != null);
                 }
 
                 boolean fillBlankRoot = false;
                 if (mCurrentDir == null) {
                     mCurrentDir = mStorageManager.getFileByPath("/");
                     fillBlankRoot = (mCurrentDir != null);
                 }
 

-                if ((synchFolderRemotePath != null && mCurrentDir != null && (mCurrentDir.getRemotePath()
-                        .equals(synchFolderRemotePath))) || fillBlankRoot) {
-                    if (!fillBlankRoot)
+                if ((synchFolderRemotePath != null && mCurrentDir != null && (mCurrentDir.getRemotePath().equals(synchFolderRemotePath)))
+                        || fillBlankRoot ) {
+                    if (!fillBlankRoot) 

                         mCurrentDir = getStorageManager().getFileByPath(synchFolderRemotePath);
                     OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager()
                             .findFragmentById(R.id.fileList);
                         mCurrentDir = getStorageManager().getFileByPath(synchFolderRemotePath);
                     OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager()
                             .findFragmentById(R.id.fileList);


@@ -928,16 +945,22 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
                 }
                 
                 setSupportProgressBarIndeterminateVisibility(inProgress);
                 }
                 
                 setSupportProgressBarIndeterminateVisibility(inProgress);

+                if (mBackFromCreatingFirstAccount) {
+                    // awful patch to fix problem with visibility of progress circle with the first refresh of the first account
+                    // TODO - kill this Activity when the first account has to be created instead of stack the account creation on it
+                    getSupportActionBar().hide();
+                    getSupportActionBar().show();
+                    mBackFromCreatingFirstAccount = false;
+                }

                 removeStickyBroadcast(intent);
                 
             }
                 removeStickyBroadcast(intent);
                 
             }

-
-            RemoteOperationResult synchResult = (RemoteOperationResult) intent
-                    .getSerializableExtra(FileSyncService.SYNC_RESULT);
+            
+            RemoteOperationResult synchResult = (RemoteOperationResult)intent.getSerializableExtra(FileSyncService.SYNC_RESULT);

             if (synchResult != null) {
                 if (synchResult.getCode().equals(RemoteOperationResult.ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED)) {
                     mLastSslUntrustedServerResult = synchResult;
             if (synchResult != null) {
                 if (synchResult.getCode().equals(RemoteOperationResult.ResultCode.SSL_RECOVERABLE_PEER_UNVERIFIED)) {
                     mLastSslUntrustedServerResult = synchResult;

-                    showDialog(DIALOG_SSL_VALIDATOR);
+                    showDialog(DIALOG_SSL_VALIDATOR); 

                 }
             }
         }
                 }
             }
         }


@@ -955,12 +978,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
             String uploadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH);
             String accountName = intent.getStringExtra(FileUploader.ACCOUNT_NAME);
             boolean sameAccount = accountName.equals(AccountUtils.getCurrentOwnCloudAccount(context).name);
             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 isDescendant = (mCurrentDir != null) && (uploadedRemotePath != null) && (uploadedRemotePath.startsWith(mCurrentDir.getRemotePath()));

             if (sameAccount && isDescendant) {
             if (sameAccount && isDescendant) {

-                OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager()
-                        .findFragmentById(R.id.fileList);
-                if (fileListFragment != null) {
+                OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);
+                if (fileListFragment != null) { 

                     fileListFragment.listDirectory();
                 }
             }
                     fileListFragment.listDirectory();
                 }
             }


@@ -970,29 +991,78 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
     
     
     /**
     
     
     /**

-     * Once the file download has finished -> update view
+     * Class waiting for broadcast events from the {@link FielDownloader} service.
+     * 
+     * Updates the UI when a download is started or finished, provided that it is relevant for the
+     * current folder.

      */
     private class DownloadFinishReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {
      */
     private class DownloadFinishReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {

+            boolean sameAccount = isSameAccount(context, intent);

             String downloadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH);
             String downloadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH);

-            String accountName = intent.getStringExtra(FileDownloader.ACCOUNT_NAME);
-            boolean sameAccount = accountName.equals(AccountUtils.getCurrentOwnCloudAccount(context).name);
-            boolean isDescendant = (mCurrentDir != null) && (downloadedRemotePath != null)
-                    && (downloadedRemotePath.startsWith(mCurrentDir.getRemotePath()));
+            boolean isDescendant = isDescendant(downloadedRemotePath);
+            

             if (sameAccount && isDescendant) {
             if (sameAccount && isDescendant) {

-                OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager()
-                        .findFragmentById(R.id.fileList);
-                if (fileListFragment != null) {
-                    fileListFragment.listDirectory();
+                updateLeftPanel();
+                if (mDualPane) {
+                    updateRightPanel(intent.getAction(), downloadedRemotePath, intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false));

                 }
             }
                 }
             }

+            
+            removeStickyBroadcast(intent);
+        }
+
+        private boolean isDescendant(String downloadedRemotePath) {
+            return (mCurrentDir != null && downloadedRemotePath != null && downloadedRemotePath.startsWith(mCurrentDir.getRemotePath()));
+        }
+
+        private boolean isSameAccount(Context context, Intent intent) {
+            String accountName = intent.getStringExtra(FileDownloader.ACCOUNT_NAME);
+            return (accountName != null && accountName.equals(AccountUtils.getCurrentOwnCloudAccount(context).name));

         }
     }
     
     
         }
     }
     
     

-    
-    
+    protected void updateLeftPanel() {
+        OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);
+        if (fileListFragment != null) { 
+            fileListFragment.listDirectory();
+        }
+    }
+
+    protected void updateRightPanel(String downloadEvent, String downloadedRemotePath, boolean success) {
+        Fragment fragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
+        boolean waitedPreview = (mWaitingToPreview != null && mWaitingToPreview.getRemotePath().equals(downloadedRemotePath));
+        if (fragment != null && fragment instanceof FileDetailFragment) {
+            FileDetailFragment detailsFragment = (FileDetailFragment) fragment;
+            OCFile fileInFragment = detailsFragment.getFile();
+            if (fileInFragment != null && !downloadedRemotePath.equals(fileInFragment.getRemotePath())) {
+                // the user browsed to other file ; forget the automatic preview 
+                mWaitingToPreview = null;
+                
+            } else if (downloadEvent.equals(FileDownloader.DOWNLOAD_ADDED_MESSAGE)) {
+                // grant that the right panel updates the progress bar
+                detailsFragment.listenForTransferProgress();
+                detailsFragment.updateFileDetails(true, false);
+                
+            } else if (downloadEvent.equals(FileDownloader.DOWNLOAD_FINISH_MESSAGE)) {
+                //  update the right panel 
+                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.commit();
+                    mWaitingToPreview = null;
+                    
+                } else {
+                    detailsFragment.updateFileDetails(false, (success));
+                }
+            }
+        }
+    }
+
+

     /**
      * {@inheritDoc}
      */
     /**
      * {@inheritDoc}
      */


@@ -1001,7 +1071,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
         return mStorageManager;
     }
     
         return mStorageManager;
     }
     

-    
+

     /**
      * {@inheritDoc}
      */
     /**
      * {@inheritDoc}
      */


@@ -1013,12 +1083,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
         
         if (mDualPane) {
             // Resets the FileDetailsFragment on Tablets so that it always displays
         
         if (mDualPane) {
             // Resets the FileDetailsFragment on Tablets so that it always displays

-            FileDetailFragment fileDetails = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
-            if (fileDetails != null && !fileDetails.isEmpty()) {
+            Fragment fileFragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
+            if (fileFragment != null && (fileFragment instanceof PreviewMediaFragment || !((FileDetailFragment) fileFragment).isEmpty())) {

                 FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
                 FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();

-                transaction.remove(fileDetails);
-                transaction.add(R.id.file_details_container, new FileDetailFragment(null, null),
-                        FileDetailFragment.FTAG);
+                transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG); // empty FileDetailFragment                

                 transaction.commit();
             }
         }
                 transaction.commit();
             }
         }


@@ -1029,28 +1097,93 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
      * {@inheritDoc}
      */
     @Override
      * {@inheritDoc}
      */
     @Override

-    public void onFileClick(OCFile file) {
-        
-        // If we are on a large device -> update fragment
-        if (mDualPane) {
-            // buttons in the details view are problematic when trying to reuse an existing fragment; create always a new one solves some of them, BUT no all; downloads are 'dangerous'
+    public void onFileClick(OCFile file, boolean onOrientationChange) {
+        if (file != null && PreviewImageFragment.canBePreviewed(file)) {
+            // preview image - it handles the download, if needed
+            startPreviewImage(file);
+            
+        } else if (file != null && PreviewMediaFragment.canBePreviewed(file)) {
+            if (file.isDown()) {
+                // general preview
+                if (!onOrientationChange) {
+                    startMediaPreview(file, 0, true, onOrientationChange);
+                } else {
+                    int startPlaybackPosition = 0;
+                    boolean autoplay = true;
+                    Fragment fragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
+                    if (fragment != null && file.isVideo()) {
+                        PreviewMediaFragment videoFragment = (PreviewMediaFragment)fragment;
+                        startPlaybackPosition = videoFragment.getPosition();
+                        autoplay = videoFragment.isPlaying();
+                    }
+                    startMediaPreview(file, startPlaybackPosition, autoplay, onOrientationChange);
+                }
+                
+            } else {
+                // automatic download, preview on finish
+                startDownloadForPreview(file, onOrientationChange);
+                
+            }
+        } else {
+            // details view
+            startDetails(file, onOrientationChange);
+        }
+    }
+
+    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));
+        startActivity(showDetailsIntent);
+    }
+    
+    private void startMediaPreview(OCFile file, int startPlaybackPosition, boolean autoplay, boolean onOrientationChange) {
+        if (mDualPane && !onOrientationChange) {

             FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
             FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();

-            transaction
-                    .replace(R.id.file_details_container,
-                            new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)),
-                            FileDetailFragment.FTAG);
-            transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
+            transaction.replace(R.id.file_details_container, new PreviewMediaFragment(file, AccountUtils.getCurrentOwnCloudAccount(this), startPlaybackPosition, autoplay), FileDetailFragment.FTAG);

             transaction.commit();
             transaction.commit();

-
-        } else { // small or medium screen device -> new Activity
+            
+        } else {

             Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);
             showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);
             showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));
             Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);
             showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);
             showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));

+            showDetailsIntent.putExtra(PreviewVideoActivity.EXTRA_START_POSITION, startPlaybackPosition);
+            showDetailsIntent.putExtra(PreviewVideoActivity.EXTRA_AUTOPLAY, autoplay);

             startActivity(showDetailsIntent);
         }
     }
     
             startActivity(showDetailsIntent);
         }
     }
     

+    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.commit();
+            mWaitingToPreview = file;
+            requestForDownload();
+            
+        } else {
+            Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));
+            startActivity(showDetailsIntent);
+        }
+    }
+

     
     

+    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.commit();
+        } else {
+            Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));
+            startActivity(showDetailsIntent);
+        }
+    }
+
+

     /**
      * {@inheritDoc}
      */
     /**
      * {@inheritDoc}
      */


@@ -1065,9 +1198,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
      */
     @Override
     public void onFileStateChanged() {
      */
     @Override
     public void onFileStateChanged() {

-        OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager().findFragmentById(
-                R.id.fileList);
-        if (fileListFragment != null) {
+        OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);
+        if (fileListFragment != null) { 

             fileListFragment.listDirectory();
         }
     }
             fileListFragment.listDirectory();
         }
     }


@@ -1097,10 +1229,14 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
         @Override
         public void onServiceConnected(ComponentName component, IBinder service) {
             if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) {
         @Override
         public void onServiceConnected(ComponentName component, IBinder service) {
             if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) {

-                Log.d(TAG, "Download service connected");
+                Log_OC.d(TAG, "Download service connected");

                 mDownloaderBinder = (FileDownloaderBinder) service;
                 mDownloaderBinder = (FileDownloaderBinder) service;

+                if (mWaitingToPreview != null) {
+                    requestForDownload();
+                }
+                

             } else if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) {
             } else if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) {

-                Log.d(TAG, "Upload service connected");
+                Log_OC.d(TAG, "Upload service connected");

                 mUploaderBinder = (FileUploaderBinder) service;
             } else {
                 return;
                 mUploaderBinder = (FileUploaderBinder) service;
             } else {
                 return;


@@ -1109,20 +1245,22 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
             if (mFileList != null)
                 mFileList.listDirectory();
             if (mDualPane) {
             if (mFileList != null)
                 mFileList.listDirectory();
             if (mDualPane) {

-                FileDetailFragment fragment = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(
-                        FileDetailFragment.FTAG);
-                if (fragment != null)
-                    fragment.updateFileDetails(false);
+                Fragment fragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
+                if (fragment != null && fragment instanceof FileDetailFragment) {
+                    FileDetailFragment detailFragment = (FileDetailFragment)fragment;
+                    detailFragment.listenForTransferProgress();
+                    detailFragment.updateFileDetails(false, false);
+                }

             }
         }
 
         @Override
         public void onServiceDisconnected(ComponentName component) {
             if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) {
             }
         }
 
         @Override
         public void onServiceDisconnected(ComponentName component) {
             if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) {

-                Log.d(TAG, "Download service disconnected");
+                Log_OC.d(TAG, "Download service disconnected");

                 mDownloaderBinder = null;
             } else if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) {
                 mDownloaderBinder = null;
             } else if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) {

-                Log.d(TAG, "Upload service disconnected");
+                Log_OC.d(TAG, "Upload service disconnected");

                 mUploaderBinder = null;
             }
         }
                 mUploaderBinder = null;
             }
         }


@@ -1150,6 +1288,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
         startSynchronization();                
     }
 
         startSynchronization();                
     }
 

+

     @Override
     public void onFailedSavingCertificate() {
         showDialog(DIALOG_CERT_NOT_SAVED);
     @Override
     public void onFailedSavingCertificate() {
         showDialog(DIALOG_CERT_NOT_SAVED);


@@ -1166,13 +1305,13 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
     @Override
     public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) {
         if (operation instanceof RemoveFileOperation) {
     @Override
     public void onRemoteOperationFinish(RemoteOperation operation, RemoteOperationResult result) {
         if (operation instanceof RemoveFileOperation) {

-            onRemoveFileOperationFinish((RemoveFileOperation) operation, result);
-
+            onRemoveFileOperationFinish((RemoveFileOperation)operation, result);
+                

         } else if (operation instanceof RenameFileOperation) {
         } else if (operation instanceof RenameFileOperation) {

-            onRenameFileOperationFinish((RenameFileOperation) operation, result);
-
+            onRenameFileOperationFinish((RenameFileOperation)operation, result);
+            

         } else if (operation instanceof SynchronizeFileOperation) {
         } else if (operation instanceof SynchronizeFileOperation) {

-            onSynchronizeFileOperationFinish((SynchronizeFileOperation) operation, result);
+            onSynchronizeFileOperationFinish((SynchronizeFileOperation)operation, result);

         }
     }
 
         }
     }
 


@@ -1191,12 +1330,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
             msg.show();
             OCFile removedFile = operation.getFile();
             if (mDualPane) {
             msg.show();
             OCFile removedFile = operation.getFile();
             if (mDualPane) {

-                FileDetailFragment details = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(
-                        FileDetailFragment.FTAG);
-                if (details != null && removedFile.equals(details.getDisplayedFile())) {
+                FileFragment details = (FileFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
+                if (details != null && removedFile.equals(details.getFile())) {

                     FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
                     FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();

-                    transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null)); // empty
-                                                                                                          // FileDetailFragment
+                    transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null)); // empty FileDetailFragment

                     transaction.commit();
                 }
             }
                     transaction.commit();
                 }
             }


@@ -1205,11 +1342,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
             }
                 
         } else {
             }
                 
         } else {

-            Toast msg = Toast.makeText(this, R.string.remove_fail_msg, Toast.LENGTH_LONG);
+            Toast msg = Toast.makeText(this, R.string.remove_fail_msg, Toast.LENGTH_LONG); 

             msg.show();
             if (result.isSslRecoverableException()) {
                 mLastSslUntrustedServerResult = result;
             msg.show();
             if (result.isSslRecoverableException()) {
                 mLastSslUntrustedServerResult = result;

-                showDialog(DIALOG_SSL_VALIDATOR);
+                showDialog(DIALOG_SSL_VALIDATOR); 

             }
         }
     }
             }
         }
     }


@@ -1226,10 +1363,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
         OCFile renamedFile = operation.getFile();
         if (result.isSuccess()) {
             if (mDualPane) {
         OCFile renamedFile = operation.getFile();
         if (result.isSuccess()) {
             if (mDualPane) {

-                FileDetailFragment details = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(
-                        FileDetailFragment.FTAG);
-                if (details != null && renamedFile.equals(details.getDisplayedFile())) {
-                    details.updateFileDetails(renamedFile, AccountUtils.getCurrentOwnCloudAccount(this));
+                FileFragment details = (FileFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
+                if (details != null && details instanceof FileDetailFragment && renamedFile.equals(details.getFile()) ) {
+                    ((FileDetailFragment) details).updateFileDetails(renamedFile, AccountUtils.getCurrentOwnCloudAccount(this));

                 }
             }
             if (mStorageManager.getFileById(renamedFile.getParentId()).equals(mCurrentDir)) {
                 }
             }
             if (mStorageManager.getFileById(renamedFile.getParentId()).equals(mCurrentDir)) {


@@ -1238,20 +1374,21 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
             
         } else {
             if (result.getCode().equals(ResultCode.INVALID_LOCAL_FILE_NAME)) {
             
         } else {
             if (result.getCode().equals(ResultCode.INVALID_LOCAL_FILE_NAME)) {

-                Toast msg = Toast.makeText(this, R.string.rename_local_fail_msg, Toast.LENGTH_LONG);
+                Toast msg = Toast.makeText(this, R.string.rename_local_fail_msg, Toast.LENGTH_LONG); 

                 msg.show();
                 // TODO throw again the new rename dialog
             } else {
                 msg.show();
                 // TODO throw again the new rename dialog
             } else {

-                Toast msg = Toast.makeText(this, R.string.rename_server_fail_msg, Toast.LENGTH_LONG);
+                Toast msg = Toast.makeText(this, R.string.rename_server_fail_msg, Toast.LENGTH_LONG); 

                 msg.show();
                 if (result.isSslRecoverableException()) {
                     mLastSslUntrustedServerResult = result;
                 msg.show();
                 if (result.isSslRecoverableException()) {
                     mLastSslUntrustedServerResult = result;

-                    showDialog(DIALOG_SSL_VALIDATOR);
+                    showDialog(DIALOG_SSL_VALIDATOR); 

                 }
             }
         }
     }
 
                 }
             }
         }
     }
 

+

     private void onSynchronizeFileOperationFinish(SynchronizeFileOperation operation, RemoteOperationResult result) {
         dismissDialog(DIALOG_SHORT_WAIT);
         OCFile syncedFile = operation.getLocalFile();
     private void onSynchronizeFileOperationFinish(SynchronizeFileOperation operation, RemoteOperationResult result) {
         dismissDialog(DIALOG_SHORT_WAIT);
         OCFile syncedFile = operation.getLocalFile();


@@ -1263,7 +1400,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
                 startActivity(i);
                 
             } else {
                 startActivity(i);
                 
             } else {

-                Toast msg = Toast.makeText(this, R.string.sync_file_fail_msg, Toast.LENGTH_LONG);
+                Toast msg = Toast.makeText(this, R.string.sync_file_fail_msg, Toast.LENGTH_LONG); 

                 msg.show();
             }
             
                 msg.show();
             }
             


@@ -1273,7 +1410,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
                 onTransferStateChanged(syncedFile, true, true);
                 
             } else {
                 onTransferStateChanged(syncedFile, true, true);
                 
             } else {

-                Toast msg = Toast.makeText(this, R.string.sync_file_nothing_to_do_msg, Toast.LENGTH_LONG);
+                Toast msg = Toast.makeText(this, R.string.sync_file_nothing_to_do_msg, Toast.LENGTH_LONG); 

                 msg.show();
             }
         }
                 msg.show();
             }
         }


@@ -1290,20 +1427,70 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements OCF
             fileListFragment.listDirectory();
         }*/
         if (mDualPane) {
             fileListFragment.listDirectory();
         }*/
         if (mDualPane) {

-            FileDetailFragment details = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(
-                    FileDetailFragment.FTAG);
-            if (details != null && file.equals(details.getDisplayedFile())) {
+            FileFragment details = (FileFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
+            if (details != null && details instanceof FileDetailFragment && file.equals(details.getFile()) ) {

                 if (downloading || uploading) {
                 if (downloading || uploading) {

-                    details.updateFileDetails(file, AccountUtils.getCurrentOwnCloudAccount(this));
+                    ((FileDetailFragment)details).updateFileDetails(file, AccountUtils.getCurrentOwnCloudAccount(this));

                 } else {
                 } else {

-                    details.updateFileDetails(downloading || uploading);
+                    ((FileDetailFragment)details).updateFileDetails(false, true);

                 }
             }
         }
     }
 
 
                 }
             }
         }
     }
 
 

-    
+    @Override
+    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.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(FileDetailActivity.EXTRA_MODE, FileDetailActivity.MODE_DETAILS);
+            startActivity(showDetailsIntent);
+        }
+    }

 
 

+    public void onDismiss(EditNameDialog dialog) {
+        //dialog.dismiss();
+        if (dialog.getResult()) {
+            String newDirectoryName = dialog.getNewFilename().trim();
+            Log.d(TAG, "'create directory' dialog dismissed with new name " + newDirectoryName);
+            if (newDirectoryName.length() > 0) {
+                String path;
+                if (mCurrentDir == 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);
+                }
+                path = FileDisplayActivity.this.mCurrentDir.getRemotePath();
+                
+                // Create directory
+                path += newDirectoryName + OCFile.PATH_SEPARATOR;
+                Thread thread = new Thread(new DirectoryCreator(path,  AccountUtils.getCurrentOwnCloudAccount(FileDisplayActivity.this), new Handler()));
+                thread.start();
+                
+                showDialog(DIALOG_SHORT_WAIT);
+            }
+        }
+    }

 
 

+    private void requestForDownload() {
+        Account account = AccountUtils.getCurrentOwnCloudAccount(this);
+        if (!mDownloaderBinder.isDownloading(account, mWaitingToPreview)) {
+            Intent i = new Intent(this, FileDownloader.class);
+            i.putExtra(FileDownloader.EXTRA_ACCOUNT, account);
+            i.putExtra(FileDownloader.EXTRA_FILE, mWaitingToPreview);
+            startService(i);
+        }
+    }
+
+    

 }
 }