X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/fcf4f1238da1b084aafdb88753eed511b948b54b..6b84d83b3544f8de4e56186f6ecbccd3d612702b:/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java diff --git a/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java b/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java index 72f40f97..28419e62 100644 --- a/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java +++ b/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java @@ -39,6 +39,8 @@ import com.owncloud.android.ui.dialog.ConfirmationDialogFragment.ConfirmationDia public class RemoveFileDialogFragment extends ConfirmationDialogFragment implements ConfirmationDialogFragmentListener { + private OCFile mTargetFile; + private static final String ARG_TARGET_FILE = "TARGET_FILE"; /** @@ -54,29 +56,26 @@ implements ConfirmationDialogFragmentListener { int messageStringId = R.string.confirmation_remove_alert; int posBtn = R.string.confirmation_remove_remote; - int neuBtn = -1; + int negBtn = -1; if (file.isFolder()) { messageStringId = R.string.confirmation_remove_folder_alert; posBtn = R.string.confirmation_remove_remote_and_local; - neuBtn = R.string.confirmation_remove_folder_local; + negBtn = R.string.confirmation_remove_local; } else if (file.isDown()) { posBtn = R.string.confirmation_remove_remote_and_local; - neuBtn = R.string.confirmation_remove_local; + negBtn = R.string.confirmation_remove_local; } - args.putInt(ARG_CONF_RESOURCE_ID, messageStringId); args.putStringArray(ARG_CONF_ARGUMENTS, new String[]{file.getFileName()}); args.putInt(ARG_POSITIVE_BTN_RES, posBtn); - args.putInt(ARG_NEUTRAL_BTN_RES, neuBtn); - args.putInt(ARG_NEGATIVE_BTN_RES, R.string.common_cancel); + args.putInt(ARG_NEUTRAL_BTN_RES, R.string.common_no); + args.putInt(ARG_NEGATIVE_BTN_RES, negBtn); args.putParcelable(ARG_TARGET_FILE, file); frag.setArguments(args); return frag; } - - private OCFile mTargetFile; @Override public Dialog onCreateDialog(Bundle savedInstanceState) { @@ -104,7 +103,7 @@ implements ConfirmationDialogFragmentListener { * Performs the removal of the local copy of the target file */ @Override - public void onNeutral(String callerTag) { + public void onCancel(String callerTag) { ComponentsGetter cg = (ComponentsGetter)getActivity(); cg.getFileOperationsHelper().removeFile(mTargetFile, true); @@ -138,8 +137,7 @@ implements ConfirmationDialogFragmentListener { } @Override - public void onCancel(String callerTag) { + public void onNeutral(String callerTag) { // nothing to do here } - } \ No newline at end of file