X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/429024cc5791f9564dbc132fca5d5bb6f8a9627d..5966b38de7e70ebdd4072d1fca3b6279bc479f8b:/src/com/owncloud/android/ui/activity/FileDetailActivity.java

diff --git a/src/com/owncloud/android/ui/activity/FileDetailActivity.java b/src/com/owncloud/android/ui/activity/FileDetailActivity.java
index 545e579d..61d769aa 100644
--- a/src/com/owncloud/android/ui/activity/FileDetailActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDetailActivity.java
@@ -127,19 +127,23 @@ public class FileDetailActivity extends FileActivity implements FileFragment.Con
         Fragment newFragment = null;
         OCFile file = getFile();
         Account account = getAccount();
-        if (PreviewMediaFragment.canBePreviewed(file) && mode == MODE_PREVIEW) {
-            if (file.isDown()) {
+        if (mode == MODE_DETAILS) { 
+            newFragment = new FileDetailFragment(file, account);
+            
+        } else if (file.isDown()) {
+            if (PreviewMediaFragment.canBePreviewed(file)) {
                 int startPlaybackPosition = getIntent().getIntExtra(PreviewVideoActivity.EXTRA_START_POSITION, 0);
                 boolean autoplay = getIntent().getBooleanExtra(PreviewVideoActivity.EXTRA_AUTOPLAY, true);
                 newFragment = new PreviewMediaFragment(file, account, startPlaybackPosition, autoplay);
             
             } else {
                 newFragment = new FileDetailFragment(file, account);
-                mWaitingToPreview = true;
+                // TODO open with
             }
             
         } else {
             newFragment = new FileDetailFragment(file, account);
+            mWaitingToPreview = true;   // download will requested 
         }
         FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
         ft.replace(R.id.fragment, newFragment, FileDetailFragment.FTAG);
@@ -200,6 +204,9 @@ public class FileDetailActivity extends FileActivity implements FileFragment.Con
                 intent.putExtra(PreviewVideoActivity.EXTRA_START_POSITION, videoFragment.getPosition());
                 intent.putExtra(PreviewVideoActivity.EXTRA_AUTOPLAY, videoFragment.isPlaying());
             }
+            if (mWaitingToPreview) {
+                intent.putExtra(FileDisplayActivity.EXTRA_WAITING_TO_PREVIEW, mWaitingToPreview);
+            }
         
         } else {
             intent = new Intent(this, FileDetailActivity.class);
@@ -450,15 +457,19 @@ public class FileDetailActivity extends FileActivity implements FileFragment.Con
                 //  refresh the details fragment 
                 if (success && mWaitingToPreview) {
                     setFile(mStorageManager.getFileById(getFile().getFileId()));   // update the file from database, for the local storage path
-                    FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-                    transaction.replace(R.id.fragment, new PreviewMediaFragment(getFile(), getAccount(), 0, true), FileDetailFragment.FTAG);
-                    transaction.commit();
+                    if (PreviewMediaFragment.canBePreviewed(getFile())) {
+                        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+                        transaction.replace(R.id.fragment, new PreviewMediaFragment(getFile(), getAccount(), 0, true), FileDetailFragment.FTAG);
+                        transaction.commit();
+                    } else {
+                        detailsFragment.updateFileDetails(false, (success));
+                        openFile(getFile());
+                    }
                     mWaitingToPreview = false;
-                    
+
                 } else {
                     detailsFragment.updateFileDetails(false, (success));
-                    // TODO error message if !success ¿?
-                }
+               }
             }
         } // TODO else if (fragment != null && fragment )