X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/e0813be81ed5083be67f3caaa473711ed58ce75e..a00b27290354eb909f23b851e22036aa02d076a2:/src/com/owncloud/android/ui/fragment/ShareFileFragment.java diff --git a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java index 57ab4cf5..ed81a4a6 100644 --- a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java +++ b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java @@ -41,13 +41,13 @@ import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.datamodel.ThumbnailsCacheManager; import com.owncloud.android.lib.common.operations.RemoteOperationResult; +import com.owncloud.android.lib.common.utils.Log_OC; import com.owncloud.android.lib.resources.shares.OCShare; -import com.owncloud.android.lib.resources.shares.ShareType; import com.owncloud.android.ui.activity.ShareActivity; import com.owncloud.android.ui.adapter.ShareUserListAdapter; import com.owncloud.android.utils.DisplayUtils; -import com.owncloud.android.utils.GetShareWithUserAsyncTask; import com.owncloud.android.utils.MimetypeIconUtil; +import com.owncloud.android.utils.UnshareWithUserAsyncTask; import java.util.ArrayList; @@ -61,7 +61,8 @@ import java.util.ArrayList; * Use the {@link ShareFileFragment#newInstance} factory method to * create an instance of this fragment. */ -public class ShareFileFragment extends Fragment { +public class ShareFileFragment extends Fragment + implements UnshareWithUserAsyncTask.OnUnshareWithUserTaskListener{ private static final String TAG = ShareFileFragment.class.getSimpleName(); @@ -188,9 +189,7 @@ public class ShareFileFragment extends Fragment { } // Get users and groups to fill the "share with" list - private void getShares() { - mShares = new ArrayList<>(); - + private void getShares(){ // Get Users and Groups FileDataStorageManager fileDataStorageManager = new FileDataStorageManager(mAccount, getActivity().getContentResolver()); @@ -226,12 +225,22 @@ public class ShareFileFragment extends Fragment { private void registerLongClickListener(final ListView listView) { listView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() { @Override - public boolean onItemLongClick(AdapterView parent, View view, int position, + public boolean onItemLongClick(AdapterView parent, View view, final int position, long id) { // Show unshare button ImageView unshareButton = (ImageView) view.findViewById(R.id.unshareButton); if (unshareButton.getVisibility() == View.GONE) { unshareButton.setVisibility(View.VISIBLE); + unshareButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + // Unshare + unshareWith((int)(mShares.get(position).getIdRemoteShared())); + Log_OC.d(TAG, "Unshare - " + + mShares.get(position).getSharedWithDisplayName()); + } + }); + } else { unshareButton.setVisibility(View.GONE); } @@ -242,6 +251,32 @@ public class ShareFileFragment extends Fragment { }); } + private void unshareWith(int shareId){ + ( (ShareActivity) getActivity()).showLoadingDialog(getActivity().getApplicationContext(). + getString(R.string.common_loading)); + // Remove Share with id + UnshareWithUserAsyncTask unshareTask = new UnshareWithUserAsyncTask(this); + FileDataStorageManager fileDataStorageManager = + new FileDataStorageManager(mAccount, getActivity().getContentResolver()); + Object[] params = { shareId, mAccount, fileDataStorageManager}; + unshareTask.execute(params); + } + + @Override + public void onUnshareWithFinish(RemoteOperationResult result) { + // Remove loading + ((ShareActivity) getActivity()).dismissLoadingDialog(); + + if (result != null && result.isSuccess()) { + // Refresh data + //TODO: Refresh file or delete the user from the list + updateListOfUserGroups(); + + } else { + Toast.makeText(getActivity(), result.getLogMessage(), Toast.LENGTH_SHORT).show(); + } + } + // TODO: review if it is necessary /** * This interface must be implemented by activities that contain this