diff --git a/bindings/java/jni/dataModel_SleuthkitJNI.cpp b/bindings/java/jni/dataModel_SleuthkitJNI.cpp index 60772ce33d2c65d5076c609e814a7fded993365f..b1e24a044c533bed6f0074a6edc7f448797a9b12 100644 --- a/bindings/java/jni/dataModel_SleuthkitJNI.cpp +++ b/bindings/java/jni/dataModel_SleuthkitJNI.cpp @@ -970,29 +970,6 @@ JNIEXPORT jlong JNICALL JNIEXPORT jlong JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_initializeAddImgNat(JNIEnv * env, jclass obj, jlong caseHandle, jstring timeZone, jboolean addFileSystems, jboolean addUnallocSpace, jboolean skipFatFsOrphans) { - - return Java_org_sleuthkit_datamodel_SleuthkitJNI_initializeAddImgUnallocChunkNat(env, obj, caseHandle, timeZone, addFileSystems, addUnallocSpace, 500 * 1024 * 1024, -1, skipFatFsOrphans); -} - -/* -* Initialize a process for adding an image to a case database. -* -* @param env Pointer to java environment. -* @param obj Pointer the Java class object. -* @partam caseHandle Pointer to a TskCaseDb object. -* @param timeZone The time zone for the image. -* @param addFileSystems Pass true to attempt to add file systems within the image to the case database. -* @param addUnallocSpace Pass true to create virtual files for unallocated space. Ignored if addFileSystems is false. -* @param unallocMinChunk Minimum size for unallocated chunks. -1 to only chunk on natural breaks, 0 to not chunk at all. Ignored if addUnallocSpace is false. -* @param unallocMaxChunk Maximum size for unallocated chunks even if no natural break occurs. -1 for no maximum. Ignored if addUnallocSpace is false. -* @param skipFatFsOrphans Pass true to skip processing of orphan files for FAT file systems. Ignored if addFileSystems is false. -* -* @return A pointer to the process (TskAutoDb object) or NULL on error. -*/ -JNIEXPORT jlong JNICALL -Java_org_sleuthkit_datamodel_SleuthkitJNI_initializeAddImgUnallocChunkNat(JNIEnv * env, jclass obj, - jlong caseHandle, jstring timeZone, jboolean addFileSystems, jboolean addUnallocSpace, - jlong unallocMinChunk, jlong unallocMaxChunk, jboolean skipFatFsOrphans) { jboolean isCopy; TskCaseDb *tskCase = castCaseDb(env, caseHandle); @@ -1038,7 +1015,8 @@ Java_org_sleuthkit_datamodel_SleuthkitJNI_initializeAddImgUnallocChunkNat(JNIEnv tskAuto->setAddFileSystems(addFileSystems?true:false); if (addFileSystems) { if (addUnallocSpace) { - tskAuto->setAddUnallocSpace(true, unallocMinChunk, unallocMaxChunk); + // Minimum size of unalloc files: 500 MB, maximum size: 1 GB + tskAuto->setAddUnallocSpace(true, 500 * 1024 * 1024, 1024 * 1024 * 1024); } else { tskAuto->setAddUnallocSpace(false); diff --git a/bindings/java/jni/dataModel_SleuthkitJNI.h b/bindings/java/jni/dataModel_SleuthkitJNI.h index 223cdee16ad24b58daa88547a4bc164aecff3f2a..b4c2d9cd5ba7470c1dec16bea8f3e78de68eefe1 100644 --- a/bindings/java/jni/dataModel_SleuthkitJNI.h +++ b/bindings/java/jni/dataModel_SleuthkitJNI.h @@ -223,14 +223,6 @@ JNIEXPORT jlong JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_initAddImgNat JNIEXPORT jlong JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_initializeAddImgNat (JNIEnv *, jclass, jlong, jstring, jboolean, jboolean, jboolean); -/* - * Class: org_sleuthkit_datamodel_SleuthkitJNI - * Method: initializeAddImgUnallocChunkNat - * Signature: (JLjava/lang/String;ZZJJZ)J - */ -JNIEXPORT jlong JNICALL Java_org_sleuthkit_datamodel_SleuthkitJNI_initializeAddImgUnallocChunkNat - (JNIEnv *, jclass, jlong, jstring, jboolean, jboolean, jlong, jlong, jboolean); - /* * Class: org_sleuthkit_datamodel_SleuthkitJNI * Method: runOpenAndAddImgNat diff --git a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitJNI.java b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitJNI.java index 22241fe7dc366e8ee99da9f9caeb05b3877658f6..d547f896b1a23308a3813855ac388f9500af80ed 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitJNI.java +++ b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitJNI.java @@ -1196,8 +1196,6 @@ public static boolean isImageSupported(String imagePath) { private static native long initializeAddImgNat(long db, String timezone, boolean addFileSystems, boolean addUnallocSpace, boolean skipFatFsOrphans) throws TskCoreException; - private static native long initializeAddImgUnallocChunkNat(long db, String timezone, boolean addFileSystems, boolean addUnallocSpace, long minChunkSize, long maxChunkSize, boolean skipFatFsOrphans) throws TskCoreException; - private static native void runOpenAndAddImgNat(long process, String deviceId, String[] imgPath, int splits, String timezone) throws TskCoreException, TskDataException; private static native void runAddImgNat(long process, String deviceId, long a_img_info, String timeZone, String imageWriterPath) throws TskCoreException, TskDataException;