Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcad9157 authored by masensio's avatar masensio
Browse files

Prevent NullPointerException when OwncloudVersion is null in... 

Prevent NullPointerException when OwncloudVersion is null in MoveRemoteFileOperation and RenameRemoteFileOperation
parent 1811be1b

src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java

+7 −3
Original line number Diff line number Diff line
@@ -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.ResultCode;

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

	protected RemoteOperationResult run(OwnCloudClient client) {



		OwnCloudVersion version = client.getOwnCloudVersion();

		boolean versionWithForbiddenChars =

                (version != null && version.isVersionWithForbiddenCharacters());



    	/// check parameters

        if (!FileUtils.isValidPath(mTargetRemotePath,

                client.getOwnCloudVersion().isVersionWithForbiddenCharacters())) {

        if (!FileUtils.isValidPath(mTargetRemotePath, versionWithForbiddenChars)) {

        	return new RemoteOperationResult(ResultCode.INVALID_CHARACTER_IN_NAME);

        }

src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java

+6 −3
Original line number Diff line number Diff line
@@ -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.ResultCode;

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;



        boolean noInvalidChars = FileUtils.isValidPath(mNewRemotePath,

                client.getOwnCloudVersion().isVersionWithForbiddenCharacters());

        OwnCloudVersion version = client.getOwnCloudVersion();

        boolean versionWithForbiddenChars =

                (version != null && version.isVersionWithForbiddenCharacters());

        boolean noInvalidChars = FileUtils.isValidPath(mNewRemotePath, versionWithForbiddenChars);

        

        if (noInvalidChars) {

            try {