Merge branch '1171-wifi-access-point' into 'master' (ff44edf7) · 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

ff44edf7

Commit ff44edf7 authored 7 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '1171-wifi-access-point' into 'master'

Enable LAN plugin when providing a wifi access point

Closes #1171

See merge request akwizgran/briar!752

parents 60dffd09 46dae594

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/AndroidPluginModule.java 1 addition, 1 deletion

.../org/briarproject/bramble/plugin/AndroidPluginModule.java
bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPlugin.java 66 additions, 10 deletions

.../briarproject/bramble/plugin/tcp/AndroidLanTcpPlugin.java
bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPluginFactory.java 7 additions, 3 deletions

...roject/bramble/plugin/tcp/AndroidLanTcpPluginFactory.java
bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java 39 additions, 49 deletions

...n/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java 6 additions, 2 deletions

...n/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java

with 119 additions and 65 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