Merge branch 'download_folder__refactoring_observance_of_downloads_in_progress' into...

[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 e1571ff..dc607b5 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -179,6 +179,7 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
             FileMenuFilter mf = new FileMenuFilter(
                 getFile(),
                 mContainerActivity.getStorageManager().getAccount(),
             FileMenuFilter mf = new FileMenuFilter(
                 getFile(),
                 mContainerActivity.getStorageManager().getAccount(),

+                mContainerActivity,

                 getSherlockActivity()
             );
             mf.filter(menu);
                 getSherlockActivity()
             );
             mf.filter(menu);


@@ -345,9 +346,8 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
             cb.setChecked(file.keepInSync());
 
             // configure UI for depending upon local state of the file
             cb.setChecked(file.keepInSync());
 
             // configure UI for depending upon local state of the file

-            FileDownloaderBinder downloaderBinder = mContainerActivity.getFileDownloaderBinder();

             FileUploaderBinder uploaderBinder = mContainerActivity.getFileUploaderBinder();
             FileUploaderBinder uploaderBinder = mContainerActivity.getFileUploaderBinder();

-            if (transferring || file.isDownloading() || file.isUploading()) {
+            if (transferring || file.isDownloading() || uploaderBinder.isUploading(mAccount, file)) {

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


@@ -446,9 +446,10 @@ public class FileDetailFragment extends FileFragment implements OnClickListener
             getView().findViewById(R.id.fdProgressBlock).setVisibility(View.VISIBLE);
             TextView progressText = (TextView)getView().findViewById(R.id.fdProgressText);
             progressText.setVisibility(View.VISIBLE);
             getView().findViewById(R.id.fdProgressBlock).setVisibility(View.VISIBLE);
             TextView progressText = (TextView)getView().findViewById(R.id.fdProgressText);
             progressText.setVisibility(View.VISIBLE);

+            FileUploaderBinder uploaderBinder = mContainerActivity.getFileUploaderBinder();

             if (getFile().isDownloading()) {
                 progressText.setText(R.string.downloader_download_in_progress_ticker);
             if (getFile().isDownloading()) {
                 progressText.setText(R.string.downloader_download_in_progress_ticker);

-            } else if (getFile().isUploading()) {
+            } else if (uploaderBinder != null && uploaderBinder.isUploading(mAccount, getFile())) {

                 progressText.setText(R.string.uploader_upload_in_progress_ticker);
             }
         }
                 progressText.setText(R.string.uploader_upload_in_progress_ticker);
             }
         }