Fixed bug: show the selected image in the gallery, instead of always the first in...

[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 1a2ad46..bff3869 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -21,6 +21,7 @@ package com.owncloud.android.ui.activity;
 import java.io.File;\r
 \r
 import android.accounts.Account;\r
 import java.io.File;\r
 \r
 import android.accounts.Account;\r

+import android.app.Activity;\r

 import android.app.AlertDialog;\r
 import android.app.ProgressDialog;\r
 import android.app.AlertDialog.Builder;\r
 import android.app.AlertDialog;\r
 import android.app.ProgressDialog;\r
 import android.app.AlertDialog.Builder;\r


@@ -35,6 +36,7 @@ import android.content.Intent;
 import android.content.IntentFilter;\r
 import android.content.ServiceConnection;\r
 import android.content.SharedPreferences;\r
 import android.content.IntentFilter;\r
 import android.content.ServiceConnection;\r
 import android.content.SharedPreferences;\r

+import android.content.SharedPreferences.Editor;\r

 import android.content.pm.PackageInfo;\r
 import android.content.pm.PackageManager.NameNotFoundException;\r
 import android.content.res.Resources.NotFoundException;\r
 import android.content.pm.PackageInfo;\r
 import android.content.pm.PackageManager.NameNotFoundException;\r
 import android.content.res.Resources.NotFoundException;\r


@@ -47,6 +49,7 @@ import android.os.Handler;
 import android.os.IBinder;\r
 import android.preference.PreferenceManager;\r
 import android.provider.MediaStore;\r
 import android.os.IBinder;\r
 import android.preference.PreferenceManager;\r
 import android.provider.MediaStore;\r

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

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


@@ -82,10 +85,14 @@ import com.owncloud.android.operations.RenameFileOperation;
 import com.owncloud.android.operations.SynchronizeFileOperation;\r
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;\r
 import com.owncloud.android.syncadapter.FileSyncService;\r
 import com.owncloud.android.operations.SynchronizeFileOperation;\r
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;\r
 import com.owncloud.android.syncadapter.FileSyncService;\r

+import com.owncloud.android.ui.dialog.ChangelogDialog;\r

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

+import com.owncloud.android.ui.fragment.FileFragment;\r
+import com.owncloud.android.ui.fragment.FilePreviewFragment;\r

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

+import com.owncloud.android.ui.preview.PreviewImageActivity;\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


@@ -124,6 +131,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     private static final int DIALOG_CHOOSE_UPLOAD_SOURCE = 4;\r
     private static final int DIALOG_SSL_VALIDATOR = 5;\r
     private static final int DIALOG_CERT_NOT_SAVED = 6;\r
     private static final int DIALOG_CHOOSE_UPLOAD_SOURCE = 4;\r
     private static final int DIALOG_SSL_VALIDATOR = 5;\r
     private static final int DIALOG_CERT_NOT_SAVED = 6;\r

+    private static final String DIALOG_CHANGELOG_TAG = "DIALOG_CHANGELOG";\r

 \r
     \r
     private static final int ACTION_SELECT_CONTENT_FROM_APPS = 1;\r
 \r
     \r
     private static final int ACTION_SELECT_CONTENT_FROM_APPS = 1;\r


@@ -131,7 +139,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     \r
     private static final String TAG = "FileDisplayActivity";\r
 \r
     \r
     private static final String TAG = "FileDisplayActivity";\r
 \r

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

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


@@ -148,6 +160,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         if(savedInstanceState != null) {\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
         if(savedInstanceState != null) {\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

+            mWaitingToPreview = (OCFile) savedInstanceState.getParcelable(FileDetailActivity.KEY_WAITING_TO_PREVIEW);\r
+\r
+        } else {\r
+            mWaitingToPreview = null;\r

         }\r
         \r
         if (!AccountUtils.accountsAreSetup(this)) {\r
         }\r
         \r
         if (!AccountUtils.accountsAreSetup(this)) {\r


@@ -206,11 +222,41 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         actionBar.setListNavigationCallbacks(mDirectories, this);\r
         setSupportProgressBarIndeterminateVisibility(false);        // always AFTER setContentView(...) ; to workaround bug in its implementation\r
         \r
         actionBar.setListNavigationCallbacks(mDirectories, this);\r
         setSupportProgressBarIndeterminateVisibility(false);        // always AFTER setContentView(...) ; to workaround bug in its implementation\r
         \r

+        \r
+        // show changelog, if needed\r
+        showChangeLog();\r
+        \r

         Log.d(getClass().toString(), "onCreate() end");\r
     }\r
 \r
     \r
     /**\r
         Log.d(getClass().toString(), "onCreate() end");\r
     }\r
 \r
     \r
     /**\r

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

      * Launches the account creation activity. To use when no ownCloud account is available\r
      */\r
     private void createFirstAccount() {\r
      * Launches the account creation activity. To use when no ownCloud account is available\r
      */\r
     private void createFirstAccount() {\r


@@ -256,8 +302,18 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         if (mDualPane && getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG) == null) {\r
             FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
             if (mCurrentFile != null) {\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
+                if (FilePreviewFragment.canBePreviewed(mCurrentFile)) {\r
+                    if (mCurrentFile.isDown()) {\r
+                        transaction.replace(R.id.file_details_container, new FilePreviewFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
+                    } else {\r
+                        transaction.replace(R.id.file_details_container, new FileDetailFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
+                        mWaitingToPreview = mCurrentFile;\r
+                    }\r
+                } else {\r
+                    transaction.replace(R.id.file_details_container, new FileDetailFragment(mCurrentFile, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
+                }\r

                 mCurrentFile = null;\r
                 mCurrentFile = null;\r

+                \r

             } else {\r
                 transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG); // empty FileDetailFragment\r
             }\r
             } else {\r
                 transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG); // empty FileDetailFragment\r
             }\r


@@ -279,7 +335,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     @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

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

             \r
             patchHiddenAccents(menu);\r
             \r
             \r
             patchHiddenAccents(menu);\r
             \r


@@ -310,11 +366,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     public boolean onOptionsItemSelected(MenuItem item) {\r
         boolean retval = true;\r
         switch (item.getItemId()) {\r
     public boolean onOptionsItemSelected(MenuItem item) {\r
         boolean retval = true;\r
         switch (item.getItemId()) {\r

-            case R.id.createDirectoryItem: {\r
+            case R.id.action_create_dir: {\r

                 showDialog(DIALOG_CREATE_DIR);\r
                 break;\r
             }\r
                 showDialog(DIALOG_CREATE_DIR);\r
                 break;\r
             }\r

-            case R.id.startSync: {\r
+            case R.id.action_sync_account: {\r

                 startSynchronization();\r
                 break;\r
             }\r
                 startSynchronization();\r
                 break;\r
             }\r


@@ -327,7 +383,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 startActivity(settingsIntent);\r
                 break;\r
             }\r
                 startActivity(settingsIntent);\r
                 break;\r
             }\r

-            case R.id.about_app : {\r
+            case R.id.action_about_app: {\r

                 showDialog(DIALOG_ABOUT_APP);\r
                 break;\r
             }\r
                 showDialog(DIALOG_ABOUT_APP);\r
                 break;\r
             }\r


@@ -372,16 +428,16 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
      */\r
     public void onActivityResult(int requestCode, int resultCode, Intent data) {\r
         \r
      */\r
     public void onActivityResult(int requestCode, int resultCode, Intent data) {\r
         \r

-        if (requestCode == ACTION_SELECT_CONTENT_FROM_APPS && resultCode == RESULT_OK) {\r
-            requestSimpleUpload(data);\r
+        if (requestCode == ACTION_SELECT_CONTENT_FROM_APPS && (resultCode == RESULT_OK || resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) {\r
+            requestSimpleUpload(data, resultCode);\r

             \r
             \r

-        } else if (requestCode == ACTION_SELECT_MULTIPLE_FILES && resultCode == RESULT_OK) {\r
-            requestMultipleUpload(data);\r
+        } else if (requestCode == ACTION_SELECT_MULTIPLE_FILES && (resultCode == RESULT_OK || resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)) {\r
+            requestMultipleUpload(data, resultCode);\r

             \r
         }\r
     }\r
 \r
             \r
         }\r
     }\r
 \r

-    private void requestMultipleUpload(Intent data) {\r
+    private void requestMultipleUpload(Intent data, int resultCode) {\r

         String[] filePaths = data.getStringArrayExtra(UploadFilesActivity.EXTRA_CHOSEN_FILES);\r
         if (filePaths != null) {\r
             String[] remotePaths = new String[filePaths.length];\r
         String[] filePaths = data.getStringArrayExtra(UploadFilesActivity.EXTRA_CHOSEN_FILES);\r
         if (filePaths != null) {\r
             String[] remotePaths = new String[filePaths.length];\r


@@ -400,6 +456,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             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
             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

+            if (resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)\r
+                i.putExtra(FileUploader.KEY_LOCAL_BEHAVIOUR, FileUploader.LOCAL_BEHAVIOUR_MOVE);\r

             startService(i);\r
             \r
         } else {\r
             startService(i);\r
             \r
         } else {\r


@@ -411,7 +469,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     }\r
 \r
 \r
     }\r
 \r
 \r

-    private void requestSimpleUpload(Intent data) {\r
+    private void requestSimpleUpload(Intent data, int resultCode) {\r

         String filepath = null;\r
         try {\r
             Uri selectedImageUri = data.getData();\r
         String filepath = null;\r
         try {\r
             Uri selectedImageUri = data.getData();\r


@@ -451,6 +509,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         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
         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

+        if (resultCode == UploadFilesActivity.RESULT_OK_AND_MOVE)\r
+            i.putExtra(FileUploader.KEY_LOCAL_BEHAVIOUR, FileUploader.LOCAL_BEHAVIOUR_MOVE);\r

         startService(i);\r
     }\r
 \r
         startService(i);\r
     }\r
 \r


@@ -467,11 +527,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         \r
         if (mDualPane) {\r
             // Resets the FileDetailsFragment on Tablets so that it always displays\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
+            Fragment fileFragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
+            if (fileFragment != null && (fileFragment instanceof FilePreviewFragment || !((FileDetailFragment) fileFragment).isEmpty())) {\r

                 FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\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.replace(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG); // empty FileDetailFragment                \r

                 transaction.commit();\r
             }\r
         }\r
                 transaction.commit();\r
             }\r
         }\r


@@ -489,14 +548,15 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         super.onSaveInstanceState(outState);\r
         outState.putParcelable(FileDetailFragment.EXTRA_FILE, mCurrentDir);\r
         if (mDualPane) {\r
         super.onSaveInstanceState(outState);\r
         outState.putParcelable(FileDetailFragment.EXTRA_FILE, mCurrentDir);\r
         if (mDualPane) {\r

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

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

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

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

+        outState.putParcelable(FileDetailActivity.KEY_WAITING_TO_PREVIEW, mWaitingToPreview);\r

         Log.d(getClass().toString(), "onSaveInstanceState() end");\r
     }\r
 \r
         Log.d(getClass().toString(), "onSaveInstanceState() end");\r
     }\r
 \r


@@ -526,7 +586,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             registerReceiver(mUploadFinishReceiver, uploadIntentFilter);\r
             \r
             // Listen for download messages\r
             registerReceiver(mUploadFinishReceiver, uploadIntentFilter);\r
             \r
             // Listen for download messages\r

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

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


@@ -684,6 +745,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                     if (item == 0) {\r
                         //if (!mDualPane) { \r
                             Intent action = new Intent(FileDisplayActivity.this, UploadFilesActivity.class);\r
                     if (item == 0) {\r
                         //if (!mDualPane) { \r
                             Intent action = new Intent(FileDisplayActivity.this, UploadFilesActivity.class);\r

+                            action.putExtra(UploadFilesActivity.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(FileDisplayActivity.this));\r

                             startActivityForResult(action, ACTION_SELECT_MULTIPLE_FILES);\r
                         //} else {\r
                             // TODO create and handle new fragment LocalFileListFragment\r
                             startActivityForResult(action, ACTION_SELECT_MULTIPLE_FILES);\r
                         //} else {\r
                             // TODO create and handle new fragment LocalFileListFragment\r


@@ -881,6 +943,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 }\r
                 \r
                 setSupportProgressBarIndeterminateVisibility(inProgress);\r
                 }\r
                 \r
                 setSupportProgressBarIndeterminateVisibility(inProgress);\r

+                removeStickyBroadcast(intent);\r

                 \r
             }\r
             \r
                 \r
             }\r
             \r


@@ -926,12 +989,27 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         public void onReceive(Context context, Intent intent) {\r
             String downloadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH);\r
             String accountName = intent.getStringExtra(FileDownloader.ACCOUNT_NAME);\r
         public void onReceive(Context context, Intent intent) {\r
             String downloadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH);\r
             String accountName = intent.getStringExtra(FileDownloader.ACCOUNT_NAME);\r

-            boolean sameAccount = accountName.equals(AccountUtils.getCurrentOwnCloudAccount(context).name);\r
-            boolean isDescendant = (mCurrentDir != null) && (downloadedRemotePath != null) && (downloadedRemotePath.startsWith(mCurrentDir.getRemotePath()));\r
-            if (sameAccount && isDescendant) {\r
-                OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
-                if (fileListFragment != null) { \r
-                    fileListFragment.listDirectory();\r
+            if (accountName != null && AccountUtils.getCurrentOwnCloudAccount(context) != null) {\r
+                boolean sameAccount = accountName.equals(AccountUtils.getCurrentOwnCloudAccount(context).name);\r
+                boolean isDescendant = (mCurrentDir != null) && (downloadedRemotePath != null) && (downloadedRemotePath.startsWith(mCurrentDir.getRemotePath()));\r
+                if (sameAccount && isDescendant) {\r
+                    OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
+                    if (fileListFragment != null) { \r
+                        fileListFragment.listDirectory();\r
+                        if (    mWaitingToPreview != null && \r
+                                mWaitingToPreview.getRemotePath().equals(downloadedRemotePath) && \r
+                                intent.getAction().equals(FileDownloader.DOWNLOAD_ADDED_MESSAGE)    ) {\r
+                            \r
+                            Fragment fragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
+                            if (fragment != null && fragment instanceof FileDetailFragment ) {\r
+                                FileDetailFragment detailFragment = (FileDetailFragment) fragment;\r
+                                if (detailFragment.getFile().getRemotePath().equals(downloadedRemotePath)) {\r
+                                    detailFragment.listenForTransferProgress();\r
+                                    detailFragment.updateFileDetails(true);\r
+                                }\r
+                            }\r
+                        }\r
+                    }\r

                 }\r
             }\r
         }\r
                 }\r
             }\r
         }\r


@@ -960,11 +1038,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         \r
         if (mDualPane) {\r
             // Resets the FileDetailsFragment on Tablets so that it always displays\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
+            Fragment fileFragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
+            if (fileFragment != null && (fileFragment instanceof FilePreviewFragment || !((FileDetailFragment) fileFragment).isEmpty())) {\r

                 FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\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.replace(R.id.file_details_container, new FileDetailFragment(null, null), FileDetailFragment.FTAG); // empty FileDetailFragment                \r

                 transaction.commit();\r
             }\r
         }\r
                 transaction.commit();\r
             }\r
         }\r


@@ -976,24 +1053,76 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
      */\r
     @Override\r
     public void onFileClick(OCFile file) {\r
      */\r
     @Override\r
     public void onFileClick(OCFile file) {\r

-        \r
-        // If we are on a large device -> update fragment\r
+\r
+        if (file != null && FilePreviewFragment.canBePreviewed(file)) {\r
+            if (file.isDown()) {\r
+                // preview it\r
+                startPreview(file);\r
+                \r
+            } else {\r
+                // automatic download, preview on finish\r
+                startDownloadForPreview(file);\r
+                \r
+            }\r
+        } else {\r
+            // details view\r
+            startDetails(file);\r
+        }\r
+    }\r
+    \r
+    private void startPreview(OCFile file) {\r
+        if (mDualPane && \r
+                !file.isImage() // this is a trick to get a quick-to-implement 'full screen' preview for images in landscape\r
+                ) {\r
+            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
+            transaction.replace(R.id.file_details_container, new FilePreviewFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
+            transaction.commit();\r
+            \r
+        } else if (file.isImage()) {\r
+            Intent showDetailsIntent = new Intent(this, PreviewImageActivity.class);\r
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);\r
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r
+            startActivity(showDetailsIntent);\r
+            \r
+        } else {\r
+            Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);\r
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);\r
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r
+            startActivity(showDetailsIntent);\r
+        }\r
+    }\r
+    \r
+    private void startDownloadForPreview(OCFile file) {\r

         if (mDualPane) {\r
         if (mDualPane) {\r

-            // 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'\r

             FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
             transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
             FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
             transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r

-            transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);\r

             transaction.commit();\r
             transaction.commit();\r

+            mWaitingToPreview = file;\r
+            requestForDownload();\r

             \r
             \r

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

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

+\r

     \r
     \r

-    \r
+    private void startDetails(OCFile file) {\r
+        if (mDualPane && !file.isImage()) {\r
+            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
+            transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
+            transaction.commit();\r
+        } else {\r
+            Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);\r
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);\r
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r
+            startActivity(showDetailsIntent);\r
+        }\r
+    }\r
+\r
+\r

     /**\r
      * {@inheritDoc}\r
      */\r
     /**\r
      * {@inheritDoc}\r
      */\r


@@ -1041,6 +1170,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) {\r
                 Log.d(TAG, "Download service connected");\r
                 mDownloaderBinder = (FileDownloaderBinder) service;\r
             if (component.equals(new ComponentName(FileDisplayActivity.this, FileDownloader.class))) {\r
                 Log.d(TAG, "Download service connected");\r
                 mDownloaderBinder = (FileDownloaderBinder) service;\r

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

             } else if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) {\r
                 Log.d(TAG, "Upload service connected");\r
                 mUploaderBinder = (FileUploaderBinder) service;\r
             } else if (component.equals(new ComponentName(FileDisplayActivity.this, FileUploader.class))) {\r
                 Log.d(TAG, "Upload service connected");\r
                 mUploaderBinder = (FileUploaderBinder) service;\r


@@ -1051,9 +1184,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             if (mFileList != null)\r
                 mFileList.listDirectory();\r
             if (mDualPane) {\r
             if (mFileList != null)\r
                 mFileList.listDirectory();\r
             if (mDualPane) {\r

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

             }\r
         }\r
 \r
             }\r
         }\r
 \r


@@ -1133,8 +1269,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             msg.show();\r
             OCFile removedFile = operation.getFile();\r
             if (mDualPane) {\r
             msg.show();\r
             OCFile removedFile = operation.getFile();\r
             if (mDualPane) {\r

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

                     FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
                     transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null)); // empty FileDetailFragment\r
                     transaction.commit();\r
                     FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
                     transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null)); // empty FileDetailFragment\r
                     transaction.commit();\r


@@ -1166,9 +1302,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         OCFile renamedFile = operation.getFile();\r
         if (result.isSuccess()) {\r
             if (mDualPane) {\r
         OCFile renamedFile = operation.getFile();\r
         if (result.isSuccess()) {\r
             if (mDualPane) {\r

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

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


@@ -1230,19 +1366,58 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             fileListFragment.listDirectory();\r
         }*/\r
         if (mDualPane) {\r
             fileListFragment.listDirectory();\r
         }*/\r
         if (mDualPane) {\r

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

                 if (downloading || uploading) {\r
                 if (downloading || uploading) {\r

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

                 } else {\r
                 } else {\r

-                    details.updateFileDetails(downloading || uploading);\r
+                    ((FileDetailFragment)details).updateFileDetails(downloading || uploading);\r

                 }\r
             }\r
         }\r
     }\r
 \r
 \r
                 }\r
             }\r
         }\r
     }\r
 \r
 \r

-    \r
+    @Override\r
+    public void showFragmentWithDetails(OCFile file) {\r
+        if (mDualPane) {\r
+            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
+            transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG); \r
+            transaction.commit();\r
+            \r
+        } else {\r
+            Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);\r
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);\r
+            showDetailsIntent.putExtra(FileDetailFragment.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r
+            showDetailsIntent.putExtra(FileDetailActivity.EXTRA_MODE, FileDetailActivity.MODE_DETAILS);\r
+            startActivity(showDetailsIntent);\r
+        }\r
+    }\r
+\r

 \r
 \r

+    @Override\r
+    public void notifySuccessfulDownload(OCFile file, Intent intent, boolean success) {\r
+        if (success) {\r
+            if (mWaitingToPreview != null) {\r
+                FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
+                transaction.replace(R.id.file_details_container, new FilePreviewFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
+                transaction.commit();\r
+                mWaitingToPreview = null;\r
+            }\r
+        }\r
+        mDownloadFinishReceiver.onReceive(this, intent);\r
+    }\r

 \r
 \r

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

 }\r
 }\r