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 settings manager.

Browse Source
This commit is contained in:
akwizgran
2016-02-05 18:46:18 +00:00
parent bdc17dfc8e
commit 408776f5d3
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
briar-android/src/org/briarproject/android/AndroidNotificationManagerImpl.java
View File

@@ -13,7 +13,6 @@ import org.briarproject.android.contact.ConversationActivity;
import org.briarproject.android.forum.ForumActivity; import org.briarproject.android.forum.ForumActivity;
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.db.DatabaseComponent;
import org.briarproject.api.db.DatabaseExecutor; import org.briarproject.api.db.DatabaseExecutor;
import org.briarproject.api.db.DbException; import org.briarproject.api.db.DbException;
import org.briarproject.api.event.Event; import org.briarproject.api.event.Event;
@@ -24,6 +23,7 @@ import org.briarproject.api.forum.ForumManager;
import org.briarproject.api.lifecycle.Service; import org.briarproject.api.lifecycle.Service;
import org.briarproject.api.messaging.MessagingManager; import org.briarproject.api.messaging.MessagingManager;
import org.briarproject.api.settings.Settings; import org.briarproject.api.settings.Settings;
import org.briarproject.api.settings.SettingsManager;
import org.briarproject.api.sync.ClientId; import org.briarproject.api.sync.ClientId;
import org.briarproject.api.sync.GroupId; import org.briarproject.api.sync.GroupId;
import org.briarproject.util.StringUtils; import org.briarproject.util.StringUtils;
@@ -57,8 +57,8 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
private static final Logger LOG = private static final Logger LOG =
Logger.getLogger(AndroidNotificationManagerImpl.class.getName()); Logger.getLogger(AndroidNotificationManagerImpl.class.getName());
private final DatabaseComponent db;
private final Executor dbExecutor; private final Executor dbExecutor;
private final SettingsManager settingsManager;
private final MessagingManager messagingManager; private final MessagingManager messagingManager;
private final ForumManager forumManager; private final ForumManager forumManager;
private final AndroidExecutor androidExecutor; private final AndroidExecutor androidExecutor;
@@ -76,12 +76,12 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
private volatile Settings settings = new Settings(); private volatile Settings settings = new Settings();
@Inject @Inject
public AndroidNotificationManagerImpl(DatabaseComponent db, public AndroidNotificationManagerImpl(@DatabaseExecutor Executor dbExecutor,
@DatabaseExecutor Executor dbExecutor, SettingsManager settingsManager, MessagingManager messagingManager,
MessagingManager messagingManager, ForumManager forumManager, ForumManager forumManager, AndroidExecutor androidExecutor,
AndroidExecutor androidExecutor, Application app) { Application app) {
this.db = db;
this.dbExecutor = dbExecutor; this.dbExecutor = dbExecutor;
this.settingsManager = settingsManager;
this.messagingManager = messagingManager; this.messagingManager = messagingManager;
this.forumManager = forumManager; this.forumManager = forumManager;
this.androidExecutor = androidExecutor; this.androidExecutor = androidExecutor;
@@ -98,7 +98,7 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
dbExecutor.execute(new Runnable() { dbExecutor.execute(new Runnable() {
public void run() { public void run() {
try { try {
settings = db.getSettings(SETTINGS_NAMESPACE); settings = settingsManager.getSettings(SETTINGS_NAMESPACE);
} catch (DbException e) { } catch (DbException e) {
if (LOG.isLoggable(WARNING)) if (LOG.isLoggable(WARNING))
LOG.log(WARNING, e.toString(), e); LOG.log(WARNING, e.toString(), e);