summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/values/strings.xml7
-rw-r--r--src/com/android/documentsui/CreateDirectoryFragment.java58
-rw-r--r--src/com/android/documentsui/dirlist/RenameDocumentFragment.java20
3 files changed, 43 insertions, 42 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 66e16b258..85950899c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -15,6 +15,13 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+ <!-- Error when rename does not have any string-->
+ <string name="missing_rename_error">You need to rename this</string>
+
+ <!-- Error to create new folder when name is not added -->
+ <string name="add_folder_name_error">You need to add a folder name</string>
+
<!-- Title of the Files application [CHAR LIMIT=32] -->
<string name="files_label">Files</string>
diff --git a/src/com/android/documentsui/CreateDirectoryFragment.java b/src/com/android/documentsui/CreateDirectoryFragment.java
index 9ef58839b..4b066edb6 100644
--- a/src/com/android/documentsui/CreateDirectoryFragment.java
+++ b/src/com/android/documentsui/CreateDirectoryFragment.java
@@ -25,7 +25,6 @@ import android.content.ContentProviderClient;
import android.content.ContentResolver;
import android.content.Context;
import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
@@ -37,6 +36,7 @@ import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
import android.view.inputmethod.EditorInfo;
+import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
import android.widget.TextView.OnEditorActionListener;
@@ -59,6 +59,9 @@ import com.google.android.material.textfield.TextInputLayout;
*/
public class CreateDirectoryFragment extends DialogFragment {
private static final String TAG_CREATE_DIRECTORY = "create_directory";
+ private @Nullable DialogInterface mDialog;
+ private EditText mEditText;
+ private TextInputLayout mInputWrapper;
public static void show(FragmentManager fm) {
if (fm.isStateSaved()) {
@@ -78,30 +81,20 @@ public class CreateDirectoryFragment extends DialogFragment {
final LayoutInflater dialogInflater = LayoutInflater.from(builder.getContext());
final View view = dialogInflater.inflate(R.layout.dialog_file_name, null, false);
- final EditText editText = (EditText) view.findViewById(android.R.id.text1);
+ mEditText = (EditText) view.findViewById(android.R.id.text1);
- final TextInputLayout inputWrapper = view.findViewById(R.id.input_wrapper);
- inputWrapper.setHint(getString(R.string.input_hint_new_folder));
+ mInputWrapper = view.findViewById(R.id.input_wrapper);
+ mInputWrapper.setHint(getString(R.string.input_hint_new_folder));
builder.setTitle(R.string.menu_create_dir);
builder.setView(view);
-
- builder.setPositiveButton(
- android.R.string.ok,
- new OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- createDirectory(editText.getText().toString());
- }
- });
-
+ builder.setPositiveButton(android.R.string.ok, null);
builder.setNegativeButton(android.R.string.cancel, null);
final AlertDialog dialog = builder.create();
-
+ dialog.setOnShowListener(this::onShowDialog);
// Workaround for the problem - virtual keyboard doesn't show on the phone.
Shared.ensureKeyboardPresent(context, dialog);
-
- editText.setOnEditorActionListener(
+ mEditText.setOnEditorActionListener(
new OnEditorActionListener() {
@Override
public boolean onEditorAction(
@@ -109,24 +102,39 @@ public class CreateDirectoryFragment extends DialogFragment {
if ((actionId == EditorInfo.IME_ACTION_DONE) || (event != null
&& event.getKeyCode() == KeyEvent.KEYCODE_ENTER
&& event.hasNoModifiers())) {
- createDirectory(editText.getText().toString());
- dialog.dismiss();
+ createDirectory(mEditText.getText().toString());
return true;
}
return false;
}
});
- editText.requestFocus();
+ mEditText.requestFocus();
return dialog;
}
- private void createDirectory(String name) {
- final BaseActivity activity = (BaseActivity) getActivity();
- final DocumentInfo cwd = activity.getCurrentDirectory();
+ private void onShowDialog(DialogInterface dialog) {
+ mDialog = dialog;
+ Button button = ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_POSITIVE);
+ button.setOnClickListener(this::onClickDialog);
+ }
+
+ private void onClickDialog(View view) {
+ createDirectory(mEditText.getText().toString());
+ }
- new CreateDirectoryTask(activity, cwd, name).executeOnExecutor(
- ProviderExecutor.forAuthority(cwd.authority));
+ private void createDirectory(String name) {
+ if (name.isEmpty()) {
+ mInputWrapper.setError(getContext().getString(
+ R.string.add_folder_name_error));
+ } else {
+ final BaseActivity activity = (BaseActivity) getActivity();
+ final DocumentInfo cwd = activity.getCurrentDirectory();
+
+ new CreateDirectoryTask(activity, cwd, name).executeOnExecutor(
+ ProviderExecutor.forAuthority(cwd.authority));
+ mDialog.dismiss();
+ }
}
private class CreateDirectoryTask extends AsyncTask<Void, Void, DocumentInfo> {
diff --git a/src/com/android/documentsui/dirlist/RenameDocumentFragment.java b/src/com/android/documentsui/dirlist/RenameDocumentFragment.java
index f46c4e54f..12873a218 100644
--- a/src/com/android/documentsui/dirlist/RenameDocumentFragment.java
+++ b/src/com/android/documentsui/dirlist/RenameDocumentFragment.java
@@ -158,16 +158,6 @@ public class RenameDocumentFragment extends DialogFragment {
}
/**
- * Validates if string is a proper document name.
- * Checks if string is not empty. More rules might be added later.
- * @param docName string representing document name
- * @returns true if string is a valid name.
- **/
- private boolean isValidDocumentName(String docName) {
- return !docName.isEmpty();
- }
-
- /**
* Fills text field with the file name and selects the name without extension.
*
* @param editText text field to be filled
@@ -193,17 +183,13 @@ public class RenameDocumentFragment extends DialogFragment {
if (newDisplayName.equals(mDocument.displayName)) {
mDialog.dismiss();
- } else if (!isValidDocumentName(newDisplayName)) {
- Log.w(TAG, "Failed to rename file - invalid name:" + newDisplayName);
- mRenameInputWrapper.setError(getContext().getString(R.string.rename_error));
- Metrics.logRenameFileError();
- } else if (activity.getInjector().getModel().hasFileWithName(newDisplayName)){
+ } else if (newDisplayName.isEmpty()) {
+ mRenameInputWrapper.setError(getContext().getString(R.string.missing_rename_error));
+ } else if (activity.getInjector().getModel().hasFileWithName(newDisplayName)) {
mRenameInputWrapper.setError(getContext().getString(R.string.name_conflict));
selectFileName(mEditText);
- Metrics.logRenameFileError();
} else {
new RenameDocumentsTask(activity, newDisplayName).execute(mDocument);
-
if (mDialog != null) {
mDialog.dismiss();
}
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-10-20 11:24:58 +0000