diff options
author | Julian Kast <julian@livio.com> | 2021-09-27 16:01:01 -0400 |
---|---|---|
committer | Julian Kast <julian@livio.com> | 2021-09-27 16:01:01 -0400 |
commit | 0f9e1ce10e86d8ecf28398833dde5bd45522e8a9 (patch) | |
tree | 1334db405bb0f110747b6fd241de068529580b64 | |
parent | ecd6beaaec53e504e753cb454f416d5f1bc9c7ee (diff) | |
download | sdl_android-0f9e1ce10e86d8ecf28398833dde5bd45522e8a9.tar.gz |
Reverted breaking change to make sure when the overwrite error is hit, we return true
3 files changed, 3 insertions, 4 deletions
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java index 298cb26d7..b3d489eaa 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java @@ -876,8 +876,7 @@ public class FileManagerTests { assertOnMainThread(new Runnable() { @Override public void run() { - assertTrue(errors != null); - assertTrue(errors.containsValue(fileManager.fileManagerCannotOverwriteError)); + verify(internalInterface, times(1)).sendRPC(any(PutFile.class)); } }); } 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 9f6f1a60b..da6bae4e6 100644 --- a/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java @@ -417,7 +417,7 @@ abstract class BaseFileManager extends BaseSubManager { if (!file.isPersistent()) { BaseFileManager.this.uploadedEphemeralFileNames.add(fileClone.getName()); } - } else if (!fileManagerCannotOverwriteError.equals(errorMessage)) { + } else { incrementFailedUploadCountForFileName(fileClone.getName(), BaseFileManager.this.failedFileUploadsCount); int maxUploadCount = fileClone instanceof SdlArtwork ? maxArtworkUploadAttempts : maxFileUploadAttempts; diff --git a/base/src/main/java/com/smartdevicelink/managers/file/UploadFileOperation.java b/base/src/main/java/com/smartdevicelink/managers/file/UploadFileOperation.java index b05c6ff40..aab50a280 100644 --- a/base/src/main/java/com/smartdevicelink/managers/file/UploadFileOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/file/UploadFileOperation.java @@ -96,7 +96,7 @@ class UploadFileOperation extends Task { if (!file.getOverwrite() && fileManager.get().mutableRemoteFileNames.contains(file.getName())) { DebugTool.logWarning(TAG, fileManager.get().fileManagerCannotOverwriteError); if (this.fileWrapper.getCompletionListener() != null) { - this.fileWrapper.getCompletionListener().onComplete(false, bytesAvailable, null, fileManager.get().fileManagerCannotOverwriteError); + this.fileWrapper.getCompletionListener().onComplete(true, bytesAvailable, null, fileManager.get().fileManagerCannotOverwriteError); } onFinished(); return; |