ContactData and SocialBackup now live in briar-api

This commit is contained in:
ameba23
2021-04-21 16:35:27 +02:00
parent 5c22d233ef
commit 34f15b6bdc
3 changed files with 16 additions and 6 deletions

View File

@@ -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.contact.Contact;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.plugin.TransportId; import org.briarproject.bramble.api.plugin.TransportId;
import org.briarproject.bramble.api.properties.TransportProperties; import org.briarproject.bramble.api.properties.TransportProperties;
import org.briarproject.briar.api.socialbackup.Shard;
import java.util.Map; import java.util.Map;

View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.socialbackup; package org.briarproject.briar.api.socialbackup;
import org.briarproject.bramble.api.identity.Identity; import org.briarproject.bramble.api.identity.Identity;
@@ -6,10 +6,10 @@ import java.util.List;
public class SocialBackup { public class SocialBackup {
private Identity identity; private Identity identity;
private List<org.briarproject.briar.api.socialbackup.ContactData> contacts; private List<ContactData> contacts;
private int version; private int version;
SocialBackup (Identity identity, List<org.briarproject.briar.api.socialbackup.ContactData> contacts, int version) { SocialBackup (Identity identity, List<ContactData> contacts, int version) {
this.identity = identity; this.identity = identity;
this.contacts = contacts; this.contacts = contacts;
this.version = version; this.version = version;
@@ -19,7 +19,7 @@ public class SocialBackup {
return identity; return identity;
} }
public List<org.briarproject.briar.api.socialbackup.ContactData> getContacts() { public List<ContactData> getContacts() {
return contacts; return contacts;
} }

View File

@@ -1,4 +1,15 @@
package org.briarproject.briar.api.socialbackup.recovery; 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 { public interface RestoreAccount {
int getNumberOfShards();
boolean addReturnShardPayload(ReturnShardPayload toadd);
boolean canRecover();
int recover() throws FormatException, GeneralSecurityException;
SocialBackup getSocialBackup();
} }