remove thrown exception - pass back as task exception.

Author: annzimmer

firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/FirebaseModelDownloader.java

@@ -121,8 +121,7 @@ public static FirebaseModelDownloader getInstance(@NonNull FirebaseApp app) {
   public Task<CustomModel> getModel(
       @NonNull String modelName,
       @NonNull DownloadType downloadType,
-      @Nullable CustomModelDownloadConditions conditions)
-      throws Exception {
+      @Nullable CustomModelDownloadConditions conditions) {
     CustomModel localModelDetails = getLocalModelDetails(modelName);
     if (localModelDetails == null) {
       // no local model - get latest.
@@ -140,9 +139,10 @@ public Task<CustomModel> getModel(
         getCustomModelTask(modelName, conditions, localModelDetails.getModelHash());
         return getCompletedLocalCustomModelTask(localModelDetails);
     }
-    throw new FirebaseMlException(
-        "Unsupported downloadType, please chose LOCAL_MODEL, LATEST_MODEL, or LOCAL_MODEL_UPDATE_IN_BACKGROUND",
-        FirebaseMlException.INVALID_ARGUMENT);
+    return Tasks.forException(
+        new FirebaseMlException(
+            "Unsupported downloadType, please chose LOCAL_MODEL, LATEST_MODEL, or LOCAL_MODEL_UPDATE_IN_BACKGROUND",
+            FirebaseMlException.INVALID_ARGUMENT));
   }
 
   /**
@@ -228,8 +228,7 @@ private Task<CustomModel> getCompletedLocalCustomModelTask(@NonNull CustomModel
   // This version of getCustomModelTask will always call the modelDownloadService and upon
   // success will then trigger file download.
   private Task<CustomModel> getCustomModelTask(
-      @NonNull String modelName, @Nullable CustomModelDownloadConditions conditions)
-      throws Exception {
+      @NonNull String modelName, @Nullable CustomModelDownloadConditions conditions) {
     return getCustomModelTask(modelName, conditions, null);
   }
 
@@ -238,8 +237,7 @@ private Task<CustomModel> getCustomModelTask(
   private Task<CustomModel> getCustomModelTask(
       @NonNull String modelName,
       @Nullable CustomModelDownloadConditions conditions,
-      @Nullable String modelHash)
-      throws Exception {
+      @Nullable String modelHash) {
     CustomModel currentModel = sharedPreferencesUtil.getCustomModelDetails(modelName);
     if (currentModel == null && modelHash != null) {
       // todo(annzimmer) log something about mismatched state and use hash = null
@@ -322,8 +320,7 @@ private Task<CustomModel> retryExpiredUrlDownload(
       @NonNull String modelName,
       @Nullable CustomModelDownloadConditions conditions,
       Task<Void> downloadTask,
-      int retryCounter)
-      throws Exception {
+      int retryCounter) {
     if (downloadTask.getException().getMessage().contains("Retry: Expired URL")) {
       // this is likely an expired url - retry.
       Task<CustomModel> retryModelDetails =
@@ -357,7 +354,7 @@ private Task<CustomModel> retryExpiredUrlDownload(
     return Tasks.forException(new Exception("File download failed."));
   }
 
-  private Task<CustomModel> finishModelDownload(@NonNull String modelName) throws Exception {
+  private Task<CustomModel> finishModelDownload(@NonNull String modelName) {
     // read the updated model
     CustomModel downloadedModel = sharedPreferencesUtil.getDownloadingCustomModelDetails(modelName);
     if (downloadedModel == null) {
@@ -385,11 +382,7 @@ private Task<CustomModel> finishModelDownload(@NonNull String modelName) throws
   @NonNull
   public Task<Set<CustomModel>> listDownloadedModels() {
     // trigger completion of file moves for download files.
-    try {
-      fileDownloadService.maybeCheckDownloadingComplete();
-    } catch (Exception ex) {
-      System.out.println("Error checking for in progress downloads: " + ex.getMessage());
-    }
+    fileDownloadService.maybeCheckDownloadingComplete();
 
     TaskCompletionSource<Set<CustomModel>> taskCompletionSource = new TaskCompletionSource<>();
     executor.execute(

firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/CustomModelDownloadService.java

@@ -100,11 +100,9 @@ public CustomModelDownloadService(
    * @param projectNumber - firebase project number
    * @param modelName - model name
    * @return - updated model with new download url and expiry time
-   * @throws Exception - errors when Firebase ML Download Service call fails.
    */
   @NonNull
-  public Task<CustomModel> getNewDownloadUrlWithExpiry(String projectNumber, String modelName)
-      throws Exception {
+  public Task<CustomModel> getNewDownloadUrlWithExpiry(String projectNumber, String modelName) {
     return getCustomModelDetails(projectNumber, modelName, null);
   }
 
@@ -118,11 +116,10 @@ public Task<CustomModel> getNewDownloadUrlWithExpiry(String projectNumber, Strin
    *     force retrieval of a new download url
    * @return The download details for the model or null if the current model hash matches the latest
    *     model.
-   * @throws Exception -errors when call to API fails.
    */
   @NonNull
   public Task<CustomModel> getCustomModelDetails(
-      String projectNumber, String modelName, String modelHash) throws Exception {
+      String projectNumber, String modelName, String modelHash) {
     try {
       URL url =
           new URL(String.format(DOWNLOAD_MODEL_REGEX, downloadHost, projectNumber, modelName));

firebase-ml-modeldownloader/src/main/java/com/google/firebase/ml/modeldownloader/internal/ModelFileDownloadService.java

@@ -319,7 +319,7 @@ private synchronized ParcelFileDescriptor getDownloadedFile(Long downloadingId)
     return fileDescriptor;
   }
 
-  public void maybeCheckDownloadingComplete() throws Exception {
+  public void maybeCheckDownloadingComplete() {
     for (String key : sharedPreferencesUtil.getSharedPreferenceKeySet()) {
       // if a local file path is present - get model details.
       Matcher matcher =
@@ -341,7 +341,7 @@ public void maybeCheckDownloadingComplete() throws Exception {
 
   @Nullable
   @WorkerThread
-  public File loadNewlyDownloadedModelFile(CustomModel model) throws FirebaseMlException {
+  public File loadNewlyDownloadedModelFile(CustomModel model) {
     if (model == null) {
       return null;
     }
@@ -380,6 +380,9 @@ public File loadNewlyDownloadedModelFile(CustomModel model) throws FirebaseMlExc
       try {
         // TODO add logging
         newModelFile = fileManager.moveModelToDestinationFolder(model, fileDescriptor);
+      } catch (FirebaseMlException ex) {
+        // add logging for this error
+        newModelFile = null;
       } finally {
         removeOrCancelDownloadModel(model.getName(), model.getDownloadId());
       }