Merge branch '1024-message-tree-npe' into 'master' (99d8cc64) · Commits · Julian Dehm / briar

Commit 99d8cc64 authored 7 years ago by akwizgran

Merge branch '1024-message-tree-npe' into 'master'

Don't add threaded messages to the UI before their parents

Closes #1024

See merge request !585

parents ed01048f ba727d75

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/src/main/java/org/briarproject/briar/android/forum/ForumActivity.java 2 additions, 3 deletions

...a/org/briarproject/briar/android/forum/ForumActivity.java
briar-android/src/main/java/org/briarproject/briar/android/forum/ForumController.java 2 additions, 4 deletions

...org/briarproject/briar/android/forum/ForumController.java
briar-android/src/main/java/org/briarproject/briar/android/forum/ForumControllerImpl.java 9 additions, 8 deletions

...briarproject/briar/android/forum/ForumControllerImpl.java
briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListFragment.java 1 addition, 1 deletion

...g/briarproject/briar/android/forum/ForumListFragment.java
briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java 3 additions, 4 deletions

...riar/android/privategroup/conversation/GroupActivity.java
briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupController.java 3 additions, 4 deletions

...ar/android/privategroup/conversation/GroupController.java
briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupControllerImpl.java 5 additions, 4 deletions

...ndroid/privategroup/conversation/GroupControllerImpl.java
briar-android/src/main/java/org/briarproject/briar/android/threaded/NestedTreeList.java 7 additions, 6 deletions

...g/briarproject/briar/android/threaded/NestedTreeList.java
briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemAdapter.java 6 additions, 2 deletions

...riarproject/briar/android/threaded/ThreadItemAdapter.java
briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemListImpl.java 1 addition, 0 deletions

...iarproject/briar/android/threaded/ThreadItemListImpl.java
briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java 15 additions, 20 deletions

...iarproject/briar/android/threaded/ThreadListActivity.java
briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListController.java 6 additions, 7 deletions

...rproject/briar/android/threaded/ThreadListController.java
briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListControllerImpl.java 2 additions, 31 deletions

...ject/briar/android/threaded/ThreadListControllerImpl.java
briar-android/src/main/res/menu/group_actions.xml 6 additions, 6 deletions

briar-android/src/main/res/menu/group_actions.xml
briar-api/src/main/java/org/briarproject/briar/api/client/MessageTree.java 2 additions, 0 deletions

...n/java/org/briarproject/briar/api/client/MessageTree.java
briar-api/src/main/java/org/briarproject/briar/api/forum/event/ForumPostReceivedEvent.java 14 additions, 9 deletions

...project/briar/api/forum/event/ForumPostReceivedEvent.java
briar-api/src/main/java/org/briarproject/briar/api/privategroup/event/GroupMessageAddedEvent.java 7 additions, 2 deletions

.../briar/api/privategroup/event/GroupMessageAddedEvent.java
briar-core/src/main/java/org/briarproject/briar/client/MessageTreeImpl.java 4 additions, 0 deletions

...n/java/org/briarproject/briar/client/MessageTreeImpl.java
briar-core/src/main/java/org/briarproject/briar/forum/ForumManagerImpl.java 19 additions, 21 deletions

...n/java/org/briarproject/briar/forum/ForumManagerImpl.java
briar-core/src/main/java/org/briarproject/briar/privategroup/PrivateGroupManagerImpl.java 16 additions, 13 deletions

...arproject/briar/privategroup/PrivateGroupManagerImpl.java

with 130 additions and 145 deletions

Please register or to comment