X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/9cdaddefa33a73b15e0845e7db6111b0d96a153c..c4f6cac7659ddfce23a51027e7a41bb99e6e7c0b:/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 13c17c5f..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 @@ -23,25 +24,25 @@ 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.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.authentication.AccountUtils; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.datamodel.ThumbnailsCacheManager; import com.owncloud.android.lib.common.utils.Log_OC; import com.owncloud.android.lib.resources.shares.OCShare; 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.MimetypeIconUtil; @@ -49,16 +50,19 @@ 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 { +public class ShareFileFragment extends Fragment + implements ShareUserListAdapter.ShareUserAdapterListener{ private static final String TAG = ShareFileFragment.class.getSimpleName(); @@ -70,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; /** @@ -95,6 +99,9 @@ public class ShareFileFragment extends Fragment { // Required empty public constructor } + /** + * {@inheritDoc} + */ @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -104,6 +111,9 @@ public class ShareFileFragment extends Fragment { } } + /** + * {@inheritDoc} + */ @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -139,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(); + } } }); @@ -151,14 +167,8 @@ public class ShareFileFragment extends Fragment { public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - refreshUsersOrGroupsList(); - } - - // 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 @@ -178,24 +188,34 @@ public class ShareFileFragment extends Fragment { mListener = null; } - // Get users and groups to fill the "share with" list - public void refreshUsersOrGroupsList(){ - mShares = new ArrayList<>(); - - // Get Users and Groups - FileDataStorageManager fileDataStorageManager = - new FileDataStorageManager(mAccount, getActivity().getContentResolver()); - mShares = fileDataStorageManager.getSharesWithForAFile(mFile.getRemotePath(), - mAccount.name); - - // Update list of users/groups - updateListOfUserGroups(); + /** + * 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 + 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,55 +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); } } - 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; - } - }); - } - - private void unshareWith(OCShare share){ - OCFile file = ((FileActivity) getActivity()).getFile(); - - ((FileActivity) getActivity()).getFileOperationsHelper(). - unshareFileWithUserOrGroup( - file, share.getShareType(), share.getShareWith() - ); + @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 @@ -267,8 +252,8 @@ public class ShareFileFragment extends Fragment { */ public interface OnShareFragmentInteractionListener { void showSearchUsersAndGroups(); - - void onShareFragmentInteraction(Uri uri); + void refreshUsersOrGroupsListFromServer(); + void unshareWith(OCShare share); } }