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

169c5934

Commit 169c5934 authored 6 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '1269-bridge-setting' into 'master'

Refactor Tor settings and add a setting for forcing the use bridges

Closes #1269

See merge request !895

parents e51c437a 4b9a9771

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TorConstants.java 6 additions, 5 deletions

...ava/org/briarproject/bramble/api/plugin/TorConstants.java
bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java 37 additions, 23 deletions

...n/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java 6 additions, 0 deletions

...java/org/briarproject/briar/android/AndroidComponent.java
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java 54 additions, 48 deletions

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

briar-android/src/main/res/values/arrays.xml
briar-android/src/main/res/values/strings.xml 8 additions, 6 deletions

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

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

with 120 additions and 87 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