X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/7101a04247be24d9eb3c1aa49b88ec2496c7d2d6..bcc7bd2744fd3c6f6f9fb33ed46479a55914fdb9:/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 5bf6bd2b..97f719f4 100644
--- a/src/com/owncloud/android/ui/activity/FileDetailActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDetailActivity.java
@@ -17,6 +17,8 @@
  */
 package com.owncloud.android.ui.activity;
 
+import java.lang.ref.WeakReference;
+
 import android.accounts.Account;
 import android.app.Dialog;
 import android.app.ProgressDialog;
@@ -30,6 +32,7 @@ import android.os.IBinder;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.util.Log;
+import android.widget.ProgressBar;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
@@ -44,12 +47,14 @@ import com.owncloud.android.ui.fragment.FilePreviewFragment;
 
 import com.owncloud.android.R;
 
+import eu.alefzero.webdav.OnDatatransferProgressListener;
+
 /**
  * This activity displays the details of a file like its name, its size and so
  * on.
  * 
  * @author Bartek Przybylski
- * 
+ * @author David A. Velasco
  */
 public class FileDetailActivity extends SherlockFragmentActivity implements FileDetailFragment.ContainerActivity {
     
@@ -57,10 +62,17 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File
 
     public static final String TAG = FileDetailActivity.class.getSimpleName();
     
+    public static final String EXTRA_MODE = "MODE";
+    public static final int MODE_DETAILS = 0;
+    public static final int MODE_PREVIEW = 1;
+
+    private static final String KEY_WAITING_TO_PREVIEW = "WAITING_TO_PREVIEW";
+    
     private boolean mConfigurationChangedToLandscape = false;
     private FileDownloaderBinder mDownloaderBinder = null;
     private ServiceConnection mDownloadConnection, mUploadConnection = null;
     private FileUploaderBinder mUploaderBinder = null;
+    private boolean mWaitingToPreview;
     
 
     @Override
@@ -85,7 +97,10 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File
             actionBar.setDisplayHomeAsUpEnabled(true);
 
             if (savedInstanceState == null) {
+                mWaitingToPreview = false;
                 createChildFragment();
+            } else {
+                mWaitingToPreview = savedInstanceState.getBoolean(KEY_WAITING_TO_PREVIEW);
             }
             
         }  else {
@@ -94,14 +109,25 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File
         
         
     }
-    
-    
+
+    /**
+     * Creates the proper fragment depending upon the state of the handled {@link OCFile} and
+     * the requested {@link Intent}.
+     */
     private void createChildFragment() {
         OCFile file = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE);
         Account account = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT);
+        int mode = getIntent().getIntExtra(EXTRA_MODE, MODE_PREVIEW); 
+        
         Fragment newFragment = null;
-        if (FilePreviewFragment.canBePreviewed(file)) {
-            newFragment = new FilePreviewFragment(file, account);
+        if (FilePreviewFragment.canBePreviewed(file) && mode == MODE_PREVIEW) {
+            if (file.isDown()) {
+                newFragment = new FilePreviewFragment(file, account);
+            
+            } else {
+                newFragment = new FileDetailFragment(file, account);
+                mWaitingToPreview = true;
+            }
             
         } else {
             newFragment = new FileDetailFragment(file, account);
@@ -112,12 +138,19 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File
     }
     
 
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putBoolean(KEY_WAITING_TO_PREVIEW, mWaitingToPreview);
+    }
+
 
     /** Defines callbacks for service binding, passed to bindService() */
     private class DetailsServiceConnection implements ServiceConnection {
 
         @Override
         public void onServiceConnected(ComponentName component, IBinder service) {
+                
             if (component.equals(new ComponentName(FileDetailActivity.this, FileDownloader.class))) {
                 Log.d(TAG, "Download service connected");
                 mDownloaderBinder = (FileDownloaderBinder) service;
@@ -127,9 +160,12 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File
             } else {
                 return;
             }
+            
             Fragment fragment = getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);
-            if (fragment != null && fragment instanceof FileDetailFragment) {
-                ((FileDetailFragment) fragment).updateFileDetails(false);   // let the fragment gets the mDownloadBinder through getDownloadBinder() (see FileDetailFragment#updateFileDetais())
+            FileDetailFragment detailsFragment = (fragment instanceof FileDetailFragment) ? (FileDetailFragment) fragment : null;
+            if (detailsFragment != null) {
+                detailsFragment.listenForTransferProgress();
+                detailsFragment.updateFileDetails(false);   // let the fragment gets the mDownloadBinder through getDownloadBinder() (see FileDetailFragment#updateFileDetais())
             }
         }
 
@@ -145,7 +181,7 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File
         }
     };    
     
-
+    
     @Override
     public void onDestroy() {
         super.onDestroy();
@@ -243,5 +279,13 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File
     public FileUploaderBinder getFileUploaderBinder() {
         return mUploaderBinder;
     }
+
+
+    @Override
+    public void showFragmentWithDetails(OCFile file) {
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+        transaction.replace(R.id.fragment, new FileDetailFragment(file, (Account) getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT)), FileDetailFragment.FTAG); 
+        transaction.commit();
+    }
     
 }