X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/7f75f13f0c47b5cc4f5fe6a743a6fb8a9281fef7..393bcd6869d4d77b2048c9c625e36eaeb6963ef3:/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java

diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
index ed986352..acc07bf2 100644
--- a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
@@ -362,7 +362,7 @@ public class FileDetailFragment extends SherlockFragment implements
             cb.setChecked(mFile.keepInSync());
 
             // configure UI for depending upon local state of the file
-            if (mFile.isDownloading()) {
+            if (FileDownloader.isDownloading(mAccount, mFile.getRemotePath())) {
                 setButtonsForDownloading();
                 
             } else if (mFile.isDown()) {
@@ -556,7 +556,7 @@ public class FileDetailFragment extends SherlockFragment implements
         public void onReceive(Context context, Intent intent) {
             String accountName = intent.getStringExtra(FileDownloader.ACCOUNT_NAME);
 
-            if (accountName.equals(mAccount.name) && mFile != null) {
+            if (!isEmpty() && accountName.equals(mAccount.name)) {
                 boolean downloadWasFine = intent.getBooleanExtra(FileDownloader.EXTRA_DOWNLOAD_RESULT, false);
                 String downloadedRemotePath = intent.getStringExtra(FileDownloader.EXTRA_REMOTE_PATH);
                 if (mFile.getRemotePath().equals(downloadedRemotePath)) {