From d0ba274111b1160f6cde87fcf5b9c0f5e99d3a10 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Wed, 16 Dec 2015 16:34:35 +0000
Subject: [PATCH] Use new UI/DB interfaces for adding contacts.

---
 .../briarproject/android/invitation/AddContactActivity.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/briar-android/src/org/briarproject/android/invitation/AddContactActivity.java b/briar-android/src/org/briarproject/android/invitation/AddContactActivity.java
index 89111f2acf..011f7d38d0 100644
--- a/briar-android/src/org/briarproject/android/invitation/AddContactActivity.java
+++ b/briar-android/src/org/briarproject/android/invitation/AddContactActivity.java
@@ -14,6 +14,7 @@ import org.briarproject.api.crypto.CryptoComponent;
 import org.briarproject.api.db.DatabaseComponent;
 import org.briarproject.api.db.DbException;
 import org.briarproject.api.identity.AuthorId;
+import org.briarproject.api.identity.IdentityManager;
 import org.briarproject.api.identity.LocalAuthor;
 import org.briarproject.api.invitation.InvitationListener;
 import org.briarproject.api.invitation.InvitationState;
@@ -58,6 +59,7 @@ implements InvitationListener {
 
 	// Fields that are accessed from background threads must be volatile
 	@Inject private volatile DatabaseComponent db;
+	@Inject private volatile IdentityManager identityManager;
 	private volatile boolean leaveBluetoothEnabled = true;
 
 	@Override
@@ -239,7 +241,8 @@ implements InvitationListener {
 			public void run() {
 				try {
 					long now = System.currentTimeMillis();
-					Collection<LocalAuthor> authors = db.getLocalAuthors();
+					Collection<LocalAuthor> authors =
+							identityManager.getLocalAuthors();
 					long duration = System.currentTimeMillis() - now;
 					if (LOG.isLoggable(INFO))
 						LOG.info("Loading authors took " + duration + " ms");
-- 
GitLab