X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/fff362d103fdcff8e78aa5a7e51957d997ce5f73..671fef617b9bc67300e3d2cddbbfbe9fb8b4937b:/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 4546cc00..1b95186b 100644 --- a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java +++ b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java @@ -23,31 +23,24 @@ package com.owncloud.android.ui.fragment; import android.accounts.Account; import android.app.Activity; import android.graphics.Bitmap; -import android.net.Uri; import android.os.Bundle; import android.support.v4.app.Fragment; import android.view.LayoutInflater; -import android.view.MotionEvent; 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.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.adapter.ShareUserListAdapter; import com.owncloud.android.utils.DisplayUtils; -import com.owncloud.android.utils.GetShareWithUserAsyncTask; import com.owncloud.android.utils.MimetypeIconUtil; import java.util.ArrayList; @@ -63,7 +56,8 @@ import java.util.ArrayList; * create an instance of this fragment. */ public class ShareFileFragment extends Fragment - implements GetShareWithUserAsyncTask.OnGetSharesWithUserTaskListener, View.OnTouchListener { + implements ShareUserListAdapter.ShareUserAdapterListener{ + private static final String TAG = ShareFileFragment.class.getSimpleName(); // the fragment initialization parameters @@ -82,11 +76,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); @@ -122,7 +116,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); } } @@ -131,18 +125,12 @@ 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())); } - // 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); @@ -150,7 +138,7 @@ public class ShareFileFragment extends Fragment @Override public void onClick(View view) { // Show Search Fragment - mListener.showSearchUsersAndGroups(); + mListener.showSearchUsersAndGroups(mShares); } }); @@ -161,14 +149,8 @@ public class ShareFileFragment extends Fragment public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - getShares(); - } - - // TODO: Rename method, update argument and hook method into UI event - public void onButtonPressed(Uri uri) { - if (mListener != null) { - mListener.onShareFragmentInteraction(uri); - } + // Load data to the list (start process with an Async Task) + mListener.refreshUsersOrGroupsListFromServer(); } @Override @@ -188,45 +170,22 @@ public class ShareFileFragment extends Fragment mListener = null; } - // Get users and groups to fill the "share with" list - private void getShares(){ - mShares = new ArrayList<>(); - + /** + * Get users and groups fromn the DB to fill in the "share with" list + */ + public void refreshUsersOrGroupsListFromDB (){ // Get Users and Groups - FileDataStorageManager fileDataStorageManager = - new FileDataStorageManager(mAccount, getActivity().getContentResolver()); - mShares = fileDataStorageManager.getSharesWithForAFile(mFile.getRemotePath(), mAccount.name); + mShares = ((ShareActivity) mListener).getStorageManager().getSharesWithForAFile(mFile.getRemotePath(), + mAccount.name); // Update list of users/groups updateListOfUserGroups(); } - @Override - public void onGetDataShareWithFinish(RemoteOperationResult result) { - // Remove loading - ((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 ){ - mShares.add((OCShare) obj); - } - } - - // Update list of users/groups - updateListOfUserGroups(); - - } else { - Toast.makeText(getActivity(), result.getLogMessage(), Toast.LENGTH_SHORT).show(); - } - - } - - private void updateListOfUserGroups(){ + private void updateListOfUserGroups() { // Update list of users/groups mUserGroupsAdapter = new ShareUserListAdapter(getActivity().getApplicationContext(), - R.layout.share_user_item, mShares); + R.layout.share_user_item, mShares, this); // Show data TextView noShares = (TextView) getView().findViewById(R.id.shareNoUsers); @@ -237,39 +196,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); } } - 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); - } - return false; - } - }); - } - @Override - public boolean onTouch(View v, MotionEvent event) { - return false; + 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 @@ -281,9 +221,9 @@ public class ShareFileFragment extends Fragment * >Communicating with Other Fragments for more information. */ public interface OnShareFragmentInteractionListener { - void showSearchUsersAndGroups(); - - void onShareFragmentInteraction(Uri uri); + void showSearchUsersAndGroups(ArrayList shares); + void refreshUsersOrGroupsListFromServer(); + void unshareWith(OCShare share); } }