X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/ad7666370f248124a6c49846f78cd3cef71f19f0..6c1c63ac16d98fd94dd9adfcf0ae7480fdabcd70:/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 838635ae..d9a9b44a 100644 --- a/src/com/owncloud/android/ui/fragment/ShareFileFragment.java +++ b/src/com/owncloud/android/ui/fragment/ShareFileFragment.java @@ -99,15 +99,14 @@ public class ShareFileFragment extends Fragment private CompoundButton.OnCheckedChangeListener mOnShareViaLinkSwitchCheckedChangeListener; /** - * Listener for changes on switch to set / clear password on public link + * Listener for user actions to set, update or clear password on public link */ - private CompoundButton.OnCheckedChangeListener mOnPasswordSwitchCheckedChangeListener; + private OnPasswordInteractionListener mOnPasswordInteractionListener = null; /** - * Listener for changes on switch to set / clear expiration date on public link + * Listener for user actions to set, update or clear expiration date on public link */ - private CompoundButton.OnCheckedChangeListener mOnExpirationDateSwitchCheckedChangeListener; - + private OnExpirationDateInteractionListener mOnExpirationDateInteractionListener = null; /** * Public factory method to create new ShareFileFragment instances. @@ -141,6 +140,7 @@ public class ShareFileFragment extends Fragment } } + /** * {@inheritDoc} */ @@ -212,66 +212,169 @@ public class ShareFileFragment extends Fragment Switch shareViaLinkSwitch = (Switch) view.findViewById(R.id.shareViaLinkSectionSwitch); shareViaLinkSwitch.setOnCheckedChangeListener(mOnShareViaLinkSwitchCheckedChangeListener); - // Switch for expiration date - mOnExpirationDateSwitchCheckedChangeListener = new CompoundButton.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - if (!isResumed()) { - // very important, setCheched(...) is called automatically during - // Fragment recreation on device rotations - return; - } - if (isChecked) { - ExpirationDatePickerDialogFragment dialog = - ExpirationDatePickerDialogFragment.newInstance(mFile); - dialog.show( - getActivity().getSupportFragmentManager(), - ExpirationDatePickerDialogFragment.DATE_PICKER_DIALOG - ); + // Set listener for user actions on expiration date + initExpirationListener(view); - } else { - ((FileActivity) getActivity()).getFileOperationsHelper(). - setExpirationDateToShareViaLink(mFile, -1, -1, -1); - } + // Set listener for user actions on password + initPasswordListener(view); + + return view; + } + + + /** + * Binds listener for user actions that start any update on a expiration date + * for the public link to the views receiving the user events. + * + * @param shareView Root view in the fragment. + */ + private void initExpirationListener(View shareView) { + mOnExpirationDateInteractionListener = new OnExpirationDateInteractionListener(); + + ((Switch) shareView.findViewById(R.id.shareViaLinkExpirationSwitch)). + setOnCheckedChangeListener(mOnExpirationDateInteractionListener); + + shareView.findViewById(R.id.shareViaLinkExpirationLabel). + setOnClickListener(mOnExpirationDateInteractionListener); - // undo the toggle to grant the view will be correct if the dialog is cancelled - buttonView.setOnCheckedChangeListener(null); - buttonView.toggle(); - buttonView.setOnCheckedChangeListener(mOnExpirationDateSwitchCheckedChangeListener); + shareView.findViewById(R.id.shareViaLinkExpirationValue). + setOnClickListener(mOnExpirationDateInteractionListener); + } + + /** + * Listener for user actions that start any update on the expiration date for the public link. + */ + private class OnExpirationDateInteractionListener + implements CompoundButton.OnCheckedChangeListener, View.OnClickListener { + + /** + * Called by R.id.shareViaLinkExpirationSwitch to set or clear the expiration date. + * + * @param switchView {@link Switch} toggled by the user, R.id.shareViaLinkExpirationSwitch + * @param isChecked New switch state. + */ + @Override + public void onCheckedChanged(CompoundButton switchView, boolean isChecked) { + if (!isResumed()) { + // very important, setCheched(...) is called automatically during + // Fragment recreation on device rotations + return; } - }; - Switch shareViaLinkExpirationSwitch = (Switch) view.findViewById(R.id.shareViaLinkExpirationSwitch); - shareViaLinkExpirationSwitch.setOnCheckedChangeListener(mOnExpirationDateSwitchCheckedChangeListener); + if (isChecked) { + ExpirationDatePickerDialogFragment dialog = + ExpirationDatePickerDialogFragment.newInstance(mFile, -1); + dialog.show( + getActivity().getSupportFragmentManager(), + ExpirationDatePickerDialogFragment.DATE_PICKER_DIALOG + ); - // Switch for password - mOnPasswordSwitchCheckedChangeListener = new CompoundButton.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - if (!isResumed()) { - // very important, setCheched(...) is called automatically during - // Fragment recreation on device rotations - return; - } - if (isChecked) { - ((FileActivity) getActivity()).getFileOperationsHelper(). - requestPasswordForShareViaLink(mFile); - } else { - ((FileActivity) getActivity()).getFileOperationsHelper(). - setPasswordToShareViaLink(mFile, ""); // "" clears + } else { + ((FileActivity) getActivity()).getFileOperationsHelper(). + setExpirationDateToShareViaLink(mFile, -1); + } + + // undo the toggle to grant the view will be correct if the dialog is cancelled + switchView.setOnCheckedChangeListener(null); + switchView.toggle(); + switchView.setOnCheckedChangeListener(mOnExpirationDateInteractionListener); + } + + /** + * Called by R.id.shareViaLinkExpirationLabel or R.id.shareViaLinkExpirationValue + * to change the current expiration date. + * + * @param expirationView Label or value view touched by the user. + */ + @Override + public void onClick(View expirationView) { + if (mPublicShare != null && mPublicShare.getExpirationDate() > 0) { + long chosenDateInMillis = -1; + if (mPublicShare != null) { + chosenDateInMillis = mPublicShare.getExpirationDate(); } + ExpirationDatePickerDialogFragment dialog = + ExpirationDatePickerDialogFragment.newInstance( + mFile, + chosenDateInMillis + ); + dialog.show( + getActivity().getSupportFragmentManager(), + ExpirationDatePickerDialogFragment.DATE_PICKER_DIALOG + ); + } + } + } - // undo the toggle to grant the view will be correct if the dialog is cancelled - buttonView.setOnCheckedChangeListener(null); - buttonView.toggle(); - buttonView.setOnCheckedChangeListener(mOnPasswordSwitchCheckedChangeListener); + + /** + * Binds listener for user actions that start any update on a password for the public link + * to the views receiving the user events. + * + * @param shareView Root view in the fragment. + */ + private void initPasswordListener(View shareView) { + mOnPasswordInteractionListener = new OnPasswordInteractionListener(); + + ((Switch) shareView.findViewById(R.id.shareViaLinkPasswordSwitch)). + setOnCheckedChangeListener(mOnPasswordInteractionListener); + + shareView.findViewById(R.id.shareViaLinkPasswordLabel). + setOnClickListener(mOnPasswordInteractionListener); + + shareView.findViewById(R.id.shareViaLinkPasswordValue). + setOnClickListener(mOnPasswordInteractionListener); + } + + + /** + * Listener for user actions that start any update on a password for the public link. + */ + private class OnPasswordInteractionListener + implements CompoundButton.OnCheckedChangeListener, View.OnClickListener { + + /** + * Called by R.id.shareViaLinkPasswordSwitch to set or clear the password. + * + * @param switchView {@link Switch} toggled by the user, R.id.shareViaLinkPasswordSwitch + * @param isChecked New switch state. + */ + @Override + public void onCheckedChanged(CompoundButton switchView, boolean isChecked) { + if (!isResumed()) { + // very important, setCheched(...) is called automatically during + // Fragment recreation on device rotations + return; + } + if (isChecked) { + ((FileActivity) getActivity()).getFileOperationsHelper(). + requestPasswordForShareViaLink(mFile); + } else { + ((FileActivity) getActivity()).getFileOperationsHelper(). + setPasswordToShareViaLink(mFile, ""); // "" clears } - }; - Switch shareViaLinkPasswordSwitch = (Switch) view.findViewById(R.id.shareViaLinkPasswordSwitch); - shareViaLinkPasswordSwitch.setOnCheckedChangeListener(mOnShareViaLinkSwitchCheckedChangeListener); - return view; + // undo the toggle to grant the view will be correct if the dialog is cancelled + switchView.setOnCheckedChangeListener(null); + switchView.toggle(); + switchView.setOnCheckedChangeListener(mOnPasswordInteractionListener); + } + + /** + * Called by R.id.shareViaLinkPasswordLabel or R.id.shareViaLinkPasswordValue + * to change the current password. + * + * @param passwordView Label or value view touched by the user. + */ + @Override + public void onClick(View passwordView) { + if (mPublicShare != null && mPublicShare.isPasswordProtected()) { + ((FileActivity) getActivity()).getFileOperationsHelper(). + requestPasswordForShareViaLink(mFile); + } + } } + @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); @@ -416,7 +519,7 @@ public class ShareFileFragment extends Fragment } // recover listener expirationDateSwitch.setOnCheckedChangeListener( - mOnExpirationDateSwitchCheckedChangeListener + mOnExpirationDateInteractionListener ); /// update state of password switch and message depending on password protection @@ -436,7 +539,7 @@ public class ShareFileFragment extends Fragment } // recover listener passwordSwitch.setOnCheckedChangeListener( - mOnPasswordSwitchCheckedChangeListener + mOnPasswordInteractionListener );