From f5455d320b61027b10a72f1e425cbcd4cf437a34 Mon Sep 17 00:00:00 2001 From: ameba23 Date: Fri, 23 Apr 2021 12:22:18 +0200 Subject: [PATCH] bramble-core --- .../briarproject/bramble/api/contact/ContactManager.java | 4 ++++ .../recover/CustodianReturnShardErrorFragment.java | 6 ++++++ .../recover/OwnerReturnShardSuccessFragment.java | 6 ++++++ 3 files changed, 16 insertions(+) create mode 100644 briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianReturnShardErrorFragment.java create mode 100644 briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardSuccessFragment.java diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java index 0330d443c..d1eb4e913 100644 --- a/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java +++ b/bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java @@ -3,6 +3,7 @@ package org.briarproject.bramble.api.contact; import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.Pair; import org.briarproject.bramble.api.UnsupportedVersionException; +import org.briarproject.bramble.api.crypto.PublicKey; import org.briarproject.bramble.api.crypto.SecretKey; import org.briarproject.bramble.api.db.ContactExistsException; import org.briarproject.bramble.api.db.DbException; @@ -48,6 +49,9 @@ public interface ContactManager { SecretKey rootKey, long timestamp, boolean alice, boolean verified, boolean active) throws DbException; + ContactId addContact(Transaction txn, Author remote, AuthorId local, + PublicKey handshake, boolean verified) throws DbException; + /** * Stores a contact associated with the given local and remote pseudonyms, * replacing the given pending contact, derives and stores handshake mode diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianReturnShardErrorFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianReturnShardErrorFragment.java new file mode 100644 index 000000000..c9a5f18a7 --- /dev/null +++ b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/CustodianReturnShardErrorFragment.java @@ -0,0 +1,6 @@ +package org.briarproject.briar.android.socialbackup.recover; + +import org.briarproject.briar.android.fragment.BaseFragment; + +public class CustodianReturnShardErrorFragment extends BaseFragment { +} diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardSuccessFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardSuccessFragment.java new file mode 100644 index 000000000..e3ccef3a7 --- /dev/null +++ b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardSuccessFragment.java @@ -0,0 +1,6 @@ +package org.briarproject.briar.android.socialbackup.recover; + +import org.briarproject.briar.android.fragment.BaseFragment; + +public class OwnerReturnShardSuccessFragment extends BaseFragment { +}