X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/c4f6cac7659ddfce23a51027e7a41bb99e6e7c0b..19cf573db0abc90b221ba912a94dbab33a9e3391:/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 a0296533..db1e98d3 100644 --- a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java +++ b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java @@ -26,12 +26,15 @@ import android.app.Activity; import android.graphics.Bitmap; import android.os.Bundle; import android.support.v4.app.Fragment; +import android.support.v7.widget.AppCompatButton; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import android.widget.CompoundButton; import android.widget.ImageView; import android.widget.ListView; +import android.widget.Switch; import android.widget.TextView; import android.widget.Toast; @@ -41,8 +44,8 @@ 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.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.MimetypeIconUtil; @@ -50,7 +53,8 @@ import com.owncloud.android.utils.MimetypeIconUtil; import java.util.ArrayList; /** - * Fragment for Sharing a file with sharees (users or groups) + * Fragment for Sharing a file with sharees (users or groups) or creating + * a public link. * * A simple {@link Fragment} subclass. * @@ -70,15 +74,28 @@ public class ShareFileFragment extends Fragment private static final String ARG_FILE = "FILE"; private static final String ARG_ACCOUNT = "ACCOUNT"; - // Parameters + /** File to share, received as a parameter in construction time */ private OCFile mFile; + + /** OC account holding the file to share, received as a parameter in construction time */ private Account mAccount; - // other members - private ArrayList mShares; - private ShareUserListAdapter mUserGroupsAdapter = null; + /** Reference to parent listener */ private OnShareFragmentInteractionListener mListener; + /** List of private shares bound to the file */ + private ArrayList mPrivateShares; + + /** Adapter to show private shares */ + private ShareUserListAdapter mUserGroupsAdapter = null; + + /** Public share bound to the file */ + private OCShare mPublicShare; + + /** Listener for changes on switch to share / unshare publicly */ + private CompoundButton.OnCheckedChangeListener mOnShareViaLinkSwitchCheckedChangeListener; + + /** * Public factory method to create new ShareFileFragment instances. * @@ -149,7 +166,7 @@ public class ShareFileFragment extends Fragment addUserGroupButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - boolean shareWithUsersEnable = AccountUtils.hasSearchUsersSupport(mAccount); + boolean shareWithUsersEnable = AccountUtils.hasSearchUsersSupport(mAccount); if (shareWithUsersEnable) { // Show Search Fragment mListener.showSearchUsersAndGroups(); @@ -160,6 +177,61 @@ public class ShareFileFragment extends Fragment } }); + // Switch to create public share + mOnShareViaLinkSwitchCheckedChangeListener = new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + if (isResumed()) { + if (isChecked) { + ((FileActivity) getActivity()).getFileOperationsHelper().shareFileViaLink(mFile); + + } else { + ((FileActivity) getActivity()).getFileOperationsHelper().unshareFileViaLink(mFile); + } + } // else, nothing; very important, setCheched(...) is called automatically during Fragment + // recreation on device rotations + } + }; + Switch shareViaLinkSwitch = (Switch) view.findViewById(R.id.shareViaLinkSectionSwitch); + shareViaLinkSwitch.setOnCheckedChangeListener(mOnShareViaLinkSwitchCheckedChangeListener); + + // Switch for expiration date + Switch shareViaLinkExpirationSwitch = (Switch) view.findViewById(R.id.shareViaLinkExpirationSwitch); + shareViaLinkExpirationSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + if (isChecked) { + // TODO real implementation: update share with expiration date + // show value of expiration date + getExpirationDateValue().setText(R.string.placeholder_timestamp); + + } else { + // TODO real implementation: update share without expiration date + // empty value + getExpirationDateValue().setText(R.string.empty); + } + } + }); + + // Switch for password + Switch shareViaLinkPasswordSwitch = (Switch) view.findViewById(R.id.shareViaLinkPasswordSwitch); + shareViaLinkPasswordSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + if (isChecked) { + // TODO real implementation: update share with password + // show + getExpirationPasswordValue().setVisibility(View.VISIBLE); + + } else { + // TODO real implementation: update share without password + // empty value + getExpirationPasswordValue().setVisibility(View.INVISIBLE); + } + } + }); + + return view; } @@ -167,8 +239,11 @@ public class ShareFileFragment extends Fragment public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - // Load data into the list + // Load data into the list of private shares refreshUsersOrGroupsListFromDB(); + + // Load data of public share, if exists + refreshPublicShareFromDB(); } @Override @@ -197,7 +272,7 @@ public class ShareFileFragment extends Fragment public void refreshUsersOrGroupsListFromDB (){ if (((FileActivity) mListener).getStorageManager() != null) { // Get Users and Groups - mShares = ((FileActivity) mListener).getStorageManager().getSharesWithForAFile( + mPrivateShares = ((FileActivity) mListener).getStorageManager().getSharesWithForAFile( mFile.getRemotePath(), mAccount.name ); @@ -213,7 +288,7 @@ public class ShareFileFragment extends Fragment mUserGroupsAdapter = new ShareUserListAdapter( getActivity(), R.layout.share_user_item, - mShares, + mPrivateShares, this ); @@ -221,7 +296,7 @@ public class ShareFileFragment extends Fragment TextView noShares = (TextView) getView().findViewById(R.id.shareNoUsers); ListView usersList = (ListView) getView().findViewById(R.id.shareUsersList); - if (mShares.size() > 0) { + if (mPrivateShares.size() > 0) { noShares.setVisibility(View.GONE); usersList.setVisibility(View.VISIBLE); usersList.setAdapter(mUserGroupsAdapter); @@ -240,6 +315,88 @@ public class ShareFileFragment extends Fragment } + + /** + * Get public link from the DB to fill in the "Share link" section + * + * Depends on the parent Activity provides a {@link com.owncloud.android.datamodel.FileDataStorageManager} + * instance ready to use. If not ready, does nothing. + */ + public void refreshPublicShareFromDB() { + if (((FileActivity) mListener).getStorageManager() != null) { + // Get public share + mPublicShare = ((FileActivity) mListener).getStorageManager().getFirstShareByPathAndType( + mFile.getRemotePath(), + ShareType.PUBLIC_LINK, + "" + ); + + // Update list of users/groups + updatePublicShareSection(); + } + } + + /** + * Updates in the UI the section about public share with the information in the current + * public share bound to mFile, if any + */ + private void updatePublicShareSection() { + if (mPublicShare != null && ShareType.PUBLIC_LINK.equals(mPublicShare.getShareType())) { + // public share bound -> expand section + Switch shareViaLinkSwitch = getShareViaLinkSwitch(); + if (!shareViaLinkSwitch.isChecked()) { + // set null listener before setChecked() to prevent infinite loop of calls + shareViaLinkSwitch.setOnCheckedChangeListener(null); + getShareViaLinkSwitch().setChecked(true); + shareViaLinkSwitch.setOnCheckedChangeListener( + mOnShareViaLinkSwitchCheckedChangeListener + ); + } + getExpirationDateSection().setVisibility(View.VISIBLE); + getPasswordSection().setVisibility(View.VISIBLE); + getGetLinkButton().setVisibility(View.VISIBLE); + + } else { + // no public share -> collapse section + Switch shareViaLinkSwitch = getShareViaLinkSwitch(); + if (shareViaLinkSwitch.isChecked()) { + shareViaLinkSwitch.setOnCheckedChangeListener(null); + getShareViaLinkSwitch().setChecked(false); + shareViaLinkSwitch.setOnCheckedChangeListener( + mOnShareViaLinkSwitchCheckedChangeListener + ); + } + getExpirationDateSection().setVisibility(View.GONE); + getPasswordSection().setVisibility(View.GONE); + getGetLinkButton().setVisibility(View.GONE); + } + } + + private Switch getShareViaLinkSwitch() { + return (Switch) getView().findViewById(R.id.shareViaLinkSectionSwitch); + } + + private View getExpirationDateSection() { + return getView().findViewById(R.id.shareViaLinkExpirationSection); + } + + private TextView getExpirationDateValue() { + return (TextView) getView().findViewById(R.id.shareViaLinkExpirationValue); + } + + private View getPasswordSection() { + return getView().findViewById(R.id.shareViaLinkPasswordSection); + } + + private TextView getExpirationPasswordValue() { + return (TextView) getView().findViewById(R.id.shareViaLinkPasswordValue); + } + + private AppCompatButton getGetLinkButton() { + return (AppCompatButton) getView().findViewById(R.id.shareViewLinkGetLinkButton); + } + + /** * This interface must be implemented by activities that contain this * fragment to allow an interaction in this fragment to be communicated