Patch/apply scheduled updates (#412)

* remove rollback on fail

* create new instance when reopen mmpk

* update comments

* clean up imports

Author: JonLavi

map/apply-scheduled-updates-to-preplanned-map-area/src/main/java/com/esri/samples/apply_scheduled_updates_to_preplanned_map_area/ApplyScheduledUpdatesToPreplannedMapAreaSample.java

@@ -27,6 +27,7 @@
 import javafx.scene.control.ButtonType;
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
+
 import org.apache.commons.io.FileUtils;
 
 import com.esri.arcgisruntime.concurrent.Job;
@@ -48,6 +49,7 @@ public class ApplyScheduledUpdatesToPreplannedMapAreaSample extends Application
   private MapView mapView;
   private MobileMapPackage mobileMapPackage;
   private OfflineMapSyncTask offlineMapSyncTask;
+  private File tempMobileMapPackageDirectory;
 
   @Override
   public void start(Stage stage) {
@@ -69,7 +71,7 @@ public void start(Stage stage) {
       stackPane.getChildren().add(mapView);
 
       // create a temporary copy of the local offline map files, so that updating does not overwrite them permanently
-      File tempMobileMapPackageDirectory = Files.createTempDirectory("canyonlands_offline_map").toFile();
+      tempMobileMapPackageDirectory = Files.createTempDirectory("canyonlands_offline_map").toFile();
       tempMobileMapPackageDirectory.deleteOnExit();
       File sourceDirectory = new File("./samples-data/canyonlands/");
       FileUtils.copyDirectory(sourceDirectory, tempMobileMapPackageDirectory);
@@ -159,8 +161,6 @@ private void applyScheduledUpdates() {
 
         // set the parameters to download all updates for the mobile map packages
         offlineMapSyncParameters.setPreplannedScheduledUpdatesOption(PreplannedScheduledUpdatesOption.DOWNLOAD_ALL_UPDATES);
-        // set the map package to rollback to the old state should the sync job fail
-        offlineMapSyncParameters.setRollbackOnFailure(true);
 
         // create a sync job using the parameters
         OfflineMapSyncJob offlineMapSyncJob = offlineMapSyncTask.syncOfflineMap(offlineMapSyncParameters);
@@ -171,15 +171,23 @@ private void applyScheduledUpdates() {
           if (offlineMapSyncJob.getStatus() == Job.Status.SUCCEEDED) {
             OfflineMapSyncResult offlineMapSyncResult = offlineMapSyncJob.getResult();
 
-            // if mobile map package reopen is required, close the existing mobile map package and load it again
+            // check if mobile map package reopen is required
             if (offlineMapSyncResult.isMobileMapPackageReopenRequired()) {
+              // release the mobile map package maps from the map view
+              mapView.setMap(null);
+              // close the old mobile map package
               mobileMapPackage.close();
-              mobileMapPackage.loadAsync();
-              mobileMapPackage.addDoneLoadingListener(() -> {
-                if (mobileMapPackage.getLoadStatus() == LoadStatus.LOADED && !mobileMapPackage.getMaps().isEmpty()) {
+
+              // create a new instance of the now updated mobile map package
+              MobileMapPackage updatedMobileMapPackage = new MobileMapPackage(tempMobileMapPackageDirectory.toString());
+              updatedMobileMapPackage.loadAsync();
+
+              // wait for the new instance of the mobile map package to load
+              updatedMobileMapPackage.addDoneLoadingListener(() -> {
+                if (updatedMobileMapPackage.getLoadStatus() == LoadStatus.LOADED && !updatedMobileMapPackage.getMaps().isEmpty()) {
 
                   // add the map from the mobile map package to the map view
-                  mapView.setMap(mobileMapPackage.getMaps().get(0));
+                  mapView.setMap(updatedMobileMapPackage.getMaps().get(0));
 
                 } else {
                   new Alert(Alert.AlertType.ERROR, "Failed to load the mobile map package.").show();