diff --git a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumActivity.java index 6a204dc23..5cf01d818 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumActivity.java @@ -79,12 +79,6 @@ public class ForumActivity extends } } - @Override - public void onStart() { - super.onStart(); - viewModel.clearForumPostNotification(); - } - @Override protected void onActivityResult(int request, int result, @Nullable Intent data) { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumViewModel.java index 48dfb7640..d811bf36a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumViewModel.java @@ -116,7 +116,7 @@ class ForumViewModel extends ThreadListViewModel { } } - void clearForumPostNotification() { + protected void clearNotifications() { notificationManager.clearForumPostNotification(groupId); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java index a5dac9f34..053358caa 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java @@ -84,12 +84,6 @@ public class GroupActivity extends }); } - @Override - public void onStart() { - super.onStart(); - viewModel.clearGroupMessageNotifications(); - } - @Override public boolean onCreateOptionsMenu(Menu menu) { // Inflate the menu items for use in the action bar diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupViewModel.java index bf7b574b6..ada485e47 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupViewModel.java @@ -138,7 +138,7 @@ class GroupViewModel extends ThreadListViewModel { loadPrivateGroup(groupId); } - public void clearGroupMessageNotifications() { + protected void clearNotifications() { notificationManager.clearGroupMessageNotification(groupId); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java index de23e0f2a..ac045316b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java @@ -110,7 +110,7 @@ public abstract class ThreadListActivity loadSharingContacts(); } - public void blockNotifications() { + protected abstract void clearNotifications(); + + public void blockAndClearNotifications() { notificationManager.blockNotification(groupId); + clearNotifications(); } public void unblockNotifications() {