flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-08 08:26:10 +00:00
Code Issues Releases Wiki Activity

Prevent NullPointerException when OwncloudVersion is null in MoveRemoteFileOperation and RenameRemoteFileOperation

Browse Source
This commit is contained in:
masensio 2015-06-16 10:51:50 +02:00
parent 1811be1b52
commit dcad9157aa
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java
View File

@ -40,6 +40,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
import com.owncloud.android.lib.common.utils.Log_OC; import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.lib.resources.status.OwnCloudVersion;
/** /**
@ -89,9 +90,12 @@ public class MoveRemoteFileOperation extends RemoteOperation {
@Override @Override
protected RemoteOperationResult run(OwnCloudClient client) { protected RemoteOperationResult run(OwnCloudClient client) {
OwnCloudVersion version = client.getOwnCloudVersion();
boolean versionWithForbiddenChars =
(version != null && version.isVersionWithForbiddenCharacters());
/// check parameters /// check parameters
if (!FileUtils.isValidPath(mTargetRemotePath, if (!FileUtils.isValidPath(mTargetRemotePath, versionWithForbiddenChars)) {
client.getOwnCloudVersion().isVersionWithForbiddenCharacters())) {
return new RemoteOperationResult(ResultCode.INVALID_CHARACTER_IN_NAME); return new RemoteOperationResult(ResultCode.INVALID_CHARACTER_IN_NAME);
} }

7
src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java
View File

@ -34,6 +34,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperation;
import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
import com.owncloud.android.lib.common.utils.Log_OC; import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.lib.resources.status.OwnCloudVersion;
/** /**
@ -89,8 +90,10 @@ public class RenameRemoteFileOperation extends RemoteOperation {
LocalMoveMethod move = null; LocalMoveMethod move = null;
boolean noInvalidChars = FileUtils.isValidPath(mNewRemotePath, OwnCloudVersion version = client.getOwnCloudVersion();
client.getOwnCloudVersion().isVersionWithForbiddenCharacters()); boolean versionWithForbiddenChars =
(version != null && version.isVersionWithForbiddenCharacters());
boolean noInvalidChars = FileUtils.isValidPath(mNewRemotePath, versionWithForbiddenChars);
if (noInvalidChars) { if (noInvalidChars) {
try { try {