OC-3087: (fix bug) The loading doesn't deissapear during the download process

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 050f6bd..cbe261c 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -1640,7 +1640,6 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
     }
     
     private void sendDownloadedFile(){
     }
     
     private void sendDownloadedFile(){

-        dismissLoadingDialog();

         getFileOperationsHelper().sendDownloadedFile(mWaitingToSend, this);
         mWaitingToSend = null;
     }
         getFileOperationsHelper().sendDownloadedFile(mWaitingToSend, this);
         mWaitingToSend = null;
     }

diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index 50faf04..a567c43 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -391,7 +391,6 @@ public class FileDetailFragment extends FileFragment implements
                 FileDisplayActivity activity = (FileDisplayActivity) getSherlockActivity();
                 // Obtain the file
                 if (!getFile().isDown()) {  // Download the file                    
                 FileDisplayActivity activity = (FileDisplayActivity) getSherlockActivity();
                 // Obtain the file
                 if (!getFile().isDown()) {  // Download the file                    

-                    //activity.showLoadingDialog();

                     Log_OC.d(TAG, getFile().getRemotePath() + " : File must be downloaded");
                     activity.startDownloadForSending(getFile());
                     
                     Log_OC.d(TAG, getFile().getRemotePath() + " : File must be downloaded");
                     activity.startDownloadForSending(getFile());
                     

diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index e902b05..cb37007 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -368,7 +368,6 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
             case R.id.action_send_file: {
                 // Obtain the file
                 if (!mTargetFile.isDown()) {  // Download the file
             case R.id.action_send_file: {
                 // Obtain the file
                 if (!mTargetFile.isDown()) {  // Download the file

-                    ((FileDisplayActivity) getSherlockActivity()).showLoadingDialog();

                     Log_OC.d(TAG, mTargetFile.getRemotePath() + " : File must be downloaded");
                     mContainerActivity.startDownloadForSending(mTargetFile);
                     
                     Log_OC.d(TAG, mTargetFile.getRemotePath() + " : File must be downloaded");
                     mContainerActivity.startDownloadForSending(mTargetFile);