Merge branch '907-panic-signout' into 'master' (2a59515c) · 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

2a59515c

Commit 2a59515c authored 7 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '907-panic-signout' into 'master'

Require a panic app to be set before executing any panic actions

Closes #907

See merge request !492

parents 7161152b 9cffff71

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesFragment.java 6 additions, 0 deletions

...project/briar/android/panic/PanicPreferencesFragment.java
briar-android/src/main/java/org/briarproject/briar/android/panic/PanicResponderActivity.java 3 additions, 8 deletions

...arproject/briar/android/panic/PanicResponderActivity.java
briar-android/src/main/res/xml/panic_preferences.xml 22 additions, 26 deletions

briar-android/src/main/res/xml/panic_preferences.xml

with 31 additions and 34 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