Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Briar Mailbox
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules

Snippets Groups Projects

8bb7f4a3

Commit 8bb7f4a3 authored 2 years ago by Sebastian

Downloads
- Plain Diff

Merge branch '189-bind-exception' into 'main'

Use a random port for WebServer

Closes #189

See merge request !159

parents e7e55d49 b374ab23

No related branches found

No related tags found

Loading

Pipeline #13866 passed 2 years ago

Stage: test

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

mailbox-android/src/main/java/org/briarproject/mailbox/core/tor/AndroidTorModule.kt 4 additions, 2 deletions

...ava/org/briarproject/mailbox/core/tor/AndroidTorModule.kt
mailbox-android/src/main/java/org/briarproject/mailbox/core/tor/AndroidTorPlugin.java 4 additions, 2 deletions

...a/org/briarproject/mailbox/core/tor/AndroidTorPlugin.java
mailbox-core/src/main/java/org/briarproject/mailbox/core/server/WebServerManager.kt 7 additions, 5 deletions

.../org/briarproject/mailbox/core/server/WebServerManager.kt
mailbox-core/src/main/java/org/briarproject/mailbox/core/tor/AbstractTorPlugin.java 17 additions, 5 deletions

.../org/briarproject/mailbox/core/tor/AbstractTorPlugin.java
mailbox-core/src/test/java/org/briarproject/mailbox/core/TestComponent.kt 2 additions, 0 deletions

.../test/java/org/briarproject/mailbox/core/TestComponent.kt
mailbox-core/src/test/java/org/briarproject/mailbox/core/server/IntegrationTest.kt 3 additions, 3 deletions

...a/org/briarproject/mailbox/core/server/IntegrationTest.kt
mailbox-core/src/test/java/org/briarproject/mailbox/core/server/WebServerIntegrationTest.kt 1 addition, 2 deletions

...arproject/mailbox/core/server/WebServerIntegrationTest.kt
mailbox-lib/src/main/java/org/briarproject/mailbox/core/tor/JavaTorModule.kt 4 additions, 2 deletions

...n/java/org/briarproject/mailbox/core/tor/JavaTorModule.kt
mailbox-lib/src/main/java/org/briarproject/mailbox/core/tor/JavaTorPlugin.java 4 additions, 2 deletions

...java/org/briarproject/mailbox/core/tor/JavaTorPlugin.java

with 46 additions and 23 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