diff options
author | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-08-18 15:24:29 -0400 |
---|---|---|
committer | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-08-18 15:24:29 -0400 |
commit | ae37d9852744884c8d8d456eb7eadfbd06189193 (patch) | |
tree | 66d660b1415629b4ce09f3bf3bf91e3e95f1d0ed | |
parent | 09dfd3f5c54d91c975a0905f01f0b537baba462e (diff) | |
download | sdl_android-ae37d9852744884c8d8d456eb7eadfbd06189193.tar.gz |
Remove onError from FileManager
-rw-r--r-- | base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java | 71 |
1 files changed, 30 insertions, 41 deletions
diff --git a/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java b/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java index c08cb17e0..1cb380023 100644 --- a/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java @@ -146,24 +146,21 @@ abstract class BaseFileManager extends BaseSubManager { @Override public void onResponse(int correlationId, RPCResponse response) { ListFilesResponse listFilesResponse = (ListFilesResponse) response; - if(listFilesResponse.getSuccess()){ + if (listFilesResponse.getSuccess()) { bytesAvailable = listFilesResponse.getSpaceAvailable() != null ? listFilesResponse.getSpaceAvailable() : SPACE_AVAILABLE_MAX_VALUE; - if(listFilesResponse.getFilenames() != null){ + if (listFilesResponse.getFilenames() != null) { remoteFiles.addAll(listFilesResponse.getFilenames()); } // on callback set manager to ready state transitionToState(BaseSubManager.READY); + } else { + // file list could not be received. assume that setting can work and allow SDLManager to start + DebugTool.logError(TAG, "File Manager could not list files"); + bytesAvailable = SPACE_AVAILABLE_MAX_VALUE; + transitionToState(BaseSubManager.READY); } } - - @Override - public void onError(int correlationId, Result resultCode, String info) { - // file list could not be received. assume that setting can work and allow SDLManager to start - DebugTool.logError(TAG, "File Manager could not list files"); - bytesAvailable = SPACE_AVAILABLE_MAX_VALUE; - transitionToState(BaseSubManager.READY); - } }); internalInterface.sendRPC(listFiles); } @@ -273,23 +270,6 @@ abstract class BaseFileManager extends BaseSubManager { } @Override - public void onError(int correlationId, Result resultCode, String info) { - final RPCRequest request = requestMap.get(correlationId); - if (request != null) { - if (!deletionOperation) { - if (shouldReUploadFile(((PutFile) request).getSdlFileName(), ((PutFile) request).getFileType())) { - request.setOnRPCResponseListener(null); - requestsToResend.add(request); - } else { - errors.put(((PutFile) request).getSdlFileName(), buildErrorString(resultCode, info)); - } - } else { - errors.put(((DeleteFile) request).getSdlFileName(), buildErrorString(resultCode, info)); - } - } - } - - @Override public void onResponse(int correlationId, RPCResponse response) { if (response.getSuccess()) { if (response instanceof PutFileResponse) { @@ -310,9 +290,22 @@ abstract class BaseFileManager extends BaseSubManager { uploadedEphemeralFileNames.remove(((DeleteFile) requestMap.get(correlationId)).getSdlFileName()); } } + } else { + final RPCRequest request = requestMap.get(correlationId); + if (request != null) { + if (!deletionOperation) { + if (shouldReUploadFile(((PutFile) request).getSdlFileName(), ((PutFile) request).getFileType())) { + request.setOnRPCResponseListener(null); + requestsToResend.add(request); + } else { + errors.put(((PutFile) request).getSdlFileName(), buildErrorString(response.getResultCode(), response.getInfo())); + } + } else { + errors.put(((DeleteFile) request).getSdlFileName(), buildErrorString(response.getResultCode(), response.getInfo())); + } + } } } - }; internalInterface.sendRequests(requests, onMultipleRequestListener); } @@ -342,19 +335,15 @@ abstract class BaseFileManager extends BaseSubManager { bytesAvailable = putFileResponse.getSpaceAvailable() != null ? putFileResponse.getSpaceAvailable() : SPACE_AVAILABLE_MAX_VALUE; remoteFiles.add(file.getName()); uploadedEphemeralFileNames.add(file.getName()); - } - if (listener != null) { - listener.onComplete(putFileResponse.getSuccess()); - } - } - - @Override - public void onError(int correlationId, Result resultCode, String info) { - super.onError(correlationId, resultCode, info); - if (shouldReUploadFile(file.getName(), file.getType())) { - uploadFile(file, listener); - } else if (listener != null) { - listener.onComplete(false); + if (listener != null) { + listener.onComplete(true); + } + } else { + if (shouldReUploadFile(file.getName(), file.getType())) { + uploadFile(file, listener); + } else if (listener != null) { + listener.onComplete(false); + } } } }); |