Merge branch '1355-disable-tor-setting' into 'master' (db11e010) · 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

db11e010

Commit db11e010 authored 6 years ago by Torsten Grote

Downloads
- Plain Diff

Merge branch '1355-disable-tor-setting' into 'master'

Add a setting to override location-based disabling of Tor

Closes #1355

See merge request !871

parents 25b8932c 0d658513

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java 9 additions, 3 deletions

...n/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TorConstants.java 1 addition, 0 deletions

...ava/org/briarproject/bramble/api/plugin/TorConstants.java
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java 53 additions, 31 deletions

...briarproject/briar/android/settings/SettingsFragment.java
briar-android/src/main/res/values/strings.xml 2 additions, 0 deletions

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

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

with 71 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