Merge branch 'share_link_show_shared_files' into share_link__unshare_file

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / FileDisplayActivity.java

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index e4236a5..02da64e 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -1369,6 +1369,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
 
         refeshListOfFilesFragment();
 
+        dismissLoadingDialog();
     }
 
     /**
@@ -1596,6 +1597,8 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
             // Unshare the file
             UnshareLinkOperation unshare = new UnshareLinkOperation(file);
             unshare.execute(getStorageManager(), this, this, mHandler, this);
+         
+            showLoadingDialog();
             
         } else {
             // Show a Message