X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/e0813be81ed5083be67f3caaa473711ed58ce75e..9cdaddefa33a73b15e0845e7db6111b0d96a153c:/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..13c17c5f 100644 --- a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java +++ b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java @@ -34,19 +34,16 @@ import android.widget.Button; import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; -import android.widget.Toast; import com.owncloud.android.R; 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.activity.FileActivity; 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 java.util.ArrayList; @@ -136,12 +133,6 @@ public class ShareFileFragment extends Fragment { size.setText(DisplayUtils.bytesToHumanReadable(mFile.getFileLength())); } - // List of share with users - TextView noShares = (TextView) view.findViewById(R.id.shareNoUsers); - - // TODO: Get shares from DB and show - - // Add User Button Button addUserGroupButton = (Button) view.findViewById(R.id.addUserButton); @@ -160,7 +151,7 @@ public class ShareFileFragment extends Fragment { public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - getShares(); + refreshUsersOrGroupsList(); } // TODO: Rename method, update argument and hook method into UI event @@ -188,13 +179,14 @@ public class ShareFileFragment extends Fragment { } // Get users and groups to fill the "share with" list - private void getShares() { + public void refreshUsersOrGroupsList(){ mShares = new ArrayList<>(); // Get Users and Groups FileDataStorageManager fileDataStorageManager = new FileDataStorageManager(mAccount, getActivity().getContentResolver()); - mShares = fileDataStorageManager.getSharesWithForAFile(mFile.getRemotePath(), mAccount.name); + mShares = fileDataStorageManager.getSharesWithForAFile(mFile.getRemotePath(), + mAccount.name); // Update list of users/groups updateListOfUserGroups(); @@ -226,12 +218,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(mShares.get(position)); + Log_OC.d(TAG, "Unshare - " + + mShares.get(position).getSharedWithDisplayName()); + } + }); + } else { unshareButton.setVisibility(View.GONE); } @@ -242,6 +244,16 @@ public class ShareFileFragment extends Fragment { }); } + private void unshareWith(OCShare share){ + OCFile file = ((FileActivity) getActivity()).getFile(); + + ((FileActivity) getActivity()).getFileOperationsHelper(). + unshareFileWithUserOrGroup( + file, share.getShareType(), share.getShareWith() + ); + } + + // TODO: review if it is necessary /** * This interface must be implemented by activities that contain this