diff --git a/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/ContactData.java b/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/ContactData.java index 10778858a..7d83a6eaa 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/ContactData.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/ContactData.java @@ -1,10 +1,9 @@ -package org.briarproject.briar.socialbackup; +package org.briarproject.briar.api.socialbackup; import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.properties.TransportProperties; -import org.briarproject.briar.api.socialbackup.Shard; import java.util.Map; diff --git a/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/SocialBackup.java b/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/SocialBackup.java index a2173f8ef..76cfa6f05 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/SocialBackup.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/SocialBackup.java @@ -1,4 +1,4 @@ -package org.briarproject.briar.socialbackup; +package org.briarproject.briar.api.socialbackup; import org.briarproject.bramble.api.identity.Identity; @@ -6,10 +6,10 @@ import java.util.List; public class SocialBackup { private Identity identity; - private List contacts; + private List contacts; private int version; - SocialBackup (Identity identity, List contacts, int version) { + SocialBackup (Identity identity, List contacts, int version) { this.identity = identity; this.contacts = contacts; this.version = version; @@ -19,7 +19,7 @@ public class SocialBackup { return identity; } - public List getContacts() { + public List getContacts() { return contacts; } diff --git a/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/recovery/RestoreAccount.java b/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/recovery/RestoreAccount.java index 32a25936a..9cfbc85ae 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/recovery/RestoreAccount.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/socialbackup/recovery/RestoreAccount.java @@ -1,4 +1,15 @@ package org.briarproject.briar.api.socialbackup.recovery; +import org.briarproject.bramble.api.FormatException; +import org.briarproject.briar.api.socialbackup.ReturnShardPayload; +import org.briarproject.briar.api.socialbackup.SocialBackup; + +import java.security.GeneralSecurityException; + public interface RestoreAccount { + int getNumberOfShards(); + boolean addReturnShardPayload(ReturnShardPayload toadd); + boolean canRecover(); + int recover() throws FormatException, GeneralSecurityException; + SocialBackup getSocialBackup(); }