OC-2735: Refresh unshare files in list

diff --git a/src/com/owncloud/android/operations/UnshareLinkOperation.java b/src/com/owncloud/android/operations/UnshareLinkOperation.java
index c588ec1..69fa596 100644 (file)
--- a/src/com/owncloud/android/operations/UnshareLinkOperation.java
+++ b/src/com/owncloud/android/operations/UnshareLinkOperation.java
@@ -47,7 +47,11 @@ public class UnshareLinkOperation extends SyncOperation {
         RemoteOperationResult result  = null;
         
         // Get Share for a file
         RemoteOperationResult result  = null;
         
         // Get Share for a file

-        OCShare share = getStorageManager().getShareByPath(mFile.getRemotePath());
+        String path = mFile.getRemotePath();
+        if (mFile.isFolder()) {
+            path = path.substring(0, path.length()-1); // Remove last /
+        }
+        OCShare share = getStorageManager().getShareByPath(path);

         
         if (share != null) {
             UnshareLinkRemoteOperation operation = new UnshareLinkRemoteOperation((int) share.getIdRemoteShared());
         
         if (share != null) {
             UnshareLinkRemoteOperation operation = new UnshareLinkRemoteOperation((int) share.getIdRemoteShared());

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index e4236a5..7157738 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();
 
 
         refeshListOfFilesFragment();
 

+        setSupportProgressBarIndeterminateVisibility(false);

     }
 
     /**
     }
 
     /**


@@ -1596,7 +1597,8 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
             // Unshare the file
             UnshareLinkOperation unshare = new UnshareLinkOperation(file);
             unshare.execute(getStorageManager(), this, this, mHandler, this);
             // Unshare the file
             UnshareLinkOperation unshare = new UnshareLinkOperation(file);
             unshare.execute(getStorageManager(), this, this, mHandler, this);

-            
+         
+            setSupportProgressBarIndeterminateVisibility(true);

         } else {
             // Show a Message
             Toast t = Toast.makeText(this, getString(R.string.share_link_no_support_share_api), Toast.LENGTH_LONG);
         } else {
             // Show a Message
             Toast t = Toast.makeText(this, getString(R.string.share_link_no_support_share_api), Toast.LENGTH_LONG);