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

Merge branch '1534-rss-notification' into 'master'

Browse Source 
Make RSS blog posts not local: re-enables notification

Closes #1534

See merge request briar/briar!1079
This commit is contained in:
akwizgran
2019-04-18 08:01:16 +00:00
parent ff2f710495 0e5bb3e9de
commit ece083026e
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-core/src/main/java/org/briarproject/briar/blog/BlogManagerImpl.java
View File

@@ -240,7 +240,9 @@ class BlogManagerImpl extends BdfIncomingMessageHook implements BlogManager,
MessageId postId = p.getMessage().getId(); MessageId postId = p.getMessage().getId();
BlogPostHeader h = BlogPostHeader h =
getPostHeaderFromMetadata(txn, groupId, postId, meta); getPostHeaderFromMetadata(txn, groupId, postId, meta);
BlogPostAddedEvent event = new BlogPostAddedEvent(groupId, h, true); boolean local = !b.isRssFeed();
BlogPostAddedEvent event =
new BlogPostAddedEvent(groupId, h, local);
txn.attach(event); txn.attach(event);
} catch (FormatException e) { } catch (FormatException e) {
throw new DbException(e); throw new DbException(e);

2
briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerImplTest.java
View File

@@ -310,6 +310,7 @@ public class BlogManagerImplTest extends BriarTestCase {
assertTrue(event instanceof BlogPostAddedEvent); assertTrue(event instanceof BlogPostAddedEvent);
BlogPostAddedEvent e = (BlogPostAddedEvent) event; BlogPostAddedEvent e = (BlogPostAddedEvent) event;
assertEquals(blog1.getId(), e.getGroupId()); assertEquals(blog1.getId(), e.getGroupId());
assertTrue(e.isLocal());
BlogPostHeader h = e.getHeader(); BlogPostHeader h = e.getHeader();
assertEquals(POST, h.getType()); assertEquals(POST, h.getType());
@@ -360,6 +361,7 @@ public class BlogManagerImplTest extends BriarTestCase {
assertTrue(event instanceof BlogPostAddedEvent); assertTrue(event instanceof BlogPostAddedEvent);
BlogPostAddedEvent e = (BlogPostAddedEvent) event; BlogPostAddedEvent e = (BlogPostAddedEvent) event;
assertEquals(rssBlog.getId(), e.getGroupId()); assertEquals(rssBlog.getId(), e.getGroupId());
assertFalse(e.isLocal());
BlogPostHeader h = e.getHeader(); BlogPostHeader h = e.getHeader();
assertEquals(POST, h.getType()); assertEquals(POST, h.getType());