Skip to content

SpotBugs: Fix Method ignores exceptional return value - FileStorageUtils #15597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

SpotBugs: Fix Method ignores exceptional return value - FileStorageUtils #15597

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 2 additions & 53 deletions app/src/main/java/com/owncloud/android/utils/FileStorageUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,9 @@
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.lib.resources.files.model.RemoteFile;
import com.owncloud.android.lib.resources.shares.ShareeUser;
import com.owncloud.android.ui.helpers.FileOperationsHelper;

import org.apache.commons.io.FilenameUtils;

import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
Expand All @@ -40,6 +39,7 @@
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
Expand All @@ -57,7 +57,6 @@
import androidx.annotation.VisibleForTesting;
import androidx.core.app.ActivityCompat;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import kotlin.Pair;

/**
* Static methods to help in access to local file system.
Expand All @@ -74,56 +73,6 @@ private FileStorageUtils() {
// utility class -> private constructor
}

public static boolean containsBidiControlCharacters(String filename) {
if (filename == null) return false;

String decoded;
try {
decoded = URLDecoder.decode(filename, StandardCharsets.UTF_8.toString());
} catch (UnsupportedEncodingException e) {
return false;
}

int[] bidiControlCharacters = {
0x202A, 0x202B, 0x202C, 0x202D, 0x202E,
0x200E, 0x200F, 0x2066, 0x2067, 0x2068,
0x2069, 0x061C
};

for (int i = 0; i < decoded.length(); i++) {
int codePoint = decoded.codePointAt(i);
for (int chars : bidiControlCharacters) {
if (codePoint == chars) {
return true;
}
}
}

for (char c : decoded.toCharArray()) {
if (c < 32) return true;
}

return false;
}

public static Pair<String,String> getFilenameAndExtension(String filename, boolean isFolder, boolean isRTL) {
if (isFolder) {
return new Pair<>(filename, "");
}

final String base = FilenameUtils.getBaseName(filename);
String extension = FilenameUtils.getExtension(filename);
if (!extension.isEmpty()) {
extension = StringConstants.DOT + extension;
}

if (isRTL) {
return new Pair<>(extension, base);
} else {
return new Pair<>(base, extension);
}
}

public static boolean isValidExtFilename(String name) {
for (int i = 0; i < name.length(); i++) {
char c = name.charAt(i);
Expand Down
Loading