Merge branch 'edge_support' into 1199-safari-cookies

Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestPipeline.java

@@ -109,9 +109,9 @@ synchronized List<IngestModuleError> process(DataSourceIngestTask task) {
                     this.job.updateDataSourceIngestProgressBarDisplayName(displayName);
                     this.job.switchDataSourceIngestProgressBarToIndeterminate();
                     DataSourceIngestPipeline.ingestManager.setIngestTaskProgress(task, module.getDisplayName());
-                    logger.log(Level.INFO, "{0} analysis of {1} (jobId={2}) starting", new Object[]{module.getDisplayName(), this.job.getDataSource().getName(), this.job.getDataSource().getId()}); //NON-NLS
+                    logger.log(Level.INFO, "{0} analysis of {1} (jobId={2}) starting", new Object[]{module.getDisplayName(), this.job.getDataSource().getName(), this.job.getId()}); //NON-NLS
                     module.process(dataSource, new DataSourceIngestModuleProgress(this.job));
-                    logger.log(Level.INFO, "{0} analysis of {1} (jobId={2}) finished", new Object[]{module.getDisplayName(), this.job.getDataSource().getName(), this.job.getDataSource().getId()}); //NON-NLS
+                    logger.log(Level.INFO, "{0} analysis of {1} (jobId={2}) finished", new Object[]{module.getDisplayName(), this.job.getDataSource().getName(), this.job.getId()}); //NON-NLS
                 } catch (Throwable ex) { // Catch-all exception firewall
                     errors.add(new IngestModuleError(module.getDisplayName(), ex));
                     String msg = ex.getMessage();

ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryDatabaseUpdateService.java

@@ -63,7 +63,7 @@ public void openCaseResources(CaseContext context) throws AutopsyServiceExceptio
             return;
         }
         ProgressIndicator progress = context.getProgressIndicator();
-        progress.start(Bundle.ImageGalleryDatabaseUpdateService_openCaseResources_progressMessage_start());
+        progress.progress(Bundle.ImageGalleryDatabaseUpdateService_openCaseResources_progressMessage_start());
         try {
             ImageGalleryModule.createController(context.getCase());
         } catch (TskCoreException ex) {