X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/20b0ec8977b845032214f31a9733aa8decd8cd07..3de67c45e4a2cbd8869ea28ef422eab1762d3e9b:/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 3a194a84..0ae15020 100644 --- a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java +++ b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java @@ -21,8 +21,6 @@ package com.owncloud.android.ui.fragment; import android.accounts.Account; -import android.accounts.AuthenticatorException; -import android.accounts.OperationCanceledException; import android.app.Activity; import android.graphics.Bitmap; import android.net.Uri; @@ -31,36 +29,26 @@ import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.AdapterView; import android.widget.Button; import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; -import com.owncloud.android.MainApp; 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.OwnCloudAccount; -import com.owncloud.android.lib.common.OwnCloudClient; -import com.owncloud.android.lib.common.OwnCloudClientManagerFactory; -import com.owncloud.android.lib.common.accounts.AccountUtils; 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.operations.GetSharesForFileOperation; -import com.owncloud.android.ui.activity.FileActivity; import com.owncloud.android.ui.activity.ShareActivity; -import com.owncloud.android.ui.adapter.LocalFileListAdapter; import com.owncloud.android.ui.adapter.ShareUserListAdapter; -import com.owncloud.android.utils.CopyTmpFileAsyncTask; import com.owncloud.android.utils.DisplayUtils; import com.owncloud.android.utils.GetShareWithUserAsyncTask; import com.owncloud.android.utils.MimetypeIconUtil; -import java.io.IOException; import java.util.ArrayList; /** @@ -74,7 +62,8 @@ import java.util.ArrayList; * create an instance of this fragment. */ public class ShareFileFragment extends Fragment - implements GetShareWithUserAsyncTask.OnGetSharesWithUserTaskListener{ + implements GetShareWithUserAsyncTask.OnGetSharesWithUserTaskListener { + private static final String TAG = ShareFileFragment.class.getSimpleName(); // the fragment initialization parameters @@ -93,11 +82,11 @@ public class ShareFileFragment extends Fragment /** * Public factory method to create new ShareFileFragment instances. * - * @param fileToShare An {@link OCFile} to show in the fragment - * @param account An ownCloud account + * @param fileToShare An {@link OCFile} to show in the fragment + * @param account An ownCloud account * @return A new instance of fragment ShareFileFragment. */ - public static ShareFileFragment newInstance(OCFile fileToShare, Account account) { + public static ShareFileFragment newInstance(OCFile fileToShare, Account account) { ShareFileFragment fragment = new ShareFileFragment(); Bundle args = new Bundle(); args.putParcelable(ARG_FILE, fileToShare); @@ -133,7 +122,7 @@ public class ShareFileFragment extends Fragment if (mFile.isImage()) { String remoteId = String.valueOf(mFile.getRemoteId()); Bitmap thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(remoteId); - if (thumbnail != null){ + if (thumbnail != null) { icon.setImageBitmap(thumbnail); } } @@ -142,7 +131,7 @@ public class ShareFileFragment extends Fragment filename.setText(mFile.getFileName()); // Size TextView size = (TextView) view.findViewById(R.id.shareFileSize); - if (mFile.isFolder()){ + if (mFile.isFolder()) { size.setVisibility(View.GONE); } else { size.setText(DisplayUtils.bytesToHumanReadable(mFile.getFileLength())); @@ -172,7 +161,7 @@ public class ShareFileFragment extends Fragment public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - getShares(mFile); + getShares(); } // TODO: Rename method, update argument and hook method into UI event @@ -200,19 +189,16 @@ public class ShareFileFragment extends Fragment } // Get users and groups to fill the "share with" list - private void getShares(OCFile file){ + private void getShares() { mShares = new ArrayList<>(); - RemoteOperationResult result = null; - - // Show loading - ( (ShareActivity) getActivity()).showWaitingLoadDialog(); // Get Users and Groups - GetShareWithUserAsyncTask getTask = new GetShareWithUserAsyncTask(this); FileDataStorageManager fileDataStorageManager = new FileDataStorageManager(mAccount, getActivity().getContentResolver()); - Object[] params = { mFile, mAccount, fileDataStorageManager}; - getTask.execute(params); + mShares = fileDataStorageManager.getSharesWithForAFile(mFile.getRemotePath(), mAccount.name); + + // Update list of users/groups + updateListOfUserGroups(); } @Override @@ -221,35 +207,62 @@ public class ShareFileFragment extends Fragment ((ShareActivity) getActivity()).dismissWaitingLoadDialog(); if (result != null && result.isSuccess()) { // update local database - for(Object obj: result.getData()) { - if ( ((OCShare) obj).getShareType() == ShareType.USER || - ((OCShare) obj).getShareType() == ShareType.GROUP ){ + for (Object obj : result.getData()) { + if (((OCShare) obj).getShareType() == ShareType.USER || + ((OCShare) obj).getShareType() == ShareType.GROUP) { mShares.add((OCShare) obj); } } // Update list of users/groups - mUserGroupsAdapter = new ShareUserListAdapter(getActivity().getApplicationContext(), - R.layout.share_user_item, mShares); + updateListOfUserGroups(); - // Show data - TextView noShares = (TextView) getView().findViewById(R.id.shareNoUsers); - ListView usersList = (ListView) getView().findViewById(R.id.shareUsersList); + } else { + Toast.makeText(getActivity(), result.getLogMessage(), Toast.LENGTH_SHORT).show(); + } + + } - if (mShares.size() > 0) { - noShares.setVisibility(View.GONE); - usersList.setVisibility(View.VISIBLE); - usersList.setAdapter(mUserGroupsAdapter); + private void updateListOfUserGroups() { + // Update list of users/groups + mUserGroupsAdapter = new ShareUserListAdapter(getActivity().getApplicationContext(), + R.layout.share_user_item, mShares); - } else { - noShares.setVisibility(View.VISIBLE); - usersList.setVisibility(View.GONE); - } + // Show data + TextView noShares = (TextView) getView().findViewById(R.id.shareNoUsers); + ListView usersList = (ListView) getView().findViewById(R.id.shareUsersList); + + if (mShares.size() > 0) { + noShares.setVisibility(View.GONE); + usersList.setVisibility(View.VISIBLE); + usersList.setAdapter(mUserGroupsAdapter); + + // Add unshare options + registerLongClickListener(usersList); } else { - Toast.makeText(getActivity(), result.getLogMessage(), Toast.LENGTH_SHORT).show(); + noShares.setVisibility(View.VISIBLE); + usersList.setVisibility(View.GONE); } + } + private void registerLongClickListener(final ListView listView) { + listView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() { + @Override + public boolean onItemLongClick(AdapterView parent, View view, int position, + long id) { + // Show unshare button + ImageView unshareButton = (ImageView) view.findViewById(R.id.unshareButton); + if (unshareButton.getVisibility() == View.GONE) { + unshareButton.setVisibility(View.VISIBLE); + } else { + unshareButton.setVisibility(View.GONE); + } + view.setAlpha(0); + view.animate().alpha(1).setDuration(500).start(); + return false; + } + }); } // TODO: review if it is necessary