From 4f42ce9a01ee5fee4d572bd82ba26e387d0a1119 Mon Sep 17 00:00:00 2001
From: ameba23 <ameba23@systemli.org>
Date: Wed, 31 Mar 2021 16:00:57 +0200
Subject: [PATCH] Public interface of SocialBackupExchangeManager and Message
 encoder/parser

---
 .../briar/api/socialbackup/MessageEncoder.java           | 6 ++++--
 .../briar/api/socialbackup/MessageParser.java            | 9 +++++----
 .../api/socialbackup/SocialBackupExchangeManager.java    | 6 +++---
 .../briar/api/socialbackup/SocialBackupManager.java      | 3 +++
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/MessageEncoder.java b/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/MessageEncoder.java
index b386b6174..6b59a680a 100644
--- a/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/MessageEncoder.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/MessageEncoder.java
@@ -1,12 +1,14 @@
-package org.briarproject.briar.socialbackup;
+package org.briarproject.briar.api.socialbackup;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.api.socialbackup.Shard;
 
 @NotNullByDefault
-interface MessageEncoder {
+public interface MessageEncoder {
 
 	byte[] encodeShardMessage(Shard shard);
 
 	byte[] encodeBackupMessage(int version, org.briarproject.briar.api.socialbackup.BackupPayload payload);
+
+	byte[] encodeReturnShardPayload(ReturnShardPayload returnShardPayload);
 }
diff --git a/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/MessageParser.java b/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/MessageParser.java
index 662e7ab77..73d3b05a9 100644
--- a/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/MessageParser.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/MessageParser.java
@@ -1,14 +1,15 @@
-package org.briarproject.briar.socialbackup;
+package org.briarproject.briar.api.socialbackup;
 
 import org.briarproject.bramble.api.FormatException;
 import org.briarproject.bramble.api.data.BdfList;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
-import org.briarproject.briar.api.socialbackup.Shard;
 
 @NotNullByDefault
-interface MessageParser {
+public interface MessageParser {
 
 	Shard parseShardMessage(BdfList body) throws FormatException;
 
-	org.briarproject.briar.api.socialbackup.BackupPayload parseBackupMessage(BdfList body) throws FormatException;
+	BackupPayload parseBackupMessage(BdfList body) throws FormatException;
+
+	ReturnShardPayload parseReturnShardPayload(BdfList body) throws FormatException;
 }
diff --git a/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/SocialBackupExchangeManager.java b/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/SocialBackupExchangeManager.java
index 970b8e00d..d57daf5db 100644
--- a/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/SocialBackupExchangeManager.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/SocialBackupExchangeManager.java
@@ -18,9 +18,9 @@ public interface SocialBackupExchangeManager {
 	 * @throws IOException
 	 * @throws DbException
 	 */
-	public void sendReturnShard(DuplexTransportConnection conn,
+	void sendReturnShard(DuplexTransportConnection conn,
 			SecretKey masterKey,
-			boolean verified) throws IOException, DbException;
+			boolean verified, ReturnShardPayload returnShardPayload) throws IOException, DbException;
 
 	/**
 	 * Receive a returned shard and encrypted backup from a custodian
@@ -31,7 +31,7 @@ public interface SocialBackupExchangeManager {
 	 * @throws IOException
 	 * @throws DbException
 	 */
-	public ReturnShardPayload receiveReturnShard(DuplexTransportConnection conn,
+	ReturnShardPayload receiveReturnShard(DuplexTransportConnection conn,
 			SecretKey masterKey, boolean verified)
 			throws IOException, DbException;
 }
diff --git a/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/SocialBackupManager.java b/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/SocialBackupManager.java
index 5e850b185..dc61fc7d9 100644
--- a/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/SocialBackupManager.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/SocialBackupManager.java
@@ -55,4 +55,7 @@ public interface SocialBackupManager extends
 			Transaction txn, ContactId contactId) throws DbException;
 
 	boolean amCustodian(Transaction txn, ContactId contactId);
+
+	ReturnShardPayload getReturnShardPayload(Transaction txn, ContactId contactId)
+			throws DbException;
 }