X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/c49cc06d3de203308ef7726338aff4a93be89cdd..080a8ab7af2bc48e3c5fa1334ae91d21073e26c2:/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 8a589db9..a0296533 100644 --- a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java +++ b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java @@ -2,6 +2,7 @@ * ownCloud Android client application * * @author masensio + * @author David A. Velasco * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify @@ -28,7 +29,6 @@ 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; @@ -36,34 +36,33 @@ import android.widget.TextView; import android.widget.Toast; import com.owncloud.android.R; -import com.owncloud.android.datamodel.FileDataStorageManager; +import com.owncloud.android.authentication.AccountUtils; 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.FileActivity; 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.GetShareWithUsersAsyncTask; import com.owncloud.android.utils.MimetypeIconUtil; import java.util.ArrayList; /** - * Fragment for Sharing a file with users + * Fragment for Sharing a file with sharees (users or groups) * * A simple {@link Fragment} subclass. + * * Activities that contain this fragment must implement the * {@link ShareFileFragment.OnShareFragmentInteractionListener} interface * to handle interaction events. + * * Use the {@link ShareFileFragment#newInstance} factory method to * create an instance of this fragment. */ public class ShareFileFragment extends Fragment - implements GetShareWithUsersAsyncTask.OnGetSharesWithUsersTaskListener { + implements ShareUserListAdapter.ShareUserAdapterListener{ private static final String TAG = ShareFileFragment.class.getSimpleName(); @@ -75,9 +74,9 @@ public class ShareFileFragment extends Fragment private OCFile mFile; private Account mAccount; + // other members private ArrayList mShares; private ShareUserListAdapter mUserGroupsAdapter = null; - private OnShareFragmentInteractionListener mListener; /** @@ -100,6 +99,9 @@ public class ShareFileFragment extends Fragment // Required empty public constructor } + /** + * {@inheritDoc} + */ @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -109,6 +111,9 @@ public class ShareFileFragment extends Fragment } } + /** + * {@inheritDoc} + */ @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -144,8 +149,14 @@ public class ShareFileFragment extends Fragment addUserGroupButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - // Show Search Fragment - mListener.showSearchUsersAndGroups(); + boolean shareWithUsersEnable = AccountUtils.hasSearchUsersSupport(mAccount); + if (shareWithUsersEnable) { + // Show Search Fragment + mListener.showSearchUsersAndGroups(); + } else { + String message = getString(R.string.share_sharee_unavailable); + Toast.makeText(getActivity(), message, Toast.LENGTH_LONG).show(); + } } }); @@ -156,9 +167,8 @@ public class ShareFileFragment extends Fragment public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - // Load data to the list (start process with an Async Task) - refreshUsersOrGroupsListFromServer(); - + // Load data into the list + refreshUsersOrGroupsListFromDB(); } @Override @@ -179,23 +189,33 @@ public class ShareFileFragment extends Fragment } /** - * Get users and groups fromn the DB to fill in the "share with" list + * Get users and groups from the DB to fill in the "share with" list + * + * Depends on the parent Activity provides a {@link com.owncloud.android.datamodel.FileDataStorageManager} + * instance ready to use. If not ready, does nothing. */ public void refreshUsersOrGroupsListFromDB (){ - // Get Users and Groups - FileDataStorageManager fileDataStorageManager = - new FileDataStorageManager(mAccount, getActivity().getContentResolver()); - mShares = fileDataStorageManager.getSharesWithForAFile(mFile.getRemotePath(), - mAccount.name); + if (((FileActivity) mListener).getStorageManager() != null) { + // Get Users and Groups + mShares = ((FileActivity) mListener).getStorageManager().getSharesWithForAFile( + mFile.getRemotePath(), + mAccount.name + ); - // Update list of users/groups - updateListOfUserGroups(); + // Update list of users/groups + updateListOfUserGroups(); + } } private void updateListOfUserGroups() { // Update list of users/groups - mUserGroupsAdapter = new ShareUserListAdapter(getActivity().getApplicationContext(), - R.layout.share_user_item, mShares); + // TODO Refactoring: create a new {@link ShareUserListAdapter} instance with every call should not be needed + mUserGroupsAdapter = new ShareUserListAdapter( + getActivity(), + R.layout.share_user_item, + mShares, + this + ); // Show data TextView noShares = (TextView) getView().findViewById(R.id.shareNoUsers); @@ -206,106 +226,20 @@ public class ShareFileFragment extends Fragment usersList.setVisibility(View.VISIBLE); usersList.setAdapter(mUserGroupsAdapter); - // Add unshare options - registerLongClickListener(usersList); - } else { noShares.setVisibility(View.VISIBLE); usersList.setVisibility(View.GONE); } } - /** - * Get users and groups from the server to fill in the "share with" list - */ - public void refreshUsersOrGroupsListFromServer(){ - mShares = new ArrayList<>(); - - // Show loading - ((ShareActivity) getActivity()).showLoadingDialog(getString(R.string.common_loading)); - // Get Users and Groups - GetShareWithUsersAsyncTask getTask = new GetShareWithUsersAsyncTask(this); - FileDataStorageManager fileDataStorageManager = ((ShareActivity) getActivity()).getStorageManager(); - Object[] params = { mFile, mAccount, fileDataStorageManager}; - getTask.execute(params); - } - - private void registerLongClickListener(final ListView listView) { - listView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() { - @Override - 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); - } - view.setAlpha(0); - view.animate().alpha(1).setDuration(500).start(); - return false; - } - }); - } - - // Call to Unshare operation - private void unshareWith(OCShare share){ - OCFile file = ((FileActivity) getActivity()).getFile(); - - ((FileActivity) getActivity()).getFileOperationsHelper(). - unshareFileWithUserOrGroup( - file, share.getShareType(), share.getShareWith() - ); - } - @Override - public void onGetDataShareWithFinish(RemoteOperationResult result) { - // Remove loading - ((ShareActivity) getActivity()).dismissLoadingDialog(); - if (result != null && result.isSuccess()) { - // update local database - 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); - - // 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); - - } else { - noShares.setVisibility(View.VISIBLE); - usersList.setVisibility(View.GONE); - } - } else { - Toast.makeText(getActivity(), result.getLogMessage(), Toast.LENGTH_SHORT).show(); - } + public void unshareButtonPressed(OCShare share) { + // Unshare + mListener.unshareWith(share); + Log_OC.d(TAG, "Unshare - " + share.getSharedWithDisplayName()); } - // TODO: review if it is necessary /** * This interface must be implemented by activities that contain this * fragment to allow an interaction in this fragment to be communicated @@ -318,6 +252,8 @@ public class ShareFileFragment extends Fragment */ public interface OnShareFragmentInteractionListener { void showSearchUsersAndGroups(); + void refreshUsersOrGroupsListFromServer(); + void unshareWith(OCShare share); } }