Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-21 07:09:56 +01:00
Code Issues Projects Releases Wiki Activity

Use new UI/DB interfaces for identities.

Browse Source
This commit is contained in:
akwizgran
2015-12-16 16:14:55 +00:00
parent 122380db66
commit 412f7b994a
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-android/src/org/briarproject/android/DashboardActivity.java
View File

@@ -23,13 +23,13 @@ import org.briarproject.android.forum.ForumListActivity;
import org.briarproject.android.util.LayoutUtils; import org.briarproject.android.util.LayoutUtils;
import org.briarproject.api.TransportId; import org.briarproject.api.TransportId;
import org.briarproject.api.android.ReferenceManager; import org.briarproject.api.android.ReferenceManager;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException; import org.briarproject.api.db.DbException;
import org.briarproject.api.event.Event; import org.briarproject.api.event.Event;
import org.briarproject.api.event.EventBus; import org.briarproject.api.event.EventBus;
import org.briarproject.api.event.EventListener; import org.briarproject.api.event.EventListener;
import org.briarproject.api.event.TransportDisabledEvent; import org.briarproject.api.event.TransportDisabledEvent;
import org.briarproject.api.event.TransportEnabledEvent; import org.briarproject.api.event.TransportEnabledEvent;
import org.briarproject.api.identity.IdentityManager;
import org.briarproject.api.identity.LocalAuthor; import org.briarproject.api.identity.LocalAuthor;
import org.briarproject.api.plugins.Plugin; import org.briarproject.api.plugins.Plugin;
import org.briarproject.api.plugins.PluginManager; import org.briarproject.api.plugins.PluginManager;
@@ -59,7 +59,7 @@ public class DashboardActivity extends BriarActivity implements EventListener {
@Inject private PluginManager pluginManager; @Inject private PluginManager pluginManager;
// Fields that are accessed from background threads must be volatile // 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; @Inject private volatile EventBus eventBus;
@Override @Override
@@ -259,7 +259,7 @@ public class DashboardActivity extends BriarActivity implements EventListener {
public void run() { public void run() {
try { try {
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
db.addLocalAuthor(a); identityManager.addLocalAuthor(a);
long duration = System.currentTimeMillis() - now; long duration = System.currentTimeMillis() - now;
if (LOG.isLoggable(INFO)) if (LOG.isLoggable(INFO))
LOG.info("Storing author took " + duration + " ms"); LOG.info("Storing author took " + duration + " ms");

6
briar-android/src/org/briarproject/android/identity/CreateIdentityActivity.java
View File

@@ -19,9 +19,9 @@ import org.briarproject.android.util.LayoutUtils;
import org.briarproject.api.crypto.CryptoComponent; import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.crypto.CryptoExecutor; import org.briarproject.api.crypto.CryptoExecutor;
import org.briarproject.api.crypto.KeyPair; import org.briarproject.api.crypto.KeyPair;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DbException; import org.briarproject.api.db.DbException;
import org.briarproject.api.identity.AuthorFactory; import org.briarproject.api.identity.AuthorFactory;
import org.briarproject.api.identity.IdentityManager;
import org.briarproject.api.identity.LocalAuthor; import org.briarproject.api.identity.LocalAuthor;
import org.briarproject.util.StringUtils; import org.briarproject.util.StringUtils;
@@ -59,7 +59,7 @@ implements OnEditorActionListener, OnClickListener {
// Fields that are accessed from background threads must be volatile // Fields that are accessed from background threads must be volatile
@Inject private volatile CryptoComponent crypto; @Inject private volatile CryptoComponent crypto;
@Inject private volatile AuthorFactory authorFactory; @Inject private volatile AuthorFactory authorFactory;
@Inject private volatile DatabaseComponent db; @Inject private volatile IdentityManager identityManager;
@Override @Override
public void onCreate(Bundle state) { public void onCreate(Bundle state) {
@@ -158,7 +158,7 @@ implements OnEditorActionListener, OnClickListener {
public void run() { public void run() {
try { try {
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
db.addLocalAuthor(a); identityManager.addLocalAuthor(a);
long duration = System.currentTimeMillis() - now; long duration = System.currentTimeMillis() - now;
if (LOG.isLoggable(INFO)) if (LOG.isLoggable(INFO))
LOG.info("Storing author took " + duration + " ms"); LOG.info("Storing author took " + duration + " ms");