Implement the AutoCloseable interface

App.java

@@ -194,9 +194,16 @@ public void Gasmix(int value) {
 					}
 				});
 
+				parser.close();
+
 				// Continue downloading dives.
 				return 1;
 			}
 		});
+
+		device.close();
+		iostream.close();
+		descriptor.close();
+		context.close();
 	}
 }

org/libdivecomputer/Context.java

@@ -3,6 +3,7 @@
 public class Context extends Handle
 {
 	private native long New();
+	private native long Free(long handle);
 	private native void SetLogLevel(long handle, int loglevel);
 	private native void SetLogFunc(long handle, LogFunc logfunc);
 
@@ -34,6 +35,13 @@ public void SetLogFunc(LogFunc logfunc)
 		SetLogFunc(handle, logfunc);
 	}
 
+	@Override
+	public void close()
+	{
+		Free(handle);
+		handle = 0;
+	}
+
 	static {
 		System.loadLibrary("divecomputer-java");
 	}

org/libdivecomputer/Descriptor.java

@@ -4,6 +4,7 @@
 
 public class Descriptor extends Handle
 {
+	private native long Free(long handle);
 	private native String Vendor(long handle);
 	private native String Product(long handle);
 	private native int Type(long handle);
@@ -42,6 +43,13 @@ public int Transports()
 		return Transports(handle);
 	}
 
+	@Override
+	public void close()
+	{
+		Free(handle);
+		handle = 0;
+	}
+
 	static {
 		System.loadLibrary("divecomputer-java");
 	}

org/libdivecomputer/Device.java

@@ -3,6 +3,7 @@
 public class Device extends Handle
 {
 	private native long Open(long context, long descriptor, long iostream);
+	private native long Close(long handle);
 	private native void Foreach(long handle, Callback callback);
 	private native void SetFingerprint(long handle, byte[] fingerprint);
 	private native void SetEvents(long handle, Events events);
@@ -49,6 +50,13 @@ public void SetCancel(Cancel cancel)
 		SetCancel(handle, cancel);
 	}
 
+	@Override
+	public void close()
+	{
+		Close(handle);
+		handle = 0;
+	}
+
 	static {
 		System.loadLibrary("divecomputer-java");
 	}

org/libdivecomputer/Handle.java

@@ -1,6 +1,6 @@
 package org.libdivecomputer;
 
-abstract class Handle
+abstract class Handle implements AutoCloseable
 {
 	public long handle = 0;
 }

org/libdivecomputer/IOStream.java

@@ -2,5 +2,17 @@
 
 public abstract class IOStream extends Handle
 {
+	private native long Close(long handle);
+
+	@Override
+	public void close()
+	{
+		Close(handle);
+		handle = 0;
+	}
+
+	static {
+		System.loadLibrary("divecomputer-java");
+	}
 }
 

org/libdivecomputer/Parser.java

@@ -4,6 +4,7 @@ public class Parser extends Handle
 {
 	private native long New(long device, byte[] data);
 	private native long New2(long context, long descriptor, byte[] data);
+	private native long Free(long handle);
 	private native void Foreach(long handle, Callback callback);
 	private native void GetDatetime(long handle, Datetime datetime);
 	private native void GetSalinity(long handle, Salinity salinity);
@@ -185,6 +186,13 @@ public void Foreach(Callback callback)
 		Foreach(handle, callback);
 	}
 
+	@Override
+	public void close()
+	{
+		Free(handle);
+		handle = 0;
+	}
+
 	static {
 		System.loadLibrary("divecomputer-java");
 	}

org_libdivecomputer_Context.c

@@ -37,6 +37,12 @@ JNIEXPORT jlong JNICALL Java_org_libdivecomputer_Context_New
 	return (jlong) context;
 }
 
+JNIEXPORT jlong JNICALL Java_org_libdivecomputer_Context_Free
+  (JNIEnv *env, jobject obj, jlong handle)
+{
+	dc_context_free ((dc_context_t *) handle);
+}
+
 JNIEXPORT void JNICALL Java_org_libdivecomputer_Context_SetLogLevel
   (JNIEnv *env, jobject obj, jlong handle, jint loglevel)
 {

org_libdivecomputer_Descriptor.c

@@ -2,6 +2,12 @@
 
 #include <libdivecomputer/descriptor.h>
 
+JNIEXPORT jlong JNICALL Java_org_libdivecomputer_Descriptor_Free
+  (JNIEnv *env, jobject obj, jlong handle)
+{
+	dc_descriptor_free ((dc_descriptor_t *) handle);
+}
+
 JNIEXPORT jstring JNICALL Java_org_libdivecomputer_Descriptor_Vendor
   (JNIEnv *env, jobject obj, jlong handle)
 {

org_libdivecomputer_Device.c

@@ -104,6 +104,12 @@ JNIEXPORT jlong JNICALL Java_org_libdivecomputer_Device_Open
 	return (jlong) device;
 }
 
+JNIEXPORT jlong JNICALL Java_org_libdivecomputer_Device_Close
+  (JNIEnv *env, jobject obj, jlong handle)
+{
+	dc_device_close ((dc_device_t *) handle);
+}
+
 JNIEXPORT void JNICALL Java_org_libdivecomputer_Device_Foreach
   (JNIEnv *env, jobject obj, jlong handle, jobject callback)
 {

org_libdivecomputer_IOStream.c

@@ -0,0 +1,9 @@
+#include "org_libdivecomputer_IOStream.h"
+
+#include <libdivecomputer/iostream.h>
+
+JNIEXPORT jlong JNICALL Java_org_libdivecomputer_IOStream_Close
+  (JNIEnv *env, jobject obj, jlong handle)
+{
+	dc_iostream_close ((dc_iostream_t *) handle);
+}

org_libdivecomputer_Parser.c

@@ -168,6 +168,12 @@ JNIEXPORT jlong JNICALL Java_org_libdivecomputer_Parser_New2
 	return (jlong) parser;
 }
 
+JNIEXPORT jlong JNICALL Java_org_libdivecomputer_Parser_Free
+  (JNIEnv *env, jobject obj, jlong handle)
+{
+	dc_parser_destroy ((dc_parser_t *) handle);
+}
+
 JNIEXPORT void JNICALL Java_org_libdivecomputer_Parser_Foreach
   (JNIEnv *env, jobject obj, jlong handle, jobject callback)
 {