Addressing review comments

-Remove unused import
-Fix error message in SdlArtwork
-Add null checks in FileManager apis

3 files changed, 8 insertions, 5 deletions

diff --git a/sdl_android/src/main/java/com/smartdevicelink/api/FileManager.java b/sdl_android/src/main/java/com/smartdevicelink/api/FileManager.java
index 1b512e4e9..df8640eee 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/api/FileManager.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/api/FileManager.java
@@ -102,7 +102,7 @@ public class FileManager extends BaseSubManager {
 	 * @param listener callback that is called on response from core
 	 */
 	public void deleteRemoteFileWithName(final String fileName, final CompletionListener listener){
-		if(fileName == null){
+		if(fileName == null || listener == null){
 			return;
 		}
 		DeleteFile deleteFile = new DeleteFile();
@@ -125,7 +125,7 @@ public class FileManager extends BaseSubManager {
 	 * @param listener callback that is called once core responds to all deletion requests
 	 */
 	public void deleteRemoteFilesWithNames(List<String> fileNames, final MultipleFileCompletionListener listener){
-		if(fileNames == null || fileNames.isEmpty()){
+		if(fileNames == null || fileNames.isEmpty() || listener == null){
 			return;
 		}
 		final List<DeleteFile> deleteFileRequests = new ArrayList<>();
@@ -253,6 +253,10 @@ public class FileManager extends BaseSubManager {
 	 * @param listener called when core responds to the attempt to upload the file
 	 */
 	public void uploadFile(final SdlFile file, final CompletionListener listener){
+		if(file == null || listener == null){
+			return;
+		}
+
 		PutFile putFile = createPutFile(file);
 
 		putFile.setOnRPCResponseListener(new OnRPCResponseListener() {
@@ -280,7 +284,7 @@ public class FileManager extends BaseSubManager {
 	 * @param listener callback that is called once core responds to all upload requests
 	 */
 	public void uploadFiles(List<? extends SdlFile> files, final MultipleFileCompletionListener listener){
-		if(files == null || files.isEmpty()){
+		if(files == null || files.isEmpty() || listener == null){
 			return;
 		}
 		final List<PutFile> putFileRequests = new ArrayList<>();
diff --git a/sdl_android/src/main/java/com/smartdevicelink/api/SdlArtwork.java b/sdl_android/src/main/java/com/smartdevicelink/api/SdlArtwork.java
index d66046365..296e0782f 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/api/SdlArtwork.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/api/SdlArtwork.java
@@ -12,7 +12,7 @@ public class SdlArtwork extends SdlFile{
                 || fileType.equals(FileType.GRAPHIC_BMP)){
             super.setType(fileType);
         }else{
-            throw new IllegalArgumentException("Only JPEG and PNG image types are supported.");
+            throw new IllegalArgumentException("Only JPEG, PNG, and BMP image types are supported.");
         }
     }
 }
\ No newline at end of file
diff --git a/sdl_android/src/main/java/com/smartdevicelink/api/SdlFile.java b/sdl_android/src/main/java/com/smartdevicelink/api/SdlFile.java
index a0c1a875a..bb59dd622 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/api/SdlFile.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/api/SdlFile.java
@@ -1,6 +1,5 @@
 package com.smartdevicelink.api;
 
-import android.content.res.Resources;
 import android.net.Uri;
 import android.support.annotation.NonNull;