From 412f7b994a6faf0c9cb98492398c27062f87d4a9 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Wed, 16 Dec 2015 16:14:55 +0000
Subject: [PATCH] Use new UI/DB interfaces for identities.
---
.../src/org/briarproject/android/DashboardActivity.java | 6 +++---
.../android/identity/CreateIdentityActivity.java | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/briar-android/src/org/briarproject/android/DashboardActivity.java b/briar-android/src/org/briarproject/android/DashboardActivity.java
index 94312d788d..ea8d8258d1 100644
--- a/briar-android/src/org/briarproject/android/DashboardActivity.java
+++ b/briar-android/src/org/briarproject/android/DashboardActivity.java
@@ -23,13 +23,13 @@ import org.briarproject.android.forum.ForumListActivity;
import org.briarproject.android.util.LayoutUtils;
import org.briarproject.api.TransportId;
import org.briarproject.api.android.ReferenceManager;
-import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.event.Event;
import org.briarproject.api.event.EventBus;
import org.briarproject.api.event.EventListener;
import org.briarproject.api.event.TransportDisabledEvent;
import org.briarproject.api.event.TransportEnabledEvent;
+import org.briarproject.api.identity.IdentityManager;
import org.briarproject.api.identity.LocalAuthor;
import org.briarproject.api.plugins.Plugin;
import org.briarproject.api.plugins.PluginManager;
@@ -59,7 +59,7 @@ public class DashboardActivity extends BriarActivity implements EventListener {
@Inject private PluginManager pluginManager;
// Fields that are accessed from background threads must be volatile
- @Inject private volatile DatabaseComponent db;
+ @Inject private volatile IdentityManager identityManager;
@Inject private volatile EventBus eventBus;
@Override
@@ -259,7 +259,7 @@ public class DashboardActivity extends BriarActivity implements EventListener {
public void run() {
try {
long now = System.currentTimeMillis();
- db.addLocalAuthor(a);
+ identityManager.addLocalAuthor(a);
long duration = System.currentTimeMillis() - now;
if (LOG.isLoggable(INFO))
LOG.info("Storing author took " + duration + " ms");
diff --git a/briar-android/src/org/briarproject/android/identity/CreateIdentityActivity.java b/briar-android/src/org/briarproject/android/identity/CreateIdentityActivity.java
index fcbc439cff..81c348273b 100644
--- a/briar-android/src/org/briarproject/android/identity/CreateIdentityActivity.java
+++ b/briar-android/src/org/briarproject/android/identity/CreateIdentityActivity.java
@@ -19,9 +19,9 @@ import org.briarproject.android.util.LayoutUtils;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.CryptoExecutor;
import org.briarproject.api.crypto.KeyPair;
-import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.identity.AuthorFactory;
+import org.briarproject.api.identity.IdentityManager;
import org.briarproject.api.identity.LocalAuthor;
import org.briarproject.util.StringUtils;
@@ -59,7 +59,7 @@ implements OnEditorActionListener, OnClickListener {
// Fields that are accessed from background threads must be volatile
@Inject private volatile CryptoComponent crypto;
@Inject private volatile AuthorFactory authorFactory;
- @Inject private volatile DatabaseComponent db;
+ @Inject private volatile IdentityManager identityManager;
@Override
public void onCreate(Bundle state) {
@@ -158,7 +158,7 @@ implements OnEditorActionListener, OnClickListener {
public void run() {
try {
long now = System.currentTimeMillis();
- db.addLocalAuthor(a);
+ identityManager.addLocalAuthor(a);
long duration = System.currentTimeMillis() - now;
if (LOG.isLoggable(INFO))
LOG.info("Storing author took " + duration + " ms");
--
GitLab