From: masensio Date: Mon, 3 Feb 2014 14:14:42 +0000 (+0100) Subject: OC-2735: Refresh unshare files in list X-Git-Tag: oc-android-1.5.5~35^2~32 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/a8b46b7d95bf9cfc8fd09fa5eff1229dcc6d5208?ds=inline;hp=--cc OC-2735: Refresh unshare files in list --- a8b46b7d95bf9cfc8fd09fa5eff1229dcc6d5208 diff --git a/src/com/owncloud/android/operations/UnshareLinkOperation.java b/src/com/owncloud/android/operations/UnshareLinkOperation.java index c588ec1a..69fa5961 100644 --- 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 - 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()); diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java index e4236a5c..71577384 100644 --- 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(); + 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); - + + setSupportProgressBarIndeterminateVisibility(true); } else { // Show a Message Toast t = Toast.makeText(this, getString(R.string.share_link_no_support_share_api), Toast.LENGTH_LONG);