X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/20b0ec8977b845032214f31a9733aa8decd8cd07..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 3a194a84..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 @@ -21,11 +22,8 @@ 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; import android.os.Bundle; import android.support.v4.app.Fragment; import android.view.LayoutInflater; @@ -37,44 +35,35 @@ 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.authentication.AccountUtils; 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; /** - * 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 GetShareWithUserAsyncTask.OnGetSharesWithUserTaskListener{ + implements ShareUserListAdapter.ShareUserAdapterListener{ + private static final String TAG = ShareFileFragment.class.getSimpleName(); // the fragment initialization parameters @@ -85,19 +74,19 @@ public class ShareFileFragment extends Fragment private OCFile mFile; private Account mAccount; + // other members private ArrayList mShares; private ShareUserListAdapter mUserGroupsAdapter = null; - private OnShareFragmentInteractionListener mListener; /** * 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); @@ -110,6 +99,9 @@ public class ShareFileFragment extends Fragment // Required empty public constructor } + /** + * {@inheritDoc} + */ @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -119,6 +111,9 @@ public class ShareFileFragment extends Fragment } } + /** + * {@inheritDoc} + */ @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -133,7 +128,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,26 +137,26 @@ 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); 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(); + } } }); @@ -172,14 +167,8 @@ public class ShareFileFragment extends Fragment public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - getShares(mFile); - } - - // TODO: Rename method, update argument and hook method into UI event - public void onButtonPressed(Uri uri) { - if (mListener != null) { - mListener.onShareFragmentInteraction(uri); - } + // Load data into the list + refreshUsersOrGroupsListFromDB(); } @Override @@ -199,60 +188,58 @@ public class ShareFileFragment extends Fragment mListener = null; } - // Get users and groups to fill the "share with" list - private void getShares(OCFile file){ - 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); - } - - @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); - } - } + /** + * 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 (){ + if (((FileActivity) mListener).getStorageManager() != null) { + // Get Users and Groups + mShares = ((FileActivity) mListener).getStorageManager().getSharesWithForAFile( + mFile.getRemotePath(), + mAccount.name + ); // 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); + updateListOfUserGroups(); + } + } - } else { - noShares.setVisibility(View.VISIBLE); - usersList.setVisibility(View.GONE); - } + private void updateListOfUserGroups() { + // Update list of users/groups + // 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); + ListView usersList = (ListView) getView().findViewById(R.id.shareUsersList); + + if (mShares.size() > 0) { + noShares.setVisibility(View.GONE); + usersList.setVisibility(View.VISIBLE); + usersList.setAdapter(mUserGroupsAdapter); } else { - Toast.makeText(getActivity(), result.getLogMessage(), Toast.LENGTH_SHORT).show(); + noShares.setVisibility(View.VISIBLE); + usersList.setVisibility(View.GONE); } + } + @Override + 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 @@ -265,8 +252,8 @@ public class ShareFileFragment extends Fragment */ public interface OnShareFragmentInteractionListener { void showSearchUsersAndGroups(); - - void onShareFragmentInteraction(Uri uri); + void refreshUsersOrGroupsListFromServer(); + void unshareWith(OCShare share); } }