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

74f1fa56

Commit 74f1fa56 authored 8 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '932-panic-button-terminate-process' into 'master'

Terminate the process after handling a panic trigger

Closes #932

See merge request !513

parents 6b3a1fd6 d5d9436e

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java 21 additions, 10 deletions

...rg/briarproject/briar/android/activity/BriarActivity.java
briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java 3 additions, 4 deletions

...iarproject/briar/android/navdrawer/NavDrawerActivity.java
briar-android/src/main/java/org/briarproject/briar/android/panic/PanicResponderActivity.java 2 additions, 11 deletions

...arproject/briar/android/panic/PanicResponderActivity.java

with 27 additions and 25 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