Skip to content

Commit 4fb0bec

Browse files
author
Julian Kast
committed
Added logic to properly handle static icons for uploading list of files
1 parent 18404b4 commit 4fb0bec

1 file changed

Lines changed: 15 additions & 7 deletions

File tree

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

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -383,19 +383,27 @@ private boolean shouldReUploadFile(String fileName, FileType fileType) {
383383

384384
/**
385385
* Attempts to upload a list of SdlFiles to core
386-
* @param files list of SdlFiles with file name and one of A) fileData, B) Uri, or C) resourceID set
386+
* @param files list of SdlFiles with file name and one of A) fileData, B) Uri, or C) resourceID set
387387
* @param listener callback that is called once core responds to all upload requests
388388
*/
389-
public void uploadFiles(@NonNull List<? extends SdlFile> files, final MultipleFileCompletionListener listener){
390-
if(files.isEmpty()){
389+
public void uploadFiles(@NonNull List<? extends SdlFile> files, final MultipleFileCompletionListener listener) {
390+
if (files.isEmpty()) {
391391
return;
392392
}
393393
final List<PutFile> putFileRequests = new ArrayList<>();
394-
for(SdlFile file : files){
395-
putFileRequests.add(createPutFile(file));
394+
for (SdlFile file : files) {
395+
if (!file.isStaticIcon()) {
396+
putFileRequests.add(createPutFile(file));
397+
}
398+
}
399+
// if all files are static icons we complete listener with no errors
400+
if (putFileRequests.isEmpty()) {
401+
Log.w(TAG, "Static icons don't need to be uploaded");
402+
listener.onComplete(null);
403+
} else {
404+
final Map<String, String> errors = new HashMap<>();
405+
sendMultipleFileOperations(putFileRequests, listener, errors);
396406
}
397-
final Map<String, String> errors = new HashMap<>();
398-
sendMultipleFileOperations(putFileRequests, listener, errors);
399407
}
400408

401409
/**

0 commit comments

Comments
 (0)