Merge branch '1190-shutdown-from-background' into 'master' (e385d581) · 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

e385d581

Commit e385d581 authored 7 years ago by Torsten Grote

Downloads
- Plain Diff

Merge branch '1190-shutdown-from-background' into 'master'

Shut down cleanly when phone is shutting down or memory is low

Closes #1190

See merge request akwizgran/briar!742

parents 4a892acd 8ebced94

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/src/main/AndroidManifest.xml 6 additions, 1 deletion

briar-android/src/main/AndroidManifest.xml
briar-android/src/main/java/org/briarproject/briar/android/BriarService.java 69 additions, 1 deletion

...ain/java/org/briarproject/briar/android/BriarService.java
briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java 1 addition, 1 deletion

...rg/briarproject/briar/android/activity/BriarActivity.java
briar-android/src/main/java/org/briarproject/briar/android/logout/ExitActivity.java 1 addition, 1 deletion

...a/org/briarproject/briar/android/logout/ExitActivity.java
briar-android/src/main/java/org/briarproject/briar/android/logout/HideUiActivity.java 20 additions, 0 deletions

...org/briarproject/briar/android/logout/HideUiActivity.java
briar-android/src/main/java/org/briarproject/briar/android/logout/SignOutFragment.java 4 additions, 2 deletions

...rg/briarproject/briar/android/logout/SignOutFragment.java
briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java 1 addition, 1 deletion

...iarproject/briar/android/navdrawer/NavDrawerActivity.java
briar-android/src/main/res/values/strings.xml 3 additions, 0 deletions

briar-android/src/main/res/values/strings.xml

with 105 additions and 7 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