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

Merge branch '734-notifications-for-private-group-messages' into 'master'

Browse Source 
Show Notifications for Group Messages

Closes #734

See merge request !391
This commit is contained in:
akwizgran
2016-11-08 12:06:15 +00:00
parent d204757395 81d341374d
commit 1809943f1d
8 changed files with 193 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/org/briarproject/android/privategroup/conversation/GroupControllerImpl.java
View File

@@ -59,7 +59,7 @@ public class GroupControllerImpl extends
@Override
public void onActivityStart() {
super.onActivityStart();
// TODO: Add new notification manager methods for private groups
notificationManager.clearGroupMessageNotification(getGroupId());
}
@Override

10
briar-android/src/org/briarproject/android/privategroup/list/GroupListControllerImpl.java
View File

@@ -2,6 +2,7 @@ package org.briarproject.android.privategroup.list;
import android.support.annotation.CallSuper;
import org.briarproject.android.api.AndroidNotificationManager;
import org.briarproject.android.controller.DbControllerImpl;
import org.briarproject.android.controller.handler.ResultExceptionHandler;
import org.briarproject.api.clients.MessageTracker.GroupCount;
@@ -41,6 +42,7 @@ public class GroupListControllerImpl extends DbControllerImpl
private final PrivateGroupManager groupManager;
private final GroupInvitationManager groupInvitationManager;
private final AndroidNotificationManager notificationManager;
private final EventBus eventBus;
protected volatile GroupListListener listener;
@@ -48,10 +50,12 @@ public class GroupListControllerImpl extends DbControllerImpl
@Inject
GroupListControllerImpl(@DatabaseExecutor Executor dbExecutor,
LifecycleManager lifecycleManager, PrivateGroupManager groupManager,
GroupInvitationManager groupInvitationManager, EventBus eventBus) {
GroupInvitationManager groupInvitationManager,
AndroidNotificationManager notificationManager, EventBus eventBus) {
super(dbExecutor, lifecycleManager);
this.groupManager = groupManager;
this.groupInvitationManager = groupInvitationManager;
this.notificationManager = notificationManager;
this.eventBus = eventBus;
}
@@ -67,13 +71,15 @@ public class GroupListControllerImpl extends DbControllerImpl
throw new IllegalStateException(
"GroupListListener needs to be attached");
eventBus.addListener(this);
// TODO: Add new notification manager methods for private groups
notificationManager.blockAllGroupMessageNotifications();
notificationManager.clearAllGroupMessageNotifications();
}
@Override
@CallSuper
public void onStop() {
eventBus.removeListener(this);
notificationManager.unblockAllGroupMessageNotifications();
}
@Override