Merge branch 'zmatsuo-detailThumbnail' into develop

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / fragment / FileDetailFragment.java

diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index 68ee677..f87ee0a 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -21,10 +21,9 @@
  */
 package com.owncloud.android.ui.fragment;
 
  */
 package com.owncloud.android.ui.fragment;
 

-import java.lang.ref.WeakReference;
-

 import android.accounts.Account;
 import android.accounts.Account;

-import android.content.Intent;
+
+import android.graphics.Bitmap;

 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.Menu;


@@ -41,17 +40,20 @@ import android.widget.TextView;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;

+import com.owncloud.android.datamodel.ThumbnailsCacheManager;

 import com.owncloud.android.files.FileMenuFilter;
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.files.FileMenuFilter;
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
 import com.owncloud.android.lib.common.utils.Log_OC;

-import com.owncloud.android.services.observer.FileObserverService;

 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.dialog.RemoveFileDialogFragment;
 import com.owncloud.android.ui.dialog.RenameFileDialogFragment;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.ui.activity.FileActivity;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.dialog.RemoveFileDialogFragment;
 import com.owncloud.android.ui.dialog.RenameFileDialogFragment;
 import com.owncloud.android.utils.DisplayUtils;

+import com.owncloud.android.utils.MimetypeIconUtil;
+
+import java.lang.ref.WeakReference;

 
 
 /**
 
 
 /**


@@ -62,9 +64,9 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
     private int mLayout;
     private View mView;
     private Account mAccount;
     private int mLayout;
     private View mView;
     private Account mAccount;

-    
+

     public ProgressListener mProgressListener;
     public ProgressListener mProgressListener;

-    
+

     private static final String TAG = FileDetailFragment.class.getSimpleName();
     public static final String FTAG_CONFIRMATION = "REMOVE_CONFIRMATION_FRAGMENT";
     public static final String FTAG_RENAME_FILE = "RENAME_FILE_FRAGMENT";
     private static final String TAG = FileDetailFragment.class.getSimpleName();
     public static final String FTAG_CONFIRMATION = "REMOVE_CONFIRMATION_FRAGMENT";
     public static final String FTAG_RENAME_FILE = "RENAME_FILE_FRAGMENT";


@@ -103,14 +105,14 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
         mLayout = R.layout.file_details_empty;
         mProgressListener = null;
     }
         mLayout = R.layout.file_details_empty;
         mProgressListener = null;
     }

-    
+

 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
     }
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
     }

-    
+

 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,


@@ -120,14 +122,14 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
         mAccount = getArguments().getParcelable(ARG_ACCOUNT);
 
         if (savedInstanceState != null) {
         mAccount = getArguments().getParcelable(ARG_ACCOUNT);
 
         if (savedInstanceState != null) {

-            setFile((OCFile)savedInstanceState.getParcelable(FileActivity.EXTRA_FILE));
+            setFile((OCFile) savedInstanceState.getParcelable(FileActivity.EXTRA_FILE));

             mAccount = savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT);
         }
             mAccount = savedInstanceState.getParcelable(FileActivity.EXTRA_ACCOUNT);
         }

-        
-        if(getFile() != null && mAccount != null) {
+
+        if (getFile() != null && mAccount != null) {

             mLayout = R.layout.file_details_fragment;
         }
             mLayout = R.layout.file_details_fragment;
         }

-        
+

         mView = inflater.inflate(mLayout, null);
         
         if (mLayout == R.layout.file_details_fragment) {
         mView = inflater.inflate(mLayout, null);
         
         if (mLayout == R.layout.file_details_fragment) {


@@ -154,20 +156,20 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
         super.onStart();
         listenForTransferProgress();
     }
         super.onStart();
         listenForTransferProgress();
     }

-    
+

     @Override
     public void onStop() {
         leaveTransferProgress();
         super.onStop();
     }
 
     @Override
     public void onStop() {
         leaveTransferProgress();
         super.onStop();
     }
 

-    
+

     @Override
     public View getView() {
         return super.getView() == null ? mView : super.getView();
     }
 
     @Override
     public View getView() {
         return super.getView() == null ? mView : super.getView();
     }
 

-    
+

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


@@ -175,16 +177,16 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
         inflater.inflate(R.menu.file_actions_menu, menu);
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
         inflater.inflate(R.menu.file_actions_menu, menu);

-   }
+    }
+

 
 

-    

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

-    public void onPrepareOptionsMenu (Menu menu) {
+    public void onPrepareOptionsMenu(Menu menu) {

         super.onPrepareOptionsMenu(menu);
         super.onPrepareOptionsMenu(menu);

-        
+

         if (mContainerActivity.getStorageManager() != null) {
             FileMenuFilter mf = new FileMenuFilter(
                 getFile(),
         if (mContainerActivity.getStorageManager() != null) {
             FileMenuFilter mf = new FileMenuFilter(
                 getFile(),


@@ -194,7 +196,7 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
             );
             mf.filter(menu);
         }
             );
             mf.filter(menu);
         }

-        
+

         // additional restriction for this fragment 
         MenuItem item = menu.findItem(R.id.action_see_details);
         if (item != null) {
         // additional restriction for this fragment 
         MenuItem item = menu.findItem(R.id.action_see_details);
         if (item != null) {


@@ -208,9 +210,16 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
             item.setVisible(false);
             item.setEnabled(false);
         }
             item.setVisible(false);
             item.setEnabled(false);
         }

+
+        // additional restriction for this fragment
+        item = menu.findItem(R.id.action_copy);
+        if (item != null) {
+            item.setVisible(false);
+            item.setEnabled(false);
+        }

     }
 
     }
 

-    
+

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


@@ -241,10 +250,10 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
             }
             case R.id.action_cancel_download:
             case R.id.action_cancel_upload: {
             }
             case R.id.action_cancel_download:
             case R.id.action_cancel_upload: {

-                ((FileDisplayActivity)mContainerActivity).cancelTransference(getFile());
+                ((FileDisplayActivity) mContainerActivity).cancelTransference(getFile());

                 return true;
             }
                 return true;
             }

-            case R.id.action_download_file: 
+            case R.id.action_download_file:

             case R.id.action_sync_file: {
                 mContainerActivity.getFileOperationsHelper().syncFile(getFile());
                 return true;
             case R.id.action_sync_file: {
                 mContainerActivity.getFileOperationsHelper().syncFile(getFile());
                 return true;


@@ -253,9 +262,10 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
                 // Obtain the file
                 if (!getFile().isDown()) {  // Download the file                    
                     Log_OC.d(TAG, getFile().getRemotePath() + " : File must be downloaded");
                 // Obtain the file
                 if (!getFile().isDown()) {  // Download the file                    
                     Log_OC.d(TAG, getFile().getRemotePath() + " : File must be downloaded");

-                    ((FileDisplayActivity)mContainerActivity).startDownloadForSending(getFile());
-                    
-                } else {
+                    ((FileDisplayActivity) mContainerActivity).startDownloadForSending(getFile());
+
+                }
+                else {

                     mContainerActivity.getFileOperationsHelper().sendDownloadedFile(getFile());
                 }
                 return true;
                     mContainerActivity.getFileOperationsHelper().sendDownloadedFile(getFile());
                 }
                 return true;


@@ -282,7 +292,7 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
                 break;
             }
             case R.id.fdCancelBtn: {
                 break;
             }
             case R.id.fdCancelBtn: {

-                ((FileDisplayActivity)mContainerActivity).cancelTransference(getFile());
+                ((FileDisplayActivity) mContainerActivity).cancelTransference(getFile());

                 break;
             }
             default:
                 break;
             }
             default:


@@ -293,17 +303,17 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
 
     /**
      * Check if the fragment was created with an empty layout. An empty fragment can't show file details, must be replaced.
 
     /**
      * Check if the fragment was created with an empty layout. An empty fragment can't show file details, must be replaced.

-     * 
-     * @return  True when the fragment was created with the empty layout.
+     *
+     * @return True when the fragment was created with the empty layout.

      */
     public boolean isEmpty() {
         return (mLayout == R.layout.file_details_empty || getFile() == null || mAccount == null);
     }
 
      */
     public boolean isEmpty() {
         return (mLayout == R.layout.file_details_empty || getFile() == null || mAccount == null);
     }
 

-    
+

     /**
      * Use this method to signal this Activity that it shall update its view.
     /**
      * Use this method to signal this Activity that it shall update its view.

-     * 
+     *

      * @param file : An {@link OCFile}
      */
     public void updateFileDetails(OCFile file, Account ocAccount) {
      * @param file : An {@link OCFile}
      */
     public void updateFileDetails(OCFile file, Account ocAccount) {


@@ -314,14 +324,13 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
 
     /**
      * Updates the view with all relevant details about that file.
 
     /**
      * Updates the view with all relevant details about that file.

+     * <p/>
+     * TODO Remove parameter when the transferring state of files is kept in database.

      *
      *

-     * TODO Remove parameter when the transferring state of files is kept in database. 
-     * 
-     * @param transferring      Flag signaling if the file should be considered as downloading or uploading, 
-     *                          although {@link FileDownloaderBinder#isDownloading(Account, OCFile)}  and 
-     *                          {@link FileUploaderBinder#isUploading(Account, OCFile)} return false.
-     *                          
-     * @param refresh           If 'true', try to refresh the whole file from the database
+     * @param transferring Flag signaling if the file should be considered as downloading or uploading,
+     *                     although {@link FileDownloaderBinder#isDownloading(Account, OCFile)}  and
+     *                     {@link FileUploaderBinder#isUploading(Account, OCFile)} return false.
+     * @param refresh      If 'true', try to refresh the whole file from the database

      */
     public void updateFileDetails(boolean transferring, boolean refresh) {
         if (readyToShow()) {
      */
     public void updateFileDetails(boolean transferring, boolean refresh) {
         if (readyToShow()) {


@@ -330,10 +339,10 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
                 setFile(storageManager.getFileByPath(getFile().getRemotePath()));
             }
             OCFile file = getFile();
                 setFile(storageManager.getFileByPath(getFile().getRemotePath()));
             }
             OCFile file = getFile();

-            
+

             // set file details
             setFilename(file.getFileName());
             // set file details
             setFilename(file.getFileName());

-            setFiletype(file.getMimetype(), file.getFileName());
+            setFiletype(file);

             setFilesize(file.getFileLength());
 
             setTimeModified(file.getModificationTimestamp());
             setFilesize(file.getFileLength());
 
             setTimeModified(file.getModificationTimestamp());


@@ -349,7 +358,7 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
                     (uploaderBinder != null && uploaderBinder.isUploading(mAccount, file))
                     ) {
                 setButtonsForTransferring();
                     (uploaderBinder != null && uploaderBinder.isUploading(mAccount, file))
                     ) {
                 setButtonsForTransferring();

-                
+

             } else if (file.isDown()) {
                 
                 setButtonsForDown();
             } else if (file.isDown()) {
                 
                 setButtonsForDown();


@@ -362,65 +371,83 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
         }
         getView().invalidate();
     }
         }
         getView().invalidate();
     }

-    
+

     /**
      * Checks if the fragment is ready to show details of a OCFile
     /**
      * Checks if the fragment is ready to show details of a OCFile

-     *  
-     * @return  'True' when the fragment is ready to show details of a file
+     *
+     * @return 'True' when the fragment is ready to show details of a file

      */
     private boolean readyToShow() {
      */
     private boolean readyToShow() {

-        return (getFile() != null && mAccount != null && mLayout == R.layout.file_details_fragment);        
+        return (getFile() != null && mAccount != null && mLayout == R.layout.file_details_fragment);

     }
 
 
     /**
      * Updates the filename in view
     }
 
 
     /**
      * Updates the filename in view

+     *

      * @param filename to set
      */
     private void setFilename(String filename) {
         TextView tv = (TextView) getView().findViewById(R.id.fdFilename);
      * @param filename to set
      */
     private void setFilename(String filename) {
         TextView tv = (TextView) getView().findViewById(R.id.fdFilename);

-        if (tv != null)
+        if (tv != null) {

             tv.setText(filename);
             tv.setText(filename);

+        }

     }
 
     /**
      * Updates the MIME type in view
     }
 
     /**
      * Updates the MIME type in view

-     * @param mimetype      MIME type to set
-     * @param filename      Name of the file, to deduce the icon to use in case the MIME type is not precise enough
+     * @param file : An {@link OCFile}

      */
      */

-    private void setFiletype(String mimetype, String filename) {
+    private void setFiletype(OCFile file) {
+        String mimetype = file.getMimetype();

         TextView tv = (TextView) getView().findViewById(R.id.fdType);
         if (tv != null) {
         TextView tv = (TextView) getView().findViewById(R.id.fdType);
         if (tv != null) {

+                       // mimetype      MIME type to set

             String printableMimetype = DisplayUtils.convertMIMEtoPrettyPrint(mimetype);
             tv.setText(printableMimetype);
         }
         ImageView iv = (ImageView) getView().findViewById(R.id.fdIcon);
         if (iv != null) {
             String printableMimetype = DisplayUtils.convertMIMEtoPrettyPrint(mimetype);
             tv.setText(printableMimetype);
         }
         ImageView iv = (ImageView) getView().findViewById(R.id.fdIcon);
         if (iv != null) {

-            iv.setImageResource(DisplayUtils.getFileTypeIconId(mimetype, filename));
+                       Bitmap thumbnail = null;
+            if (file.isImage()) {
+                String tagId = String.valueOf(file.getRemoteId());
+                thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(tagId);
+                       }
+                       if (thumbnail != null) {
+                               // Display thumbnail
+                               iv.setImageBitmap(thumbnail);
+                       } else {
+                               // Name of the file, to deduce the icon to use in case the MIME type is not precise enough
+                               String filename = file.getFileName();
+                iv.setImageResource(MimetypeIconUtil.getFileTypeIconId(mimetype, filename));
+                       }

         }
     }
 
     /**
      * Updates the file size in view
         }
     }
 
     /**
      * Updates the file size in view

+     *

      * @param filesize in bytes to set
      */
     private void setFilesize(long filesize) {
         TextView tv = (TextView) getView().findViewById(R.id.fdSize);
      * @param filesize in bytes to set
      */
     private void setFilesize(long filesize) {
         TextView tv = (TextView) getView().findViewById(R.id.fdSize);

-        if (tv != null)
+        if (tv != null) {

             tv.setText(DisplayUtils.bytesToHumanReadable(filesize));
             tv.setText(DisplayUtils.bytesToHumanReadable(filesize));

+        }

     }
     }

-    
+

     /**
      * Updates the time that the file was last modified
     /**
      * Updates the time that the file was last modified

+     *

      * @param milliseconds Unix time to set
      */
      * @param milliseconds Unix time to set
      */

-    private void setTimeModified(long milliseconds){
+    private void setTimeModified(long milliseconds) {

         TextView tv = (TextView) getView().findViewById(R.id.fdModified);
         TextView tv = (TextView) getView().findViewById(R.id.fdModified);

-        if(tv != null){
+        if (tv != null) {

             tv.setText(DisplayUtils.unixTimeToHumanReadable(milliseconds));
         }
     }
             tv.setText(DisplayUtils.unixTimeToHumanReadable(milliseconds));
         }
     }

-    
+

     /**
      * Enables or disables buttons for a file being downloaded
      */
     /**
      * Enables or disables buttons for a file being downloaded
      */


@@ -431,21 +458,24 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
             
             // show the progress bar for the transfer
             getView().findViewById(R.id.fdProgressBlock).setVisibility(View.VISIBLE);
             
             // show the progress bar for the transfer
             getView().findViewById(R.id.fdProgressBlock).setVisibility(View.VISIBLE);

-            TextView progressText = (TextView)getView().findViewById(R.id.fdProgressText);
+            TextView progressText = (TextView) getView().findViewById(R.id.fdProgressText);

             progressText.setVisibility(View.VISIBLE);
             FileDownloaderBinder downloaderBinder = mContainerActivity.getFileDownloaderBinder();
             FileUploaderBinder uploaderBinder = mContainerActivity.getFileUploaderBinder();
             //if (getFile().isDownloading()) {
             if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, getFile())) {
                 progressText.setText(R.string.downloader_download_in_progress_ticker);
             progressText.setVisibility(View.VISIBLE);
             FileDownloaderBinder downloaderBinder = mContainerActivity.getFileDownloaderBinder();
             FileUploaderBinder uploaderBinder = mContainerActivity.getFileUploaderBinder();
             //if (getFile().isDownloading()) {
             if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, getFile())) {
                 progressText.setText(R.string.downloader_download_in_progress_ticker);

-            } else if (uploaderBinder != null && uploaderBinder.isUploading(mAccount, getFile())) {
-                progressText.setText(R.string.uploader_upload_in_progress_ticker);
+            }
+            else {
+                if (uploaderBinder != null && uploaderBinder.isUploading(mAccount, getFile())) {
+                    progressText.setText(R.string.uploader_upload_in_progress_ticker);
+                }

             }
         }
     }
 
     /**
             }
         }
     }
 
     /**

-     * Enables or disables buttons for a file locally available 
+     * Enables or disables buttons for a file locally available

      */
     private void setButtonsForDown() {
         if (!isEmpty()) {
      */
     private void setButtonsForDown() {
         if (!isEmpty()) {


@@ -453,13 +483,13 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
             
             // hides the progress bar
             getView().findViewById(R.id.fdProgressBlock).setVisibility(View.GONE);
             
             // hides the progress bar
             getView().findViewById(R.id.fdProgressBlock).setVisibility(View.GONE);

-            TextView progressText = (TextView)getView().findViewById(R.id.fdProgressText);
+            TextView progressText = (TextView) getView().findViewById(R.id.fdProgressText);

             progressText.setVisibility(View.GONE);
         }
     }
 
     /**
             progressText.setVisibility(View.GONE);
         }
     }
 
     /**

-     * Enables or disables buttons for a file not locally available 
+     * Enables or disables buttons for a file not locally available

      */
     private void setButtonsForRemote() {
         if (!isEmpty()) {
      */
     private void setButtonsForRemote() {
         if (!isEmpty()) {


@@ -467,11 +497,11 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
             
             // hides the progress bar
             getView().findViewById(R.id.fdProgressBlock).setVisibility(View.GONE);
             
             // hides the progress bar
             getView().findViewById(R.id.fdProgressBlock).setVisibility(View.GONE);

-            TextView progressText = (TextView)getView().findViewById(R.id.fdProgressText);
+            TextView progressText = (TextView) getView().findViewById(R.id.fdProgressText);

             progressText.setVisibility(View.GONE);
         }
     }
             progressText.setVisibility(View.GONE);
         }
     }

-    
+

 
     public void listenForTransferProgress() {
         if (mProgressListener != null) {
 
     public void listenForTransferProgress() {
         if (mProgressListener != null) {


@@ -485,8 +515,8 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
             }
         }
     }
             }
         }
     }

-    
-    
+
+

     public void leaveTransferProgress() {
         if (mProgressListener != null) {
             if (mContainerActivity.getFileDownloaderBinder() != null) {
     public void leaveTransferProgress() {
         if (mProgressListener != null) {
             if (mContainerActivity.getFileDownloaderBinder() != null) {


@@ -501,7 +531,6 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
     }
 
 
     }
 
 

-    

     /**
      * Helper class responsible for updating the progress bar shown for file uploading or
      * downloading
     /**
      * Helper class responsible for updating the progress bar shown for file uploading or
      * downloading


@@ -509,11 +538,11 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
     private class ProgressListener implements OnDatatransferProgressListener {
         int mLastPercent = 0;
         WeakReference<ProgressBar> mProgressBar = null;
     private class ProgressListener implements OnDatatransferProgressListener {
         int mLastPercent = 0;
         WeakReference<ProgressBar> mProgressBar = null;

-        
+

         ProgressListener(ProgressBar progressBar) {
             mProgressBar = new WeakReference<ProgressBar>(progressBar);
         }
         ProgressListener(ProgressBar progressBar) {
             mProgressBar = new WeakReference<ProgressBar>(progressBar);
         }

-        
+

         @Override
         public void onTransferProgress(long progressRate, long totalTransferredSoFar,
                                        long totalToTransfer, String filename) {
         @Override
         public void onTransferProgress(long progressRate, long totalTransferredSoFar,
                                        long totalToTransfer, String filename) {