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

Merge branch '942-block-blog-notifications' into 'master'

Browse Source 
Block blog notifications when viewing combined feed

See merge request !563
This commit is contained in:
akwizgran
2017-07-07 16:32:07 +00:00
parent de2ea112ee 8f8751f4ac
commit dfb71a7978
3 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -600,6 +600,16 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
} }
} }
@Override
public void clearAllBlogPostNotifications() {
androidExecutor.runOnUiThread(new Runnable() {
@Override
public void run() {
clearBlogPostNotification();
}
});
}
private void showIntroductionNotification() { private void showIntroductionNotification() {
androidExecutor.runOnUiThread(new Runnable() { androidExecutor.runOnUiThread(new Runnable() {
@Override @Override
@@ -689,4 +699,24 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
} }
}); });
} }
@Override
public void blockAllBlogPostNotifications() {
androidExecutor.runOnUiThread(new Runnable() {
@Override
public void run() {
blockBlogs = true;
}
});
}
@Override
public void unblockAllBlogPostNotifications() {
androidExecutor.runOnUiThread(new Runnable() {
@Override
public void run() {
blockBlogs = false;
}
});
}
} }

3
briar-android/src/main/java/org/briarproject/briar/android/blog/FeedControllerImpl.java
View File

@@ -53,11 +53,14 @@ class FeedControllerImpl extends BaseControllerImpl
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
if (listener == null) throw new IllegalStateException(); if (listener == null) throw new IllegalStateException();
notificationManager.blockAllBlogPostNotifications();
notificationManager.clearAllBlogPostNotifications();
} }
@Override @Override
public void onStop() { public void onStop() {
super.onStop(); super.onStop();
notificationManager.unblockAllBlogPostNotifications();
} }
@Override @Override

6
briar-android/src/main/java/org/briarproject/briar/api/android/AndroidNotificationManager.java
View File

@@ -28,6 +28,8 @@ public interface AndroidNotificationManager {
void clearBlogPostNotification(GroupId g); void clearBlogPostNotification(GroupId g);
void clearAllBlogPostNotifications();
void blockContactNotification(ContactId c); void blockContactNotification(ContactId c);
void unblockContactNotification(ContactId c); void unblockContactNotification(ContactId c);
@@ -35,4 +37,8 @@ public interface AndroidNotificationManager {
void blockNotification(GroupId g); void blockNotification(GroupId g);
void unblockNotification(GroupId g); void unblockNotification(GroupId g);
void blockAllBlogPostNotifications();
void unblockAllBlogPostNotifications();
} }