From 82b13caac4c2386a096acc5c72ebde2b4871c245 Mon Sep 17 00:00:00 2001
From: Jeremy Lakeman <Jeremy.Lakeman@gmail.com>
Date: Wed, 25 Jun 2014 12:52:47 +0930
Subject: [PATCH] Deprecate JNI meshms interface

---
 java/org/servalproject/servaldna/ServalDCommand.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/java/org/servalproject/servaldna/ServalDCommand.java b/java/org/servalproject/servaldna/ServalDCommand.java
index b2537dcd..e28e3ee0 100644
--- a/java/org/servalproject/servaldna/ServalDCommand.java
+++ b/java/org/servalproject/servaldna/ServalDCommand.java
@@ -559,6 +559,7 @@ public static int idPeers(IJniResults results) throws ServalDFailureException {
 		return command(results, "id", "peers");
 	}
 
+	@Deprecated
 	public static class Conversation extends JniResult{
 		public long id;
 		public SubscriberId recipient;
@@ -593,6 +594,7 @@ public void putLong(long value) {
 		}
 	}
 
+	@Deprecated
 	public static int listConversations(AsyncResult<Conversation> result, final SubscriberId sender, int offset, int numRows) throws ServalDFailureException {
 		return listConversations(new JniResultList<Conversation>(result) {
 			@Override
@@ -602,11 +604,13 @@ public Conversation create() {
 		}, sender, offset, numRows);
 	}
 
+	@Deprecated
 	public static int listConversations(IJniResults callback, final SubscriberId sender, int offset, int numRows) throws ServalDFailureException {
 		return command(callback, "meshms", "list", "conversations",
 				sender.toHex(), ""+offset, ""+numRows);
 	}
 
+	@Deprecated
 	public static class Message extends JniResult{
 		public long id;
 		public long offset;
@@ -630,6 +634,7 @@ public void putLong(long value) {
 		}
 	}
 
+	@Deprecated
 	public static int listMessages(AsyncResult<Message> result, final SubscriberId sender, final SubscriberId recipient) throws ServalDFailureException {
 		return listMessages(new JniResultList<Message>(result) {
 			@Override
@@ -639,22 +644,26 @@ public Message create() {
 		}, sender, recipient);
 	}
 
+	@Deprecated
 	public static int listMessages(IJniResults callback, final SubscriberId sender, final SubscriberId recipient) throws ServalDFailureException {
 		return ServalDCommand.command(callback, "meshms", "list", "messages",
 				sender.toHex(), recipient.toHex());
 	}
 
+	@Deprecated
 	public static void sendMessage(final SubscriberId sender, final SubscriberId recipient, String message) throws ServalDFailureException {
 		command("meshms", "send", "message",
 				sender.toHex(), recipient.toHex(),
 				message);
 	}
 
+	@Deprecated
 	public static void readMessage(final SubscriberId sender, final SubscriberId recipient) throws ServalDFailureException {
 		command("meshms", "read", "messages",
 				sender.toHex(), recipient.toHex());
 	}
 
+	@Deprecated
 	public static void readMessage(final SubscriberId sender, final SubscriberId recipient, long offset) throws ServalDFailureException {
 		command("meshms", "read", "messages",
 				sender.toHex(), recipient.toHex(),