Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-20 14:49:53 +01:00
Code Issues Projects Releases Wiki Activity

Use new UI/DB interface in BriarService.

Browse Source
This commit is contained in:
akwizgran
2015-12-17 16:32:53 +00:00
parent 351e1bbbe6
commit 766179ac97
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,6 @@ import org.briarproject.R;
import org.briarproject.api.android.AndroidExecutor; import org.briarproject.api.android.AndroidExecutor;
import org.briarproject.api.android.AndroidNotificationManager; import org.briarproject.api.android.AndroidNotificationManager;
import org.briarproject.api.contact.ContactId; import org.briarproject.api.contact.ContactId;
import org.briarproject.api.db.DatabaseComponent;
import org.briarproject.api.db.DatabaseConfig; import org.briarproject.api.db.DatabaseConfig;
import org.briarproject.api.db.DatabaseExecutor; import org.briarproject.api.db.DatabaseExecutor;
import org.briarproject.api.db.DbException; import org.briarproject.api.db.DbException;
@@ -23,6 +22,7 @@ import org.briarproject.api.event.EventListener;
import org.briarproject.api.event.MessageAddedEvent; import org.briarproject.api.event.MessageAddedEvent;
import org.briarproject.api.lifecycle.LifecycleManager; import org.briarproject.api.lifecycle.LifecycleManager;
import org.briarproject.api.lifecycle.LifecycleManager.StartResult; import org.briarproject.api.lifecycle.LifecycleManager.StartResult;
import org.briarproject.api.messaging.MessagingManager;
import org.briarproject.api.sync.GroupId; import org.briarproject.api.sync.GroupId;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
@@ -59,7 +59,7 @@ public class BriarService extends RoboService implements EventListener {
@Inject private volatile LifecycleManager lifecycleManager; @Inject private volatile LifecycleManager lifecycleManager;
@Inject private volatile AndroidExecutor androidExecutor; @Inject private volatile AndroidExecutor androidExecutor;
@Inject @DatabaseExecutor private volatile Executor dbExecutor; @Inject @DatabaseExecutor private volatile Executor dbExecutor;
@Inject private volatile DatabaseComponent db; @Inject private volatile MessagingManager messagingManager;
@Inject private volatile EventBus eventBus; @Inject private volatile EventBus eventBus;
private volatile boolean started = false; private volatile boolean started = false;
@@ -181,7 +181,7 @@ public class BriarService extends RoboService implements EventListener {
public void run() { public void run() {
try { try {
lifecycleManager.waitForDatabase(); lifecycleManager.waitForDatabase();
if (g.equals(db.getInboxGroupId(c))) if (g.equals(messagingManager.getConversationId(c)))
notificationManager.showPrivateMessageNotification(c); notificationManager.showPrivateMessageNotification(c);
else notificationManager.showForumPostNotification(g); else notificationManager.showForumPostNotification(g);
} catch (DbException e) { } catch (DbException e) {