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

4cde50b7

Commit 4cde50b7 authored 6 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '1293-cookie-file-polling' into 'master'

Poll for creation of Tor auth cookie file

Closes #1293

See merge request akwizgran/briar!828

parents da40eca8 ba20fbeb

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

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

...n/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPluginFactory.java 6 additions, 2 deletions

...org/briarproject/bramble/plugin/tor/TorPluginFactory.java
briar-android/src/main/java/org/briarproject/briar/android/AppModule.java 5 additions, 3 deletions

...c/main/java/org/briarproject/briar/android/AppModule.java

with 26 additions and 41 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