Ver código fonte

Remove filename check for share

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 8 meses atrás
pai
commit
3f4edd02eb

+ 0 - 10
app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -675,12 +675,6 @@ public class ReceiveExternalFilesActivity extends FileActivity
             }
             mUploadPath = stringBuilder.toString();
 
-            boolean isPathValid = FileNameValidator.INSTANCE.checkFolderPath(mUploadPath, getCapabilities(), this);
-            if (!isPathValid) {
-                DisplayUtils.showSnackMessage(this, R.string.file_name_validator_error_contains_reserved_names_or_invalid_characters);
-                return;
-            }
-
             if (mUploadFromTmpFile) {
                 DialogInputUploadFilename dialog = DialogInputUploadFilename.newInstance(mSubjectText, mExtraText);
                 dialog.show(getSupportFragmentManager(), null);
@@ -952,10 +946,6 @@ public class ReceiveExternalFilesActivity extends FileActivity
                 messageResTitle = R.string.uploader_error_title_no_file_to_upload;
             } else if (resultCode == UriUploader.UriUploaderResultCode.ERROR_READ_PERMISSION_NOT_GRANTED) {
                 messageResId = R.string.uploader_error_message_read_permission_not_granted;
-            } else if (resultCode == UriUploader.UriUploaderResultCode.ERROR_UNKNOWN) {
-                messageResId = R.string.common_error_unknown;
-            } else if (resultCode == UriUploader.UriUploaderResultCode.INVALID_FILE_NAME) {
-                messageResId = R.string.file_name_validator_upload_content_error;
             }
 
             showErrorDialog(messageResId, messageResTitle);

+ 2 - 24
app/src/main/java/com/owncloud/android/ui/helpers/UriUploader.kt

@@ -15,7 +15,6 @@ import android.net.Uri
 import android.os.Parcelable
 import com.nextcloud.client.account.User
 import com.nextcloud.client.jobs.upload.FileUploadHelper
-import com.nextcloud.utils.fileNameValidator.FileNameValidator
 import com.owncloud.android.R
 import com.owncloud.android.files.services.NameCollisionPolicy
 import com.owncloud.android.lib.common.utils.Log_OC
@@ -25,7 +24,6 @@ import com.owncloud.android.ui.asynctasks.CopyAndUploadContentUrisTask
 import com.owncloud.android.ui.asynctasks.CopyAndUploadContentUrisTask.OnCopyTmpFilesTaskListener
 import com.owncloud.android.ui.fragment.TaskRetainerFragment
 import com.owncloud.android.utils.UriUtils.getDisplayNameForUri
-import java.io.File
 
 /**
  * This class examines URIs pointing to files to upload and then requests [FileUploadHelper] to upload them.
@@ -59,8 +57,7 @@ class UriUploader(
         ERROR_UNKNOWN,
         ERROR_NO_FILE_TO_UPLOAD,
         ERROR_READ_PERMISSION_NOT_GRANTED,
-        ERROR_SENSITIVE_PATH,
-        INVALID_FILE_NAME
+        ERROR_SENSITIVE_PATH
     }
 
     @Suppress("NestedBlockDepth")
@@ -74,25 +71,10 @@ class UriUploader(
                 Log_OC.e(TAG, "Sensitive URI detected, aborting upload.")
                 code = UriUploaderResultCode.ERROR_SENSITIVE_PATH
             } else {
-                var isFilenameValid = true
-
                 val uris = mUrisToUpload
                     .filterNotNull()
                     .map { it as Uri }
                     .map { Pair(it, getRemotePathForUri(it)) }
-                    .filter { (_, path) ->
-                        val file = File(path)
-                        val filename = file.name
-
-                        isFilenameValid = FileNameValidator.checkFileName(
-                            filename,
-                            mActivity.capabilities,
-                            mActivity,
-                            null
-                        ) == null
-
-                        isFilenameValid
-                    }
 
                 val fileUris = uris
                     .filter { it.first.scheme == ContentResolver.SCHEME_FILE }
@@ -107,11 +89,7 @@ class UriUploader(
                     val (contentUris, contentRemotePaths) = contentUrisNew.unzip()
                     copyThenUpload(contentUris.toTypedArray(), contentRemotePaths.toTypedArray())
                 } else if (fileUris.isEmpty()) {
-                    code = if (!isFilenameValid) {
-                        UriUploaderResultCode.INVALID_FILE_NAME
-                    } else {
-                        UriUploaderResultCode.ERROR_NO_FILE_TO_UPLOAD
-                    }
+                    code = UriUploaderResultCode.ERROR_NO_FILE_TO_UPLOAD
                 }
             }
         } catch (e: SecurityException) {

+ 0 - 1
app/src/main/res/values/strings.xml

@@ -1235,7 +1235,6 @@
     <string name="unified_search_fragment_permission_needed">Permissions are required to open search result otherwise it will redirected to web…</string>
     <string name="file_name_validator_current_path_is_invalid">Current folder name is invalid, please rename the folder. Redirecting home…</string>
     <string name="file_name_validator_rename_before_move_or_copy">%s. Please rename the file before moving or copying</string>
-    <string name="file_name_validator_upload_content_error">Some content cannot be uploaded since it contains reserved names or invalid characters</string>
     <string name="file_name_validator_error_contains_reserved_names_or_invalid_characters">Folder path contains reserved names or invalid characters</string>
     <string name="file_name_validator_error_invalid_character">Name contains invalid characters: %s</string>
     <string name="file_name_validator_error_reserved_names">%s is a forbidden name</string>