Reverted breaking change to make sure when the overwrite error is hit, we return true

Author: Julian Kast

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java

@@ -876,8 +876,7 @@ public void onComplete(final Map<String, String> errors) {
                         assertOnMainThread(new Runnable() {
                             @Override
                             public void run() {
-                                assertTrue(errors != null);
-                                assertTrue(errors.containsValue(fileManager.fileManagerCannotOverwriteError));
+                                verify(internalInterface, times(1)).sendRPC(any(PutFile.class));
                             }
                         });
                     }

base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java

@@ -417,7 +417,7 @@ public void onComplete(boolean success, int bytesAvailable, Collection<String> f
                     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;

base/src/main/java/com/smartdevicelink/managers/file/UploadFileOperation.java

@@ -96,7 +96,7 @@ private void start() {
             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;