Merge branch '11-ktor' into 'main' (8ddcff85) · Commits · briar / Briar Mailbox · GitLab

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

8ddcff85

Commit 8ddcff85 authored 3 years ago by Sebastian

Downloads
- Plain Diff

Merge branch '11-ktor' into 'main'

Add Ktor embedded webserver

See merge request !4

parents 02dd28e4 03af5c77

Loading

Checking pipeline status

Changes 8
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.idea/codeStyles/Project.xml 5 additions, 0 deletions

.idea/codeStyles/Project.xml
mailbox/build.gradle 21 additions, 2 deletions

mailbox/build.gradle
mailbox/src/main/AndroidManifest.xml 3 additions, 0 deletions

mailbox/src/main/AndroidManifest.xml
mailbox/src/main/java/org/briarproject/mailbox/MailboxApplication.kt 2 additions, 2 deletions

.../main/java/org/briarproject/mailbox/MailboxApplication.kt
mailbox/src/main/java/org/briarproject/mailbox/MailboxNotificationManager.kt 2 additions, 0 deletions

...va/org/briarproject/mailbox/MailboxNotificationManager.kt
mailbox/src/main/java/org/briarproject/mailbox/MailboxService.kt 11 additions, 1 deletion

.../src/main/java/org/briarproject/mailbox/MailboxService.kt
mailbox/src/main/java/org/briarproject/mailbox/server/Routing.kt 15 additions, 0 deletions

.../src/main/java/org/briarproject/mailbox/server/Routing.kt
mailbox/src/main/java/org/briarproject/mailbox/server/WebServerManager.kt 46 additions, 0 deletions

.../java/org/briarproject/mailbox/server/WebServerManager.kt

with 105 additions and 5 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