import android.accounts.Account;
import android.app.Activity;
+import android.content.DialogInterface;
import android.graphics.Bitmap;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import com.owncloud.android.lib.resources.shares.ShareType;
import com.owncloud.android.ui.activity.FileActivity;
import com.owncloud.android.ui.adapter.ShareUserListAdapter;
+import com.owncloud.android.ui.dialog.ExpirationDatePickerDialogFragment;
import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.utils.MimetypeIconUtil;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
/**
* Fragment for Sharing a file with sharees (users or groups) or creating
/** Listener for changes on switch to share / unshare publicly */
private CompoundButton.OnCheckedChangeListener mOnShareViaLinkSwitchCheckedChangeListener;
- /** Listener for changes on switch to set / clear password on public link */
- private CompoundButton.OnCheckedChangeListener mOnPasswordSwitchCheckedChangeListener;
+ /**
+ * Listener for user actions to set, update or clear password on public link
+ */
+ //private CompoundButton.OnCheckedChangeListener mOnPasswordSwitchCheckedChangeListener;
+ private OnPasswordInteractionListener mOnPasswordInteractionListener;
+
+ /**
+ * Listener for changes on switch to set / clear expiration date on public link
+ */
+ private CompoundButton.OnCheckedChangeListener mOnExpirationDateSwitchCheckedChangeListener;
/**
}
}
+
/**
* {@inheritDoc}
*/
shareViaLinkSwitch.setOnCheckedChangeListener(mOnShareViaLinkSwitchCheckedChangeListener);
// Switch for expiration date
- Switch shareViaLinkExpirationSwitch = (Switch) view.findViewById(R.id.shareViaLinkExpirationSwitch);
- shareViaLinkExpirationSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ mOnExpirationDateSwitchCheckedChangeListener = new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (!isResumed()) {
return;
}
if (isChecked) {
- // TODO real implementation: update share with expiration date
- // show value of expiration date
- getExpirationDateValue().setText(R.string.placeholder_timestamp);
+ ExpirationDatePickerDialogFragment dialog =
+ ExpirationDatePickerDialogFragment.newInstance(mFile);
+ dialog.show(
+ getActivity().getSupportFragmentManager(),
+ ExpirationDatePickerDialogFragment.DATE_PICKER_DIALOG
+ );
} else {
- // TODO real implementation: update share without expiration date
- // empty value
- getExpirationDateValue().setText(R.string.empty);
- }
- }
- });
-
- // 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
+ setExpirationDateToShareViaLink(mFile, -1, -1, -1);
}
+
+ // undo the toggle to grant the view will be correct if the dialog is cancelled
+ buttonView.setOnCheckedChangeListener(null);
+ buttonView.toggle();
+ buttonView.setOnCheckedChangeListener(mOnExpirationDateSwitchCheckedChangeListener);
}
};
- Switch shareViaLinkPasswordSwitch = (Switch) view.findViewById(R.id.shareViaLinkPasswordSwitch);
- shareViaLinkPasswordSwitch.setOnCheckedChangeListener(mOnShareViaLinkSwitchCheckedChangeListener);
+ Switch shareViaLinkExpirationSwitch = (Switch) view.findViewById(R.id.shareViaLinkExpirationSwitch);
+ shareViaLinkExpirationSwitch.setOnCheckedChangeListener(mOnExpirationDateSwitchCheckedChangeListener);
+
+ // Set listener for user actions on password
+ initPasswordListener(view);
return view;
}
+ /**
+ * 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 shareViaLinkPasswordSwitch = (Switch) shareView.findViewById(R.id.shareViaLinkPasswordSwitch);
+ shareViaLinkPasswordSwitch.setOnCheckedChangeListener(mOnPasswordInteractionListener);
+ TextView shareViaLinkPasswordLabel = (TextView) shareView.findViewById(R.id.shareViaLinkPasswordLabel);
+ shareViaLinkPasswordLabel.setOnClickListener(mOnPasswordInteractionListener);
+ TextView shareViaLinkPasswordValue = (TextView) shareView.findViewById(R.id.shareViaLinkPasswordValue);
+ 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 {
+
+ @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
+ }
+
+ // undo the toggle to grant the view will be correct if the dialog is cancelled
+ buttonView.setOnCheckedChangeListener(null);
+ buttonView.toggle();
+ buttonView.setOnCheckedChangeListener(mOnPasswordInteractionListener);
+ }
+
+ @Override
+ public void onClick(View v) {
+ if (mPublicShare != null && mPublicShare.isPasswordProtected()) {
+ ((FileActivity) getActivity()).getFileOperationsHelper().
+ requestPasswordForShareViaLink(mFile);
+ }
+ }
+ }
+
+
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
}
/**
- * Get users and groups from the DB to fill in the "share with" list
+ * 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.
/**
- * Get public link from the DB to fill in the "Share link" section
+ * Get public link from the DB to fill in the "Share link" section in the UI.
*
* Depends on the parent Activity provides a {@link com.owncloud.android.datamodel.FileDataStorageManager}
* instance ready to use. If not ready, does nothing.
""
);
- // Update list of users/groups
+ // Update public share section
updatePublicShareSection();
}
}
getPasswordSection().setVisibility(View.VISIBLE);
getGetLinkButton().setVisibility(View.VISIBLE);
+ /// update state of expiration date switch and message depending on expiration date
+ /// update state of expiration date switch and message depending on expiration date
+ Switch expirationDateSwitch = getExpirationDateSwitch();
+ // set null listener before setChecked() to prevent infinite loop of calls
+ expirationDateSwitch.setOnCheckedChangeListener(null);
+ long expirationDate = mPublicShare.getExpirationDate();
+ if (expirationDate > 0) {
+ if (!expirationDateSwitch.isChecked()) {
+ expirationDateSwitch.toggle();
+ }
+ String formattedDate =
+ SimpleDateFormat.getDateInstance().format(
+ new Date(expirationDate)
+ );
+ getExpirationDateValue().setText(formattedDate);
+ } else {
+ if (expirationDateSwitch.isChecked()) {
+ expirationDateSwitch.toggle();
+ }
+ getExpirationDateValue().setText(R.string.empty);
+ }
+ // recover listener
+ expirationDateSwitch.setOnCheckedChangeListener(
+ mOnExpirationDateSwitchCheckedChangeListener
+ );
+
/// update state of password switch and message depending on password protection
Switch passwordSwitch = getPasswordSwitch();
// set null listener before setChecked() to prevent infinite loop of calls
}
// recover listener
passwordSwitch.setOnCheckedChangeListener(
- mOnPasswordSwitchCheckedChangeListener
+ mOnPasswordInteractionListener
);
}
}
+
/// BEWARE: next methods will failed with NullPointerException if called before onCreateView() finishes
private Switch getShareViaLinkSwitch() {
return getView().findViewById(R.id.shareViaLinkExpirationSection);
}
+ private Switch getExpirationDateSwitch() {
+ return (Switch) getView().findViewById(R.id.shareViaLinkExpirationSwitch);
+ }
+
private TextView getExpirationDateValue() {
return (TextView) getView().findViewById(R.id.shareViaLinkExpirationValue);
}
projects / pub / Android / ownCloud.git / blobdiff