Merge branch '734-notifications-for-private-group-messages' into 'master' (1809943f) · Commits · Julian Dehm / briar · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

briar
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

1809943f

Commit 1809943f authored 8 years ago by akwizgran

Downloads
- Plain Diff

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

Show Notifications for Group Messages

Closes #734

See merge request !391

parents d2047573 81d34137

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/res/values/strings.xml 5 additions, 0 deletions

briar-android/res/values/strings.xml
briar-android/res/xml/settings.xml 6 additions, 0 deletions

briar-android/res/xml/settings.xml
briar-android/src/org/briarproject/android/AndroidNotificationManagerImpl.java 148 additions, 6 deletions

.../briarproject/android/AndroidNotificationManagerImpl.java
briar-android/src/org/briarproject/android/NavDrawerActivity.java 5 additions, 4 deletions

...droid/src/org/briarproject/android/NavDrawerActivity.java
briar-android/src/org/briarproject/android/api/AndroidNotificationManager.java 8 additions, 0 deletions

.../briarproject/android/api/AndroidNotificationManager.java
briar-android/src/org/briarproject/android/fragment/SettingsFragment.java 12 additions, 0 deletions

...c/org/briarproject/android/fragment/SettingsFragment.java
briar-android/src/org/briarproject/android/privategroup/conversation/GroupControllerImpl.java 1 addition, 1 deletion

...ndroid/privategroup/conversation/GroupControllerImpl.java
briar-android/src/org/briarproject/android/privategroup/list/GroupListControllerImpl.java 8 additions, 2 deletions

...ct/android/privategroup/list/GroupListControllerImpl.java

with 193 additions and 13 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment