Merge branch 'master' into develop

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / preview / FileDownloadFragment.java

diff --git a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java
index 98bbda3..7af29c6 100644 (file)
--- a/src/com/owncloud/android/ui/preview/FileDownloadFragment.java
+++ b/src/com/owncloud/android/ui/preview/FileDownloadFragment.java
@@ -211,10 +211,11 @@ public class FileDownloadFragment extends FileFragment implements OnClickListene
      * @param   transferring    When true, the view must be updated assuming that the holded file is 
      *                          downloading, no matter what the downloaderBinder says.
      */
      * @param   transferring    When true, the view must be updated assuming that the holded file is 
      *                          downloading, no matter what the downloaderBinder says.
      */

+    /*

     public void updateView(boolean transferring) {
         // configure UI for depending upon local state of the file
     public void updateView(boolean transferring) {
         // configure UI for depending upon local state of the file

-        FileDownloaderBinder downloaderBinder = (mContainerActivity == null) ? null : mContainerActivity.getFileDownloaderBinder();
-        if (transferring || (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, getFile()))) {
+        // TODO remove
+        if (transferring || getFile().isDownloading()) {

             setButtonsForTransferring();
             
         } else if (getFile().isDown()) {
             setButtonsForTransferring();
             
         } else if (getFile().isDown()) {


@@ -227,7 +228,7 @@ public class FileDownloadFragment extends FileFragment implements OnClickListene
         getView().invalidate();
         
     }
         getView().invalidate();
         
     }

-
+    */

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